1 files changed, 62 insertions, 23 deletions
diff --git a/spec/ruby/core/binding/eval_spec.rb b/spec/ruby/core/binding/eval_spec.rb
index fff8c9cf44..84096f8a91 100644
--- a/spec/ruby/core/binding/eval_spec.rb
+++ b/spec/ruby/core/binding/eval_spec.rb
@@ -23,29 +23,58 @@ describe "Binding#eval" do
     bind2.local_variables.should == []
   end
 
-  it "inherits __LINE__ from the enclosing scope" do
-    obj = BindingSpecs::Demo.new(1)
-    bind = obj.get_binding
-    suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding
-  end
+  ruby_version_is ""..."2.8" do
+    it "inherits __LINE__ from the enclosing scope" do
+      obj = BindingSpecs::Demo.new(1)
+      bind = obj.get_binding
+      suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding
+    end
 
-  it "preserves __LINE__ across multiple calls to eval" do
-    obj = BindingSpecs::Demo.new(1)
-    bind = obj.get_binding
-    suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding
-    suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding
-  end
+    it "preserves __LINE__ across multiple calls to eval" do
+      obj = BindingSpecs::Demo.new(1)
+      bind = obj.get_binding
+      suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding
+      suppress_warning {bind.eval("__LINE__")}.should == obj.get_line_of_binding
+    end
 
-  it "increments __LINE__ on each line of a multiline eval" do
-    obj = BindingSpecs::Demo.new(1)
-    bind = obj.get_binding
-    suppress_warning {bind.eval("#foo\n__LINE__")}.should == obj.get_line_of_binding + 1
+    it "increments __LINE__ on each line of a multiline eval" do
+      obj = BindingSpecs::Demo.new(1)
+      bind = obj.get_binding
+      suppress_warning {bind.eval("#foo\n__LINE__")}.should == obj.get_line_of_binding + 1
+    end
+
+    it "inherits __LINE__ from the enclosing scope even if the Binding is created with #send" do
+      obj = BindingSpecs::Demo.new(1)
+      bind, line = obj.get_binding_with_send_and_line
+      suppress_warning {bind.eval("__LINE__")}.should == line
+    end
   end
 
-  it "inherits __LINE__ from the enclosing scope even if the Binding is created with #send" do
-    obj = BindingSpecs::Demo.new(1)
-    bind, line = obj.get_binding_with_send_and_line
-    suppress_warning {bind.eval("__LINE__")}.should == line
+  ruby_version_is "2.8" do
+    it "starts with line 1 if single argument is given" do
+      obj = BindingSpecs::Demo.new(1)
+      bind = obj.get_binding
+      bind.eval("__LINE__").should == 1
+    end
+
+    it "preserves __LINE__ across multiple calls to eval" do
+      obj = BindingSpecs::Demo.new(1)
+      bind = obj.get_binding
+      bind.eval("__LINE__").should == 1
+      bind.eval("__LINE__").should == 1
+    end
+
+    it "increments __LINE__ on each line of a multiline eval" do
+      obj = BindingSpecs::Demo.new(1)
+      bind = obj.get_binding
+      bind.eval("#foo\n__LINE__").should == 2
+    end
+
+    it "starts with line 1 if the Binding is created with #send" do
+      obj = BindingSpecs::Demo.new(1)
+      bind, line = obj.get_binding_with_send_and_line
+      bind.eval("__LINE__").should == 1
+    end
   end
 
   it "starts with a __LINE__ of 1 if a filename is passed" do
@@ -60,10 +89,20 @@ describe "Binding#eval" do
     bind.eval("#foo\n__LINE__", "(test)", 88).should == 89
   end
 
-  it "inherits __FILE__ from the enclosing scope" do
-    obj = BindingSpecs::Demo.new(1)
-    bind = obj.get_binding
-    suppress_warning {bind.eval("__FILE__")}.should == obj.get_file_of_binding
+  ruby_version_is ""..."2.8" do
+    it "inherits __FILE__ from the enclosing scope" do
+      obj = BindingSpecs::Demo.new(1)
+      bind = obj.get_binding
+      suppress_warning {bind.eval("__FILE__")}.should == obj.get_file_of_binding
+    end
+  end
+
+  ruby_version_is "2.8" do
+    it "Uses (eval) as __FILE__ if single argument given" do
+      obj = BindingSpecs::Demo.new(1)
+      bind = obj.get_binding
+      bind.eval("__FILE__").should == '(eval)'
+    end
   end
 
   it "uses the __FILE__ that is passed in" do