Merge remote-tracking branch 'origin/MAGETWO-67115' into 2.1.8-develop-pr20

zakdma · zakdma · commit 329a02f475cc · 2017-06-27T16:03:07.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Webapi/Test/Constraint/AssertWebapiNoAccessByCookie.php b/dev/tests/functional/tests/app/Magento/Webapi/Test/Constraint/AssertWebapiNoAccessByCookie.php
@@ -41,10 +41,12 @@ public function processAssert(
     ) {
         // Create and login a customer on frontend
         $customer->persist();
-        $this->objectManager->create(
-            'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep',
+        /** @var \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep $customerLoginStep */
+        $customerLoginStep = $this->objectManager->create(
+            \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class,
             ['customer' => $customer]
-        )->run();
+        );
+        $customerLoginStep->run();
 
         // Go to cms page with form as logged in customer and submit request
         $browser->open($_ENV['app_frontend_url'] . $cms->getIdentifier());
@@ -55,6 +57,8 @@ public function processAssert(
             $browser->getHtmlSource(),
             'Customer should not have customer webapi access through cookies.'
         );
+
+        $customerLoginStep->cleanup();
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Webapi/Test/TestCase/CustomerWebapisPermissionTest.php b/dev/tests/functional/tests/app/Magento/Webapi/Test/TestCase/CustomerWebapisPermissionTest.php
@@ -82,28 +82,33 @@ public function __inject(
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
             ['configData' => 'wysiwyg_disabled']
         )->run();
+
         return ['cmsOriginal' => $cmsOriginal];
     }
 
     /**
      * Construct cms page with a form that contains webapi request and 'Submit Request' button.
      *
      * @param CmsPage $cmsOriginal
+     * @param string $url
+     * @param string $method
      * @return array
      */
-    public function test(CmsPage $cmsOriginal)
+    public function test(CmsPage $cmsOriginal, $url, $method = 'POST')
     {
         $this->cmsPageIndex->open();
         $this->cmsPageIndex->getCmsPageGridBlock()->searchAndOpen(['title' => $cmsOriginal->getTitle()]);
         $data = $cmsOriginal->getData();
-        $content = '<p><form action="'
-            . $_ENV['app_frontend_url']
-            . 'rest/V1/carts/mine/balance/apply" method="POST">'
-            . '<input type="submit" value="Submit Request" /></form></p>';
+        $content = <<<HTML
+            <form action="$url" method="$method" >
+                <input type="submit" value="Submit Request" />
+            </form>
+HTML;
         $data['content'] = ['content' => $content];
         $cms = $this->factory->createByCode('cmsPage', ['data' => $data]);
         $this->cmsPageNew->getPageForm()->fill($cms);
         $this->cmsPageNew->getPageMainActions()->save();
+        
         return ['cms' => $cms];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Webapi/Test/TestCase/CustomerWebapisPermissionTest.xml b/dev/tests/functional/tests/app/Magento/Webapi/Test/TestCase/CustomerWebapisPermissionTest.xml
@@ -8,6 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Webapi\Test\TestCase\CustomerWebapisPermissionTest" summary="Customer Webapi Permission Test" ticketId="MAGETWO-64389">
         <variation name="CustomerWebapisPermissionTestVariation1">
+            <data name="url">rest/V1/carts/mine</data>
+            <data name="method">POST</data>
             <constraint name="Magento\Webapi\Test\Constraint\AssertWebapiNoAccessByCookie" />
         </variation>
     </testCase>
