From e7fc6b9a075c3870a9c6634fafebd5a55dc60cbe Mon Sep 17 00:00:00 2001 From: Arlina Espinoza Date: Thu, 12 Mar 2020 13:39:31 -0700 Subject: [PATCH] [#341] Fixing apigee_edge_apiproduct_rbac tests. --- .circleci/config.yml | 1 - .../ApiProductRoleBasedAccessAnonymousAuthenticatedTest.php | 6 +++--- .../ApiProductRoleBasedAccessAnonymousInternalTest.php | 6 +++--- .../ApiProductRoleBasedAccessAuthenticatedInternalTest.php | 2 +- .../ApiProductRoleBasedAccessMissingAttributeTest.php | 6 +++--- .../ApiProductRoleBasedAccessTestBase.php | 4 ++-- .../tests/src/Functional/TeamApiProductAccessTest.php | 2 +- .../ApiProductAccessTest.php | 4 ++-- 8 files changed, 15 insertions(+), 16 deletions(-) rename modules/apigee_edge_apiproduct_rbac/tests/src/{Functional => FunctionalJavascript}/ApiProductRoleBasedAccessAnonymousAuthenticatedTest.php (88%) rename modules/apigee_edge_apiproduct_rbac/tests/src/{Functional => FunctionalJavascript}/ApiProductRoleBasedAccessAnonymousInternalTest.php (88%) rename modules/apigee_edge_apiproduct_rbac/tests/src/{Functional => FunctionalJavascript}/ApiProductRoleBasedAccessAuthenticatedInternalTest.php (94%) rename modules/apigee_edge_apiproduct_rbac/tests/src/{Functional => FunctionalJavascript}/ApiProductRoleBasedAccessMissingAttributeTest.php (95%) rename modules/apigee_edge_apiproduct_rbac/tests/src/{Functional => FunctionalJavascript}/ApiProductRoleBasedAccessTestBase.php (96%) rename tests/src/{Functional => FunctionalJavascript}/ApiProductAccessTest.php (99%) diff --git a/.circleci/config.yml b/.circleci/config.yml index d64f9223a..6d63a78f2 100644 --- 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/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessAnonymousAuthenticatedTest.php b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessAnonymousAuthenticatedTest.php similarity index 88% rename from modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessAnonymousAuthenticatedTest.php rename to modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessAnonymousAuthenticatedTest.php index c24f260f7..941397bc3 100644 --- a/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessAnonymousAuthenticatedTest.php +++ b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessAnonymousAuthenticatedTest.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/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessAnonymousInternalTest.php b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessAnonymousInternalTest.php similarity index 88% rename from modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessAnonymousInternalTest.php rename to modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessAnonymousInternalTest.php index fe84e2b87..045bcc839 100644 --- a/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessAnonymousInternalTest.php +++ b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessAnonymousInternalTest.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/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessAuthenticatedInternalTest.php b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessAuthenticatedInternalTest.php similarity index 94% rename from modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessAuthenticatedInternalTest.php rename to modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessAuthenticatedInternalTest.php index 4b6f1d8d5..2e19f810c 100644 --- a/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessAuthenticatedInternalTest.php +++ b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessAuthenticatedInternalTest.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/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessMissingAttributeTest.php b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessMissingAttributeTest.php similarity index 95% rename from modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessMissingAttributeTest.php rename to modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessMissingAttributeTest.php index 68ca9c848..b4f81b009 100644 --- a/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessMissingAttributeTest.php +++ b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessMissingAttributeTest.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/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessTestBase.php b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessTestBase.php similarity index 96% rename from modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessTestBase.php rename to modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/ApiProductRoleBasedAccessTestBase.php index 98d063946..0f4c7e885 100644 --- a/modules/apigee_edge_apiproduct_rbac/tests/src/Functional/ApiProductRoleBasedAccessTestBase.php +++ b/modules/apigee_edge_apiproduct_rbac/tests/src/FunctionalJavascript/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 index 485b41f27..79eb1c9f0 100644 --- 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/tests/src/Functional/ApiProductAccessTest.php b/tests/src/FunctionalJavascript/ApiProductAccessTest.php similarity index 99% rename from tests/src/Functional/ApiProductAccessTest.php rename to tests/src/FunctionalJavascript/ApiProductAccessTest.php index 8f0f1d392..b764dfc98 100644 --- a/tests/src/Functional/ApiProductAccessTest.php +++ b/tests/src/FunctionalJavascript/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';