diff options
Diffstat (limited to 'spec/ruby/core/main')
-rw-r--r-- | spec/ruby/core/main/fixtures/classes.rb | 8 | ||||
-rw-r--r-- | spec/ruby/core/main/private_spec.rb | 31 | ||||
-rw-r--r-- | spec/ruby/core/main/public_spec.rb | 27 |
3 files changed, 8 insertions, 58 deletions
diff --git a/spec/ruby/core/main/fixtures/classes.rb b/spec/ruby/core/main/fixtures/classes.rb index 757cee4e4a..6aba948ce0 100644 --- a/spec/ruby/core/main/fixtures/classes.rb +++ b/spec/ruby/core/main/fixtures/classes.rb @@ -13,14 +13,6 @@ def main_public_method end public :main_public_method -def main_public_method2 -end -public :main_public_method2 - def main_private_method end private :main_private_method - -def main_private_method2 -end -private :main_private_method2 diff --git a/spec/ruby/core/main/private_spec.rb b/spec/ruby/core/main/private_spec.rb index 78c5d287d4..e34e0c7b7b 100644 --- a/spec/ruby/core/main/private_spec.rb +++ b/spec/ruby/core/main/private_spec.rb @@ -4,41 +4,20 @@ require_relative 'fixtures/classes' describe "main#private" do after :each do Object.send(:public, :main_public_method) - Object.send(:public, :main_public_method2) end - context "when single argument is passed and it is not an array" do - it "sets the visibility of the given methods to private" do - eval "private :main_public_method", TOPLEVEL_BINDING - Object.should have_private_method(:main_public_method) - end - end - - context "when multiple arguments are passed" do - it "sets the visibility of the given methods to private" do - eval "private :main_public_method, :main_public_method2", TOPLEVEL_BINDING - Object.should have_private_method(:main_public_method) - Object.should have_private_method(:main_public_method2) - end - end - - ruby_version_is "3.0" do - context "when single argument is passed and is an array" do - it "sets the visibility of the given methods to private" do - eval "private [:main_public_method, :main_public_method2]", TOPLEVEL_BINDING - Object.should have_private_method(:main_public_method) - Object.should have_private_method(:main_public_method2) - end - end + it "sets the visibility of the given method to private" do + eval "private :main_public_method", TOPLEVEL_BINDING + Object.should have_private_method(:main_public_method) end it "returns Object" do eval("private :main_public_method", TOPLEVEL_BINDING).should equal(Object) end - it "raises a NameError when at least one of given method names is undefined" do + it "raises a NameError when given an undefined name" do -> do - eval "private :main_public_method, :main_undefined_method", TOPLEVEL_BINDING + eval "private :main_undefined_method", TOPLEVEL_BINDING end.should raise_error(NameError) end end diff --git a/spec/ruby/core/main/public_spec.rb b/spec/ruby/core/main/public_spec.rb index bfc27a9e80..afe25c705a 100644 --- a/spec/ruby/core/main/public_spec.rb +++ b/spec/ruby/core/main/public_spec.rb @@ -4,32 +4,11 @@ require_relative 'fixtures/classes' describe "main#public" do after :each do Object.send(:private, :main_private_method) - Object.send(:private, :main_private_method2) end - context "when single argument is passed and it is not an array" do - it "sets the visibility of the given methods to public" do - eval "public :main_private_method", TOPLEVEL_BINDING - Object.should_not have_private_method(:main_private_method) - end - end - - context "when multiple arguments are passed" do - it "sets the visibility of the given methods to public" do - eval "public :main_private_method, :main_private_method2", TOPLEVEL_BINDING - Object.should_not have_private_method(:main_private_method) - Object.should_not have_private_method(:main_private_method2) - end - end - - ruby_version_is "3.0" do - context "when single argument is passed and is an array" do - it "sets the visibility of the given methods to public" do - eval "public [:main_private_method, :main_private_method2]", TOPLEVEL_BINDING - Object.should_not have_private_method(:main_private_method) - Object.should_not have_private_method(:main_private_method2) - end - end + it "sets the visibility of the given method to public" do + eval "public :main_private_method", TOPLEVEL_BINDING + Object.should_not have_private_method(:main_private_method) end it "returns Object" do |