1 files changed, 13 insertions, 15 deletions
diff --git a/spec/ruby/core/string/codepoints_spec.rb b/spec/ruby/core/string/codepoints_spec.rb
index 6304513583..51bd57d127 100644
--- a/spec/ruby/core/string/codepoints_spec.rb
+++ b/spec/ruby/core/string/codepoints_spec.rb
@@ -1,20 +1,18 @@
-# -*- encoding: binary -*-
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../shared/codepoints', __FILE__)
-require File.expand_path('../shared/each_codepoint_without_block', __FILE__)
+# encoding: binary
+require_relative '../../spec_helper'
+require_relative 'shared/codepoints'
+require_relative 'shared/each_codepoint_without_block'
 
-with_feature :encoding do
-  describe "String#codepoints" do
-    it_behaves_like(:string_codepoints, :codepoints)
+describe "String#codepoints" do
+  it_behaves_like :string_codepoints, :codepoints
 
-    it "returns an Array when no block is given" do
-      "abc".send(@method).should == [?a.ord, ?b.ord, ?c.ord]
-    end
+  it "returns an Array when no block is given" do
+    "abc".codepoints.should == [?a.ord, ?b.ord, ?c.ord]
+  end
 
-    it "raises an ArgumentError when no block is given if self has an invalid encoding" do
-      s = "\xDF".force_encoding(Encoding::UTF_8)
-      s.valid_encoding?.should be_false
-      lambda {s.send(@method)}.should raise_error(ArgumentError)
-    end
+  it "raises an ArgumentError when no block is given if self has an invalid encoding" do
+    s = "\xDF".dup.force_encoding(Encoding::UTF_8)
+    s.valid_encoding?.should == false
+    -> { s.codepoints }.should.raise(ArgumentError)
   end
 end