[#341] Fixing apigee_edge_apiproduct_rbac tests.

apigee · Mar 12, 2020 · e7fc6b9 · e7fc6b9
1 parent c494a4b
commit e7fc6b9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -207,7 +207,6 @@ workflows:
       - run-functional-js-tests:
           requires:
             - update-dependencies
-            - run-functional-tests
       - run-code-sniffer:
           requires:
             - update-dependencies

diff --git a/...BasedAccessAnonymousAuthenticatedTest.php → ...BasedAccessAnonymousAuthenticatedTest.php b/...BasedAccessAnonymousAuthenticatedTest.php → ...BasedAccessAnonymousAuthenticatedTest.php
@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-namespace Drupal\Tests\apigee_edge_apiproduct_rbac\Functional;
+namespace Drupal\Tests\apigee_edge_apiproduct_rbac\FunctionalJavascript;
 
 use Drupal\Core\Session\AccountInterface;
 
@@ -46,8 +46,8 @@ protected function setUp() {
   /**
    * {@inheritdoc}
    *
-   * \Drupal\Tests\apigee_edge\Functional\ApiProductAccessTest validates
-   * developerAppEditFormTest().
+   * \Drupal\Tests\apigee_edge\FunctionalJavascript\ApiProductAccessTest
+   * validates developerAppEditFormTest().
    */
   public function testApiProductAccess() {
     $this->entityAccessTest();

diff --git a/...tRoleBasedAccessAnonymousInternalTest.php → ...tRoleBasedAccessAnonymousInternalTest.php b/...tRoleBasedAccessAnonymousInternalTest.php → ...tRoleBasedAccessAnonymousInternalTest.php
@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-namespace Drupal\Tests\apigee_edge_apiproduct_rbac\Functional;
+namespace Drupal\Tests\apigee_edge_apiproduct_rbac\FunctionalJavascript;
 
 use Drupal\Core\Session\AccountInterface;
 
@@ -46,8 +46,8 @@ protected function setUp() {
   /**
    * {@inheritdoc}
    *
-   * \Drupal\Tests\apigee_edge\Functional\ApiProductAccessTest validates
-   * developerAppEditFormTest().
+   * \Drupal\Tests\apigee_edge\FunctionalJavascript\ApiProductAccessTest
+   * validates developerAppEditFormTest().
    */
   public function testApiProductAccess() {
     $this->entityAccessTest();

diff --git a/...eBasedAccessAuthenticatedInternalTest.php → ...eBasedAccessAuthenticatedInternalTest.php b/...eBasedAccessAuthenticatedInternalTest.php → ...eBasedAccessAuthenticatedInternalTest.php
@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-namespace Drupal\Tests\apigee_edge_apiproduct_rbac\Functional;
+namespace Drupal\Tests\apigee_edge_apiproduct_rbac\FunctionalJavascript;
 
 use Drupal\Core\Session\AccountInterface;
 

diff --git a/...ctRoleBasedAccessMissingAttributeTest.php → ...ctRoleBasedAccessMissingAttributeTest.php b/...ctRoleBasedAccessMissingAttributeTest.php → ...ctRoleBasedAccessMissingAttributeTest.php
@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-namespace Drupal\Tests\apigee_edge_apiproduct_rbac\Functional;
+namespace Drupal\Tests\apigee_edge_apiproduct_rbac\FunctionalJavascript;
 
 use Drupal\Core\Session\AccountInterface;
 
@@ -39,8 +39,8 @@ class ApiProductRoleBasedAccessMissingAttributeTest extends ApiProductRoleBasedA
   /**
    * {@inheritdoc}
    *
-   * \Drupal\Tests\apigee_edge\Functional\ApiProductAccessTest validates
-   * developerAppEditFormTest().
+   * \Drupal\Tests\apigee_edge\FunctionalJavascript\ApiProductAccessTest
+   * validates developerAppEditFormTest().
    */
   public function testApiProductAccess() {
     $this->entityAccessTest();

diff --git a/...nal/ApiProductRoleBasedAccessTestBase.php → ...ipt/ApiProductRoleBasedAccessTestBase.php b/...nal/ApiProductRoleBasedAccessTestBase.php → ...ipt/ApiProductRoleBasedAccessTestBase.php
@@ -18,11 +18,11 @@
  * MA 02110-1301, USA.
  */
 
-namespace Drupal\Tests\apigee_edge_apiproduct_rbac\Functional;
+namespace Drupal\Tests\apigee_edge_apiproduct_rbac\FunctionalJavascript;
 
 use Drupal\apigee_edge\Entity\ApiProductInterface;
 use Drupal\Core\Url;
-use Drupal\Tests\apigee_edge\Functional\ApiProductAccessTest;
+use Drupal\Tests\apigee_edge\FunctionalJavascript\ApiProductAccessTest;
 use Drupal\user\UserInterface;
 
 /**

diff --git a/modules/apigee_edge_teams/tests/src/Functional/TeamApiProductAccessTest.php b/modules/apigee_edge_teams/tests/src/Functional/TeamApiProductAccessTest.php
@@ -261,7 +261,7 @@ public function testTeamApiProductAccess() {
     // we do not need to validate the developer app/edit forms because those
     // are covered by the parent module's ApiProductAccessTest which ensures
     // the API product list is filtered properly there.
-    // \Drupal\Tests\apigee_edge\Functional\ApiProductAccessTest.
+    // \Drupal\Tests\apigee_edge\FunctionalJavascript\ApiProductAccessTest.
     $this->drupalLogout();
     // <<< Team member.
     // If team member gets removed from the team its API Product access

diff --git a/...s/src/Functional/ApiProductAccessTest.php → ...tionalJavascript/ApiProductAccessTest.php b/...s/src/Functional/ApiProductAccessTest.php → ...tionalJavascript/ApiProductAccessTest.php
@@ -18,7 +18,7 @@
  * MA 02110-1301, USA.
  */
 
-namespace Drupal\Tests\apigee_edge\Functional;
+namespace Drupal\Tests\apigee_edge\FunctionalJavascript;
 
 use Apigee\Edge\Api\Management\Entity\App;
 use Drupal\apigee_edge\Entity\ApiProduct;
@@ -37,7 +37,7 @@
  * @group apigee_edge_api_product
  * @group apigee_edge_api_product_access
  */
-class ApiProductAccessTest extends ApigeeEdgeFunctionalTestBase {
+class ApiProductAccessTest extends ApigeeEdgeFunctionalJavascriptTestBase {
 
   protected const USER_WITH_BYPASS_PERM = 'user_with_bypass_perm';
   protected const INTERNAL_ROLE = 'internal';