1 files changed, 40 insertions, 7 deletions
diff --git a/spec/ruby/core/proc/shared/to_s.rb b/spec/ruby/core/proc/shared/to_s.rb
index c3f82a73f3..a52688a89f 100644
--- a/spec/ruby/core/proc/shared/to_s.rb
+++ b/spec/ruby/core/proc/shared/to_s.rb
@@ -1,27 +1,60 @@
 describe :proc_to_s, shared: true do
   describe "for a proc created with Proc.new" do
-    it "returns a description optionally including file and line number" do
-      Proc.new { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?)(@([^ ]*)\/to_s\.rb:4)?>$/
+    it "returns a description including file and line number" do
+      Proc.new { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ }>$/
+    end
+
+    it "has a binary encoding" do
+      Proc.new { "hello" }.send(@method).encoding.should == Encoding::BINARY
     end
   end
 
   describe "for a proc created with lambda" do
-    it "returns a description including '(lambda)' and optionally including file and line number" do
-      lambda { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?)(@([^ ]*)\/to_s\.rb:10)? \(lambda\)>$/
+    it "returns a description including '(lambda)' and including file and line number" do
+      -> { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ } \(lambda\)>$/
+    end
+
+    it "has a binary encoding" do
+      -> { "hello" }.send(@method).encoding.should == Encoding::BINARY
     end
   end
 
   describe "for a proc created with proc" do
-    it "returns a description optionally including file and line number" do
-      proc { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?)(@([^ ]*)\/to_s\.rb:16)?>$/
+    it "returns a description including file and line number" do
+      proc { "hello" }.send(@method).should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ }>$/
+    end
+
+    it "has a binary encoding" do
+      proc { "hello" }.send(@method).encoding.should == Encoding::BINARY
     end
   end
 
   describe "for a proc created with UnboundMethod#to_proc" do
     it "returns a description including '(lambda)' and optionally including file and line number" do
       def hello; end
+      s = method("hello").to_proc.send(@method)
+      if s.include? __FILE__
+        s.should =~ /^#<Proc:([^ ]*?) #{Regexp.escape __FILE__}:#{__LINE__ - 3} \(lambda\)>$/
+      else
+        s.should =~ /^#<Proc:([^ ]*?) \(lambda\)>$/
+      end
+    end
+
+    it "has a binary encoding" do
+      def hello; end
+      method("hello").to_proc.send(@method).encoding.should == Encoding::BINARY
+    end
+  end
+
+  describe "for a proc created with Symbol#to_proc" do
+    it "returns a description including '(&:symbol)'" do
+      proc = :foobar.to_proc
+      proc.send(@method).should.include?('(&:foobar)')
+    end
 
-      method("hello").to_proc.send(@method).should =~ /^#<Proc:([^ ]*?)(@([^ ]*)\/to_s\.rb:22)? \(lambda\)>$/
+    it "has a binary encoding" do
+      proc = :foobar.to_proc
+      proc.send(@method).encoding.should == Encoding::BINARY
     end
   end
 end