MONGOID-5435 Fix ArgumentError when block has positional and keyword arguments (#5398)

* Fix ArgumentError when block has positional and keyword arguments

* add assertion on result

* Switch to use of ruby2_keywords for prior to Ruby 2.7

Co-authored-by: Oleg Pudeyev <[email protected]>

Author: kyoshidajp

lib/mongoid/scopable.rb

@@ -289,15 +289,17 @@ def check_scope_validity(value)
       # @return [ Method ] The defined method.
       def define_scope_method(name)
         singleton_class.class_eval do
-          define_method(name) do |*args|
-            scoping = _declared_scopes[name]
-            scope = instance_exec(*args, &scoping[:scope])
-            extension = scoping[:extension]
-            to_merge = scope || queryable
-            criteria = to_merge.empty_and_chainable? ? to_merge : with_default_scope.merge(to_merge)
-            criteria.extend(extension)
-            criteria
-          end
+          ruby2_keywords(
+            define_method(name) do |*args|
+              scoping = _declared_scopes[name]
+              scope = instance_exec(*args, &scoping[:scope])
+              extension = scoping[:extension]
+              to_merge = scope || queryable
+              criteria = to_merge.empty_and_chainable? ? to_merge : with_default_scope.merge(to_merge)
+              criteria.extend(extension)
+              criteria
+            end
+          )
         end
       end
 

spec/mongoid/scopable_spec.rb

@@ -481,27 +481,45 @@ class << Band
 
       context "when a block is provided" do
 
-        before do
-          Band.scope(:active, ->{ Band.where(active: true) }) do
-            def add_origin
-              tap { |c| c.selector[:origin] = "Deutschland" }
-            end
+        context "when with optional and keyword arguments" do
+          before do
+            Band.scope(:named_by, ->(name, deleted: false) {
+              Band.where(name: name, deleted: deleted)
+            })
           end
-        end
 
-        after do
-          class << Band
-            undef_method :active
+          let(:scope) do
+            Band.named_by("Emily", deleted: true)
           end
-          Band._declared_scopes.clear
-        end
 
-        let(:scope) do
-          Band.active.add_origin
+          it "sets the conditions from keyword arguments" do
+            scope.selector.should == {'name' => 'Emily', 'deleted' => true}
+          end
         end
 
-        it "adds the extension to the scope" do
-          expect(scope.selector).to eq({ "active" => true, "origin" => "Deutschland" })
+        context "when without arguments" do
+          before do
+            Band.scope(:active, ->{ Band.where(active: true) }) do
+              def add_origin
+                tap { |c| c.selector[:origin] = "Deutschland" }
+              end
+            end
+          end
+
+          after do
+            class << Band
+              undef_method :active
+            end
+            Band._declared_scopes.clear
+          end
+
+          let(:scope) do
+            Band.active.add_origin
+          end
+
+          it "adds the extension to the scope" do
+            expect(scope.selector).to eq({ "active" => true, "origin" => "Deutschland" })
+          end
         end
       end