Merge branch 'master' of git://github.com/Payum/Payum

Payum · Mar 25, 2016 · ea73ea8 · ea73ea8
2 parents 82b70d6 + ea912c8
commit ea73ea8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/Action/CaptureAction.php b/Action/CaptureAction.php
@@ -21,12 +21,12 @@ public function execute($request)
 
         $model = ArrayObject::ensureArrayObject($request->getModel());
 
+        if ($model['status']) {
+            return;
+        }
+
         if ($model['customer']) {
         } else {
-            if (is_array($model['card'])) {
-                return;
-            }
-
             if (false == $model['card']) {
                 $obtainToken = new ObtainToken($request->getToken());
                 $obtainToken->setModel($model);
@@ -36,9 +36,7 @@ public function execute($request)
 
         }
 
-        if (false == $model['status']) {
-            $this->gateway->execute(new CreateCharge($model));
-        }
+        $this->gateway->execute(new CreateCharge($model));
     }
 
     /**

diff --git a/Tests/Action/CaptureActionTest.php b/Tests/Action/CaptureActionTest.php
@@ -30,11 +30,11 @@ public function shouldBeSubClassOfGatewayAwareAction()
     /**
      * @test
      */
-    public function shouldDoNothingIfModelHasAlreadyUsedToken()
+    public function shouldDoNothingIfPaymentHasStatus()
     {
-        $model = array(
-            'card' => array('foo', 'bar'),
-        );
+        $model = [
+            'status' => Constants::STATUS_SUCCEEDED,
+        ];
 
         $gatewayMock = $this->createGatewayMock();
         $gatewayMock
@@ -157,6 +157,33 @@ public function shouldSubExecuteCreateChargeIfCustomerSet()
         $action->execute(new Capture($model));
     }
 
+    /**
+     * @test
+     */
+    public function shouldSubExecuteCreateChargeIfCreditCardSetExplisitly()
+    {
+        $model = [
+            'card' => [
+                'number' => '4111111111111111',
+                'exp_month' => '10',
+                'exp_year' => '20',
+                'cvc' => '123',
+            ],
+        ];
+
+        $gatewayMock = $this->createGatewayMock();
+        $gatewayMock
+            ->expects($this->once())
+            ->method('execute')
+            ->with($this->isInstanceOf(CreateCharge::class))
+        ;
+
+        $action = new CaptureAction();
+        $action->setGateway($gatewayMock);
+
+        $action->execute(new Capture($model));
+    }
+
     /**
      * @test
      */