MAGETWO-37981: fixed integration tests

Joan He · Joan He · commit 4143586a2023 · 2015-06-18T12:28:41.000-05:00
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
@@ -34,7 +34,7 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase
      *
      * @var string
      */
-    protected $uri;
+    protected $uri = null;
 
     protected function setUp()
     {
@@ -88,12 +88,9 @@ public function assertSessionMessages(
 
     public function testAclHasAccess()
     {
-        if ($this->resource === null) {
-            $this->markTestIncomplete('Acl test is not complete');
+        if ($this->uri === null) {
+            $this->markTestIncomplete('AclHasAccess test is not complete');
         }
-        $this->_objectManager->get('Magento\Framework\Acl\Builder')
-            ->getAcl()
-            ->allow(null, $this->resource);
         $this->dispatch($this->uri);
         $this->assertNotSame(403, $this->getResponse()->getHttpResponseCode());
     }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ abstract class AbstractBackendController extends \Magento\TestFramework\TestCase`
`34`	`34`	`*`
`35`	`35`	`* @var string`
`36`	`36`	`*/`
`37`		`- protected $uri;`
	`37`	`+ protected $uri = null;`
`38`	`38`
`39`	`39`	`protected function setUp()`
`40`	`40`	`{`
`@@ -88,12 +88,9 @@ public function assertSessionMessages(`
`88`	`88`
`89`	`89`	`public function testAclHasAccess()`
`90`	`90`	`{`
`91`		`- if ($this->resource === null) {`
`92`		`- $this->markTestIncomplete('Acl test is not complete');`
	`91`	`+ if ($this->uri === null) {`
	`92`	`+ $this->markTestIncomplete('AclHasAccess test is not complete');`
`93`	`93`	`}`
`94`		`- $this->_objectManager->get('Magento\Framework\Acl\Builder')`
`95`		`- ->getAcl()`
`96`		`- ->allow(null, $this->resource);`
`97`	`94`	`$this->dispatch($this->uri);`
`98`	`95`	`$this->assertNotSame(403, $this->getResponse()->getHttpResponseCode());`
`99`	`96`	`}`