jruby · Dec 2, 2014 · Dec 2, 2014 · Dec 2, 2014 · Dec 2, 2014 · Dec 2, 2014
diff --git a/spec/jruby.2.2.mspec b/spec/jruby.2.2.mspec
@@ -41,7 +41,7 @@ class MSpecScript
     '^' + SPEC_DIR + '/core/encoding/default_internal_spec.rb',
     '^' + SPEC_DIR + '/core/io/pid_spec.rb',
     '^' + SPEC_DIR + '/core/kernel/at_exit_spec.rb',
-    '^' + SPEC_DIR + '/language/encoding_spec.rb',
+    '^' + SPEC_DIR + '/language/break_spec.rb',
     '^' + SPEC_DIR + '/language/predefined_spec.rb',
     '^' + SPEC_DIR + '/language/predefined/data_spec.rb',
   ]

diff --git a/spec/ruby/core/exception/backtrace_spec.rb b/spec/ruby/core/exception/backtrace_spec.rb
@@ -48,4 +48,12 @@
       line.should =~ /^[^ ]+\:\d+(:in `[^`]+')?$/
     end
   end
+
+  it "when redefined does not affect the behaviour of Exception#message" do
+    e = Exception.new
+    e.message.should == 'Exception'
+
+    def e.backtrace; []; end
+    e.message.should == 'Exception'
+  end
 end
diff --git a/spec/ruby/core/exception/redefining_backtrace.rb b/spec/ruby/core/exception/redefining_backtrace.rb
diff --git a/spec/ruby/core/float/divide_spec.rb b/spec/ruby/core/float/divide_spec.rb
@@ -28,4 +28,9 @@
     (0.0 / -0.0).should be_nan
     (-0.0 / -0.0).should be_nan
   end
+
+  it "raises a TypeError when given a non-Numeric" do
+    lambda { 13.0 / "10"    }.should raise_error(TypeError)
+    lambda { 13.0 / :symbol }.should raise_error(TypeError)
+  end
 end
diff --git a/spec/ruby/core/float/gt_spec.rb b/spec/ruby/core/float/gt_spec.rb
@@ -6,4 +6,9 @@
     (2.5 > 3).should == false
     (45.91 > bignum_value).should == false
   end
+
+  it "raises an ArgumentError when given a non-Numeric" do
+    lambda { 5.0 > "4"       }.should raise_error(ArgumentError)
+    lambda { 5.0 > mock('x') }.should raise_error(ArgumentError)
+  end
 end
diff --git a/spec/ruby/core/float/gte_spec.rb b/spec/ruby/core/float/gte_spec.rb
@@ -6,4 +6,9 @@
     (9.71 >= 1).should == true
     (5.55382 >= 0xfabdafbafcab).should == false
   end
+
+  it "raises an ArgumentError when given a non-Numeric" do
+    lambda { 5.0 >= "4"       }.should raise_error(ArgumentError)
+    lambda { 5.0 >= mock('x') }.should raise_error(ArgumentError)
+  end
 end
diff --git a/spec/ruby/core/float/lt_spec.rb b/spec/ruby/core/float/lt_spec.rb
@@ -6,4 +6,9 @@
     (192.6 < -500).should == false
     (-0.12 < 0x4fffffff).should == true
   end
+
+  it "raises an ArgumentError when given a non-Numeric" do
+    lambda { 5.0 < "4"       }.should raise_error(ArgumentError)
+    lambda { 5.0 < mock('x') }.should raise_error(ArgumentError)
+  end
 end
diff --git a/spec/ruby/core/float/lte_spec.rb b/spec/ruby/core/float/lte_spec.rb
@@ -7,4 +7,9 @@
     (0.0 <= 0.0).should == true
     (9_235.9 <= bignum_value).should == true
   end
+
+  it "raises an ArgumentError when given a non-Numeric" do
+    lambda { 5.0 <= "4"       }.should raise_error(ArgumentError)
+    lambda { 5.0 <= mock('x') }.should raise_error(ArgumentError)
+  end
 end
diff --git a/spec/ruby/core/float/multiply_spec.rb b/spec/ruby/core/float/multiply_spec.rb
@@ -6,4 +6,9 @@
     (6712.5 * 0.25).should be_close(1678.125, TOLERANCE)
     (256.4096 * bignum_value).should be_close(2364961134621118431232.000, TOLERANCE)
   end
+
+  it "raises a TypeError when given a non-Numeric" do
+    lambda { 13.0 * "10"    }.should raise_error(TypeError)
+    lambda { 13.0 * :symbol }.should raise_error(TypeError)
+  end
 end
diff --git a/spec/ruby/core/symbol/encoding_spec.rb b/spec/ruby/core/symbol/encoding_spec.rb
@@ -1,5 +1,4 @@
 require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path("../versions/encoding_1.9", __FILE__)
 
 describe "Symbol#encoding for ASCII symbols" do
   it "is US-ASCII" do

diff --git a/...ruby/core/symbol/versions/encoding_1.9.rb → ...core/symbol/versions/encoding_1.9_spec.rb b/...ruby/core/symbol/versions/encoding_1.9.rb → ...core/symbol/versions/encoding_1.9_spec.rb
diff --git a/spec/ruby/language/def_spec.rb b/spec/ruby/language/def_spec.rb
@@ -572,7 +572,3 @@ def some_method; end
     end
   end
 end
-
-ruby_version_is "2.0" do
-  require File.expand_path('../versions/def_2.0.rb', __FILE__)
-end
diff --git a/spec/ruby/language/versions/def_2.0.rb → spec/ruby/language/versions/def_2.0_spec.rb b/spec/ruby/language/versions/def_2.0.rb → spec/ruby/language/versions/def_2.0_spec.rb
diff --git a/spec/tags/ruby/core/symbol/encoding_tags.txt → ...ore/symbol/versions/encoding_1.9_tags.txt b/spec/tags/ruby/core/symbol/encoding_tags.txt → ...ore/symbol/versions/encoding_1.9_tags.txt
diff --git a/spec/truffle/tags/core/exception/backtrace_tags.txt b/spec/truffle/tags/core/exception/backtrace_tags.txt
@@ -7,3 +7,4 @@ fails:Exception#backtrace includes the name of the method from where self raised
 fails:Exception#backtrace includes the filename of the location immediately prior to where self raised in the second element
 fails:Exception#backtrace includes the line number of the location immediately prior to where self raised in the second element
 fails:Exception#backtrace contains lines of the same format for each prior position in the stack
+fails:Exception#backtrace when redefined does not affect the behaviour of Exception#message
diff --git a/spec/truffle/tags/core/float/divide_tags.txt b/spec/truffle/tags/core/float/divide_tags.txt
@@ -3,3 +3,4 @@ fails:Float#/ properly coerces objects
 fails:Float#/ returns +Infinity when dividing non-zero by zero of the same sign
 fails:Float#/ returns -Infinity when dividing non-zero by zero of opposite sign
 fails:Float#/ returns NaN when dividing zero by zero
+fails:Float#/ raises a TypeError when given a non-Numeric
diff --git a/spec/truffle/tags/core/float/multiply_tags.txt b/spec/truffle/tags/core/float/multiply_tags.txt
@@ -1 +1,2 @@
 fails:Float#* returns self multiplied by other
+fails:Float#* raises a TypeError when given a non-Numeric
diff --git a/spec/truffle/tags/core/symbol/encoding_tags.txt b/spec/truffle/tags/core/symbol/encoding_tags.txt
@@ -1,4 +1,2 @@
-fails:Symbol#encoding for UTF-8 symbols is UTF-8
-fails:Symbol#encoding for UTF-8 symbols is UTF-8 after converting to string
 fails:Symbol#encoding for ASCII symbols is US-ASCII
 fails:Symbol#encoding for ASCII symbols is US-ASCII after converting to string
diff --git a/spec/truffle/tags/core/symbol/versions/encoding_1.9_tags.txt b/spec/truffle/tags/core/symbol/versions/encoding_1.9_tags.txt
@@ -0,0 +1,2 @@
+fails:Symbol#encoding for UTF-8 symbols is UTF-8
+fails:Symbol#encoding for UTF-8 symbols is UTF-8 after converting to string
diff --git a/...truffle/tags/language/versions/def_2.0.rb → ...e/tags/language/versions/def_2.0_tags.txt b/...truffle/tags/language/versions/def_2.0.rb → ...e/tags/language/versions/def_2.0_tags.txt
diff --git a/spec/truffle/truffle.mspec b/spec/truffle/truffle.mspec
@@ -102,7 +102,6 @@ class MSpecScript
     "^spec/ruby/core/string/match_spec.rb",
     "^spec/ruby/core/string/modulo_spec.rb",
     "^spec/ruby/core/string/rindex_spec.rb",
-    "^spec/ruby/core/symbol/encoding_spec.rb",
     "^spec/ruby/core/thread/raise_spec.rb",
   ]
-Original file line number
+Diff line change
@@ @@ -572,7 +572,3 @@ def some_method; end @@
         end
       end
     end
-    ruby_version_is "2.0" do
-      require File.expand_path('../versions/def_2.0.rb', __FILE__)
-    end
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		fails:Float#* returns self multiplied by other
		fails:Float#* raises a TypeError when given a non-Numeric
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fails:Symbol#encoding for UTF-8 symbols is UTF-8
		fails:Symbol#encoding for UTF-8 symbols is UTF-8 after converting to string