jruby · Sep 29, 2015 · Sep 29, 2015 · Sep 29, 2015 · Sep 29, 2015
diff --git a/spec/mspec/lib/mspec/helpers/ruby_exe.rb b/spec/mspec/lib/mspec/helpers/ruby_exe.rb
@@ -1,5 +1,6 @@
 require 'mspec/utils/ruby_name'
 require 'mspec/guards/platform'
+require 'mspec/helpers/tmp'
 
 # The ruby_exe helper provides a wrapper for invoking the
 # same Ruby interpreter as the one running the specs and
@@ -124,6 +125,13 @@ def ruby_exe(code, opts = {})
         ENV[key] = value
       end
 
+      escape = opts.delete(:escape)
+      if escape
+        tmpfile = tmp("rubyexe.rb")
+        File.open(tmpfile, "w") { |f| f.write(code) }
+        code = tmpfile
+      end
+
       begin
         platform_is_not :opal do
           `#{ruby_cmd(code, opts)}`
@@ -134,25 +142,20 @@ def ruby_exe(code, opts = {})
           key = key.to_s
           ENV.delete key unless saved_env.key? key
         end
+        File.delete tmpfile if escape
       end
     end
   end
 
   def ruby_cmd(code, opts = {})
     body = code
 
-    if code and not File.exist?(code)
-      if opts[:escape]
-        heredoc_separator = "END_OF_RUBYCODE"
-        lines = code.lines
-        until lines.none? {|line| line.start_with? heredoc_separator }
-          heredoc_separator << heredoc_separator
-        end
+    if opts[:escape]
+      raise "escape: true is no longer supported in ruby_cmd, use ruby_exe or a fixture"
+    end
 
-        body = %Q!-e "$(cat <<'#{heredoc_separator}'\n#{code}\n#{heredoc_separator}\n)"!
-      else
-        body = "-e #{code.inspect}"
-      end
+    if code and not File.exist?(code)
+      body = "-e #{code.inspect}"
     end
 
     [RUBY_EXE, ENV['RUBY_FLAGS'], opts[:options], body, opts[:args]].compact.join(' ')

diff --git a/spec/mspec/lib/mspec/runner/actions/filter.rb b/spec/mspec/lib/mspec/runner/actions/filter.rb
@@ -14,14 +14,14 @@ def initialize(tags=nil, descs=nil)
     @tags = Array(tags)
     descs = Array(descs)
     @sfilter = MatchFilter.new(nil, *descs) unless descs.empty?
+    @tfilter = nil
   end
 
   def ===(string)
     @sfilter === string or @tfilter === string
   end
 
   def load
-    @tfilter = nil
     return if @tags.empty?
 
     desc = MSpec.read_tags(@tags).map { |t| t.description }

diff --git a/spec/mspec/lib/mspec/runner/mspec.rb b/spec/mspec/lib/mspec/runner/mspec.rb
@@ -16,7 +16,9 @@ module MSpec
   @leave   = nil
   @load    = nil
   @unload  = nil
+  @tagged  = nil
   @current = nil
+  @example = nil
   @modes   = []
   @shared  = {}
   @guarded = []

diff --git a/spec/mspec/lib/mspec/runner/tag.rb b/spec/mspec/lib/mspec/runner/tag.rb
@@ -13,13 +13,19 @@ def parse(string)
 
   def unescape(str)
     return unless str
-    str = str[1..-2] if str[0] == ?" and str[-1] == ?"
-    str.gsub(/\\n/, "\n")
+    if str[0] == ?" and str[-1] == ?"
+      str[1..-2].gsub('\n', "\n")
+    else
+      str
+    end
   end
 
   def escape(str)
-    str = %["#{str.gsub(/\n/, '\n')}"] if /\n/ =~ str
-    str
+    if str.include? "\n"
+      %["#{str.gsub("\n", '\n')}"]
+    else
+      str
+    end
   end
 
   def to_s

diff --git a/spec/mspec/spec/helpers/io_spec.rb b/spec/mspec/spec/helpers/io_spec.rb
@@ -52,6 +52,7 @@
 describe Object, "#new_fd" do
   before :each do
     @name = tmp("io_specs")
+    @io = nil
   end
 
   after :each do

diff --git a/spec/mspec/spec/runner/exception_spec.rb b/spec/mspec/spec/runner/exception_spec.rb
@@ -87,6 +87,10 @@
 end
 
 describe ExceptionState, "#message" do
+  before :each do
+    @state = ExampleState.new ContextState.new("C#m"), "works"
+  end
+
   it "returns <No message> if the exception message is empty" do
     exc = ExceptionState.new @state, "", Exception.new("")
     exc.message.should == "<No message>"
@@ -111,6 +115,7 @@
 
 describe ExceptionState, "#backtrace" do
   before :each do
+    @state = ExampleState.new ContextState.new("C#m"), "works"
     begin
       raise Exception
     rescue Exception => @exception

diff --git a/spec/mspec/spec/runner/formatters/method_spec.rb b/spec/mspec/spec/runner/formatters/method_spec.rb
@@ -120,8 +120,8 @@
     @formatter.before state
 
     exc = SpecExpectationNotMetError.new "failed"
-    @formatter.exception ExceptionState.new(@state, nil, exc)
-    @formatter.exception ExceptionState.new(@state, nil, exc)
+    @formatter.exception ExceptionState.new(state, nil, exc)
+    @formatter.exception ExceptionState.new(state, nil, exc)
 
     @formatter.after state
     h = @formatter.methods["Some#method"]

diff --git a/spec/mspec/spec/runner/mspec_spec.rb b/spec/mspec/spec/runner/mspec_spec.rb
@@ -95,7 +95,6 @@
   before :each do
     MSpec.clear_current
     @cs = ContextState.new "C#m"
-    @cs.stub(:state).and_return(@es)
     @cs.parent = MSpec.current
 
     @es = ExampleState.new @cs, "runs"

diff --git a/spec/mspec/spec/runner/tag_spec.rb b/spec/mspec/spec/runner/tag_spec.rb
@@ -109,3 +109,15 @@
     [one].==([two]).should == true
   end
 end
+
+describe SpecTag, "#unescape" do
+  it "replaces \\n by LF when the description is quoted" do
+    tag = SpecTag.new 'tag:"desc with\nnew line"'
+    tag.description.should == "desc with\nnew line"
+  end
+
+  it "does not replaces \\n by LF when the description is not quoted " do
+    tag = SpecTag.new 'tag:desc with\nnew line'
+    tag.description.should == "desc with\\nnew line"
+  end
+end
diff --git a/spec/ruby/command_line/dash_s_spec.rb b/spec/ruby/command_line/dash_s_spec.rb
@@ -3,27 +3,23 @@
 describe "The -s command line option" do
   describe "when using -- to stop parsing" do
     it "sets the value to true without an explicit value" do
-      ruby_exe("p $n", escape: true,
-                          options: "-s",
-                          args: "-- -n").chomp.should == "true"
+      ruby_exe(nil, options: "-s -e 'p $n'",
+                    args: "-- -n").chomp.should == "true"
     end
 
     it "parses single letter args into globals" do
-      ruby_exe("puts $n", escape: true,
-                          options: "-s",
-                          args: "-- -n=blah").chomp.should == "blah"
+      ruby_exe(nil, options: "-s -e 'puts $n'",
+                    args: "-- -n=blah").chomp.should == "blah"
     end
 
     it "parses long args into globals" do
-      ruby_exe("puts $_name", escape: true,
-                          options: "-s",
-                          args: "-- --name=blah").chomp.should == "blah"
+      ruby_exe(nil, options: "-s -e 'puts $_name'",
+                    args: "-- --name=blah").chomp.should == "blah"
     end
 
     it "converts extra dashes into underscores" do
-      ruby_exe("puts $___name__test__", escape: true,
-                          options: "-s",
-                          args: "-- ----name--test--=blah").chomp.should == "blah"
+      ruby_exe(nil, options: "-s -e 'puts $___name__test__'",
+                    args: "-- ----name--test--=blah").chomp.should == "blah"
     end
   end
 

diff --git a/spec/ruby/core/array/any_spec.rb b/spec/ruby/core/array/any_spec.rb
@@ -1,13 +1,13 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
 describe "Array#any?" do
-  describe 'with no block given (a default block of { |x| x } is implicit)' do 
-    it "is false if the array is empty" do 
+  describe 'with no block given (a default block of { |x| x } is implicit)' do
+    it "is false if the array is empty" do
       empty_array = []
       empty_array.any?.should == false
     end
 
-    it "is false if the array is not empty, but all the members of the array are falsy" do 
+    it "is false if the array is not empty, but all the members of the array are falsy" do
       falsy_array = [false, nil, false]
       falsy_array.any?.should == false
     end
@@ -18,18 +18,18 @@
     end
   end
 
-  describe 'with a block given' do 
-    it 'is false if the array is empty' do 
+  describe 'with a block given' do
+    it 'is false if the array is empty' do
       empty_array = []
       empty_array.any? {|v| 1 == 1 }.should == false
     end
 
-    it 'is true if the block returns true for any member of the array' do 
+    it 'is true if the block returns true for any member of the array' do
       array_with_members = [false, false, true, false]
       array_with_members.any? {|v| v == true }.should == true
     end
 
-    it 'is false if the block returns false for all members of the array' do 
+    it 'is false if the block returns false for all members of the array' do
       array_with_members = [false, false, true, false]
       array_with_members.any? {|v| v == 42 }.should == false
     end

diff --git a/spec/ruby/core/basicobject/__send___spec.rb b/spec/ruby/core/basicobject/__send___spec.rb
@@ -1,7 +1,10 @@
 require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../../../shared/basicobject/send', __FILE__)
 
 describe "BasicObject#__send__" do
   it "is a public instance method" do
     BasicObject.should have_public_instance_method(:__send__)
   end
+
+  it_behaves_like(:basicobject_send, :__send__)
 end
diff --git a/spec/ruby/core/basicobject/method_missing_spec.rb b/spec/ruby/core/basicobject/method_missing_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../shared/kernel/method_missing', __FILE__)
+require File.expand_path('../../../shared/basicobject/method_missing', __FILE__)
 
 describe "BasicObject#method_missing" do
   it "is a private method" do
@@ -13,3 +13,27 @@
 describe "BasicObject#method_missing" do
   it_behaves_like :method_missing_instance, nil, BasicObject
 end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_defined_module, nil, KernelSpecs::ModuleMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_module, nil, KernelSpecs::ModuleNoMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_defined_class, nil, KernelSpecs::ClassMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_class, nil, KernelSpecs::ClassNoMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_defined_instance, nil, KernelSpecs::ClassMM
+end
+
+describe "BasicObject#method_missing" do
+  it_behaves_like :method_missing_instance, nil, KernelSpecs::ClassNoMM
+end
diff --git a/spec/ruby/core/binding/local_variables_spec.rb b/spec/ruby/core/binding/local_variables_spec.rb
@@ -0,0 +1,37 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+ruby_version_is "2.2" do
+  describe "Binding#local_variables" do
+    it "returns an Array" do
+      binding.local_variables.should be_kind_of(Array)
+    end
+
+    it "includes local variables in the current scope" do
+      a = 1
+      b = nil
+      binding.local_variables.should == [:a, :b]
+    end
+
+    it "includes local variables defined after calling binding.local_variables" do
+      binding.local_variables.should == [:a, :b]
+      a = 1
+      b = 2
+    end
+
+    it "includes local variables of inherited scopes and eval'ed context" do
+      p = proc { |a| b = 1; eval("c = 2; binding.local_variables") }
+      p.call.should == [:c, :a, :b, :p]
+    end
+
+    it "includes shadowed local variables only once" do
+      a = 1
+      proc { a = 2; binding.local_variables }.call.should == [:a]
+    end
+
+    it "includes new variables defined in the binding" do
+      b = binding
+      b.local_variable_set :a, 42
+      b.local_variables.should == [:a, :b]
+    end
+  end
+end
diff --git a/spec/ruby/core/binding/receiver_spec.rb b/spec/ruby/core/binding/receiver_spec.rb
@@ -0,0 +1,13 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../fixtures/classes', __FILE__)
+
+ruby_version_is "2.2" do
+  describe "Binding#receiver" do
+    it "returns the object to which binding is bound" do
+      obj = BindingSpecs::Demo.new(1)
+      obj.get_binding.receiver.should == obj
+
+      binding.receiver.should == self
+    end
+  end
+end
diff --git a/spec/ruby/core/continuation/call_spec.rb b/spec/ruby/core/continuation/call_spec.rb
diff --git a/spec/ruby/core/continuation/element_reference_spec.rb b/spec/ruby/core/continuation/element_reference_spec.rb
diff --git a/spec/ruby/core/continuation/new_spec.rb b/spec/ruby/core/continuation/new_spec.rb
diff --git a/spec/ruby/core/enumerable/each_cons_spec.rb b/spec/ruby/core/enumerable/each_cons_spec.rb
@@ -14,7 +14,7 @@
     acc.should == @in_threes
   end
 
-  it "raises an Argument Error if there is not a single parameter > 0" do
+  it "raises an ArgumentError if there is not a single parameter > 0" do
     lambda{ @enum.each_cons(0){}    }.should raise_error(ArgumentError)
     lambda{ @enum.each_cons(-2){}   }.should raise_error(ArgumentError)
     lambda{ @enum.each_cons{}       }.should raise_error(ArgumentError)

diff --git a/spec/ruby/core/enumerable/each_entry_spec.rb b/spec/ruby/core/enumerable/each_entry_spec.rb
@@ -26,7 +26,7 @@
     ScratchPad.recorded.should == [[:a, 0], [:b, 1]]
   end
 
-  it "raises an Argument error when extra arguments" do
+  it "raises an ArgumentError when extra arguments" do
     lambda { @enum.each_entry("one").to_a   }.should raise_error(ArgumentError)
     lambda { @enum.each_entry("one"){}.to_a }.should raise_error(ArgumentError)
   end

diff --git a/spec/ruby/core/enumerable/each_slice_spec.rb b/spec/ruby/core/enumerable/each_slice_spec.rb
@@ -14,7 +14,7 @@
     acc.should == @sliced
   end
 
-  it "raises an Argument Error if there is not a single parameter > 0" do
+  it "raises an ArgumentError if there is not a single parameter > 0" do
     lambda{ @enum.each_slice(0){}    }.should raise_error(ArgumentError)
     lambda{ @enum.each_slice(-2){}   }.should raise_error(ArgumentError)
     lambda{ @enum.each_slice{}       }.should raise_error(ArgumentError)