1 files changed, 24 insertions, 21 deletions
diff --git a/spec/ruby/core/string/ord_spec.rb b/spec/ruby/core/string/ord_spec.rb
index 64466fde58..5a17fc1d87 100644
--- a/spec/ruby/core/string/ord_spec.rb
+++ b/spec/ruby/core/string/ord_spec.rb
@@ -1,30 +1,33 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
-with_feature :encoding do
-  describe "String#ord" do
-    it "returns a Fixnum" do
-      'a'.ord.should be_an_instance_of(Fixnum)
-    end
+describe "String#ord" do
+  it "returns an Integer" do
+    'a'.ord.should.instance_of?(Integer)
+  end
 
-    it "returns the codepoint of the first character in the String" do
-      'a'.ord.should == 97
-    end
+  it "returns the codepoint of the first character in the String" do
+    'a'.ord.should == 97
+  end
 
 
-    it "ignores subsequent characters" do
-      "\u{287}a".ord.should == "\u{287}".ord
-    end
+  it "ignores subsequent characters" do
+    "\u{287}a".ord.should == "\u{287}".ord
+  end
 
-    it "understands multibyte characters" do
-      "\u{9879}".ord.should == 39033
-    end
+  it "understands multibyte characters" do
+    "\u{9879}".ord.should == 39033
+  end
 
-    it "is equivalent to #codepoints.first" do
-      "\u{981}\u{982}".ord.should == "\u{981}\u{982}".codepoints.first
-    end
+  it "is equivalent to #codepoints.first" do
+    "\u{981}\u{982}".ord.should == "\u{981}\u{982}".codepoints.first
+  end
+
+  it "raises an ArgumentError if called on an empty String" do
+    -> { ''.ord }.should.raise(ArgumentError)
+  end
 
-    it "raises an ArgumentError if called on an empty String" do
-      lambda { ''.ord }.should raise_error(ArgumentError)
-    end
+  it "raises ArgumentError if the character is broken" do
+    s = "©".dup.force_encoding("US-ASCII")
+    -> { s.ord }.should.raise(ArgumentError, "invalid byte sequence in US-ASCII")
   end
 end