Merge pull request #1146 from ghostwriter/bugfix/overriding-expects-d…

…efault-call-count Override default call count expectations via `expects()`
mockery · Oct 19, 2021 · 816475d · 816475d
2 parents e01123a + ae18b1a
commit 816475d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/library/Mockery/Expectation.php b/library/Mockery/Expectation.php
@@ -728,7 +728,12 @@ public function times($limit = null)
             throw new \InvalidArgumentException('The passed Times limit should be an integer value');
         }
         $this->_countValidators[$this->_countValidatorClass] = new $this->_countValidatorClass($this, $limit);
-        $this->_countValidatorClass = 'Mockery\CountValidator\Exact';
+
+        if ('Mockery\CountValidator\Exact' !== $this->_countValidatorClass) {
+            $this->_countValidatorClass = 'Mockery\CountValidator\Exact';
+            unset($this->_countValidators[$this->_countValidatorClass]);
+        }
+
         return $this;
     }
 

diff --git a/tests/Mockery/ExpectationTest.php b/tests/Mockery/ExpectationTest.php
@@ -683,6 +683,22 @@ public function testCalledAtLeastOnceAtExactlyThreeCalls()
         $this->mock->foo();
     }
 
+    public function testExpectsStringArgumentCalledAtLeastOnceOverridingDefaultOnceCall()
+    {
+        $this->mock->expects('foo')->atLeast()->once();
+        $this->mock->foo();
+        $this->mock->foo();
+        $this->mock->foo();
+    }
+
+    public function testExpectsNoArgumentCalledAtLeastOnceOverridingDefaultOnceCall()
+    {
+        $this->mock->expects()->foo()->atLeast()->once();
+        $this->mock->foo();
+        $this->mock->foo();
+        $this->mock->foo();
+    }
+
     public function testCalledAtLeastThrowsExceptionOnTooFewCalls()
     {
         $this->mock->shouldReceive('foo')->atLeast()->twice();