From 9f4f3bd1cce879d1de906b332353e5e9c051df00 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 22 Oct 2021 13:53:21 +0900 Subject: Refinement#include and Refinement#prepend have been deprecated --- spec/ruby/core/module/refine_spec.rb | 382 ++++++++++++++++++----------------- 1 file changed, 194 insertions(+), 188 deletions(-) diff --git a/spec/ruby/core/module/refine_spec.rb b/spec/ruby/core/module/refine_spec.rb index e3b7fde049..aa9f955e05 100644 --- a/spec/ruby/core/module/refine_spec.rb +++ b/spec/ruby/core/module/refine_spec.rb @@ -298,63 +298,65 @@ describe "Module#refine" do result.should == "foo from IncludeMeLater" end - it "looks in prepended modules from the refinement first" do - refined_class = ModuleSpecs.build_refined_class + ruby_version_is ""..."3.1" do + it "looks in prepended modules from the refinement first" do + refined_class = ModuleSpecs.build_refined_class - refinement = Module.new do - refine refined_class do - include ModuleSpecs::IncludedModule - prepend ModuleSpecs::PrependedModule + refinement = Module.new do + refine refined_class do + include ModuleSpecs::IncludedModule + prepend ModuleSpecs::PrependedModule - def foo; "foo from refinement"; end + def foo; "foo from refinement"; end + end end - end - result = nil - Module.new do - using refinement - result = refined_class.new.foo + result = nil + Module.new do + using refinement + result = refined_class.new.foo + end + + result.should == "foo from prepended module" end - result.should == "foo from prepended module" - end + it "looks in refinement then" do + refined_class = ModuleSpecs.build_refined_class - it "looks in refinement then" do - refined_class = ModuleSpecs.build_refined_class + refinement = Module.new do + refine(refined_class) do + include ModuleSpecs::IncludedModule - refinement = Module.new do - refine(refined_class) do - include ModuleSpecs::IncludedModule + def foo; "foo from refinement"; end + end + end - def foo; "foo from refinement"; end + result = nil + Module.new do + using refinement + result = refined_class.new.foo end - end - result = nil - Module.new do - using refinement - result = refined_class.new.foo + result.should == "foo from refinement" end - result.should == "foo from refinement" - end + it "looks in included modules from the refinement then" do + refined_class = ModuleSpecs.build_refined_class - it "looks in included modules from the refinement then" do - refined_class = ModuleSpecs.build_refined_class + refinement = Module.new do + refine refined_class do + include ModuleSpecs::IncludedModule + end + end - refinement = Module.new do - refine refined_class do - include ModuleSpecs::IncludedModule + result = nil + Module.new do + using refinement + result = refined_class.new.foo end - end - result = nil - Module.new do - using refinement - result = refined_class.new.foo + result.should == "foo from included module" end - - result.should == "foo from included module" end it "looks in the class then" do @@ -704,55 +706,57 @@ describe "Module#refine" do result.should == "foo" end - it "looks in the refined class from included module" do - refined_class = ModuleSpecs.build_refined_class(for_super: true) + ruby_version_is ""..."3.1" do + it "looks in the refined class from included module" do + refined_class = ModuleSpecs.build_refined_class(for_super: true) - a = Module.new do - def foo - [:A] + super + a = Module.new do + def foo + [:A] + super + end end - end - refinement = Module.new do - refine refined_class do - include a + refinement = Module.new do + refine refined_class do + include a + end end - end - result = nil - Module.new do - using refinement + result = nil + Module.new do + using refinement - result = refined_class.new.foo - end + result = refined_class.new.foo + end - result.should == [:A, :C] - end + result.should == [:A, :C] + end - it "looks in the refined ancestors from included module" do - refined_class = ModuleSpecs.build_refined_class(for_super: true) - subclass = Class.new(refined_class) + it "looks in the refined ancestors from included module" do + refined_class = ModuleSpecs.build_refined_class(for_super: true) + subclass = Class.new(refined_class) - a = Module.new do - def foo - [:A] + super + a = Module.new do + def foo + [:A] + super + end end - end - refinement = Module.new do - refine refined_class do - include a + refinement = Module.new do + refine refined_class do + include a + end end - end - result = nil - Module.new do - using refinement + result = nil + Module.new do + using refinement - result = subclass.new.foo - end + result = subclass.new.foo + end - result.should == [:A, :C] + result.should == [:A, :C] + end end # super in a method of a refinement invokes the method in the refined @@ -816,175 +820,177 @@ describe "Module#refine" do end end - it "does't have access to active refinements for C from included module" do - refined_class = ModuleSpecs.build_refined_class + ruby_version_is ""..."3.1" do + it "does't have access to active refinements for C from included module" do + refined_class = ModuleSpecs.build_refined_class - a = Module.new do - def foo - super + bar + a = Module.new do + def foo + super + bar + end end - end - refinement = Module.new do - refine refined_class do - include a + refinement = Module.new do + refine refined_class do + include a - def bar - "bar is not seen from A methods" + def bar + "bar is not seen from A methods" + end end end - end - Module.new do - using refinement - -> { - refined_class.new.foo - }.should raise_error(NameError) { |e| e.name.should == :bar } + Module.new do + using refinement + -> { + refined_class.new.foo + }.should raise_error(NameError) { |e| e.name.should == :bar } + end end - end - it "does't have access to other active refinements from included module" do - refined_class = ModuleSpecs.build_refined_class + it "does't have access to other active refinements from included module" do + refined_class = ModuleSpecs.build_refined_class - refinement_integer = Module.new do - refine Integer do - def bar - "bar is not seen from A methods" + refinement_integer = Module.new do + refine Integer do + def bar + "bar is not seen from A methods" + end end end - end - a = Module.new do - def foo - super + 1.bar + a = Module.new do + def foo + super + 1.bar + end end - end - refinement = Module.new do - refine refined_class do - include a + refinement = Module.new do + refine refined_class do + include a + end end - end - Module.new do - using refinement - using refinement_integer - -> { - refined_class.new.foo - }.should raise_error(NameError) { |e| e.name.should == :bar } + Module.new do + using refinement + using refinement_integer + -> { + refined_class.new.foo + }.should raise_error(NameError) { |e| e.name.should == :bar } + end end - end - # https://bugs.ruby-lang.org/issues/16977 - it "looks in the another active refinement if super called from included modules" do - refined_class = ModuleSpecs.build_refined_class(for_super: true) + # https://bugs.ruby-lang.org/issues/16977 + it "looks in the another active refinement if super called from included modules" do + refined_class = ModuleSpecs.build_refined_class(for_super: true) - a = Module.new do - def foo - [:A] + super + a = Module.new do + def foo + [:A] + super + end end - end - b = Module.new do - def foo - [:B] + super + b = Module.new do + def foo + [:B] + super + end end - end - refinement_a = Module.new do - refine refined_class do - include a + refinement_a = Module.new do + refine refined_class do + include a + end end - end - refinement_b = Module.new do - refine refined_class do - include b + refinement_b = Module.new do + refine refined_class do + include b + end end - end - result = nil - Module.new do - using refinement_a - using refinement_b - result = refined_class.new.foo + result = nil + Module.new do + using refinement_a + using refinement_b + result = refined_class.new.foo + end + + result.should == [:B, :A, :C] end - result.should == [:B, :A, :C] - end + it "looks in the current active refinement from included modules" do + refined_class = ModuleSpecs.build_refined_class(for_super: true) - it "looks in the current active refinement from included modules" do - refined_class = ModuleSpecs.build_refined_class(for_super: true) + a = Module.new do + def foo + [:A] + super + end + end - a = Module.new do - def foo - [:A] + super + b = Module.new do + def foo + [:B] + super + end end - end - b = Module.new do - def foo - [:B] + super + refinement = Module.new do + refine refined_class do + def foo + [:LAST] + super + end + end end - end - refinement = Module.new do - refine refined_class do - def foo - [:LAST] + super + refinement_a_b = Module.new do + refine refined_class do + include a + include b end end - end - refinement_a_b = Module.new do - refine refined_class do - include a - include b + result = nil + Module.new do + using refinement + using refinement_a_b + result = refined_class.new.foo end - end - result = nil - Module.new do - using refinement - using refinement_a_b - result = refined_class.new.foo + result.should == [:B, :A, :LAST, :C] end - result.should == [:B, :A, :LAST, :C] - end + it "looks in the lexical scope refinements before other active refinements" do + refined_class = ModuleSpecs.build_refined_class(for_super: true) - it "looks in the lexical scope refinements before other active refinements" do - refined_class = ModuleSpecs.build_refined_class(for_super: true) + refinement_local = Module.new do + refine refined_class do + def foo + [:LOCAL] + super + end + end + end + + a = Module.new do + using refinement_local - refinement_local = Module.new do - refine refined_class do def foo - [:LOCAL] + super + [:A] + super end end - end - - a = Module.new do - using refinement_local - def foo - [:A] + super + refinement = Module.new do + refine refined_class do + include a + end end - end - refinement = Module.new do - refine refined_class do - include a + result = nil + Module.new do + using refinement + result = refined_class.new.foo end - end - result = nil - Module.new do - using refinement - result = refined_class.new.foo + result.should == [:A, :LOCAL, :C] end - - result.should == [:A, :LOCAL, :C] end end -- cgit v1.2.3