Fix for failing tests (#408)

apigee · Dec 2, 2022 · 87a6478 · 87a6478
1 parent 3fd2894
commit 87a6478
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 37 deletions.
diff --git a/modules/apigee_m10n_add_credit/tests/src/Functional/AddCreditPermissionsTest.php b/modules/apigee_m10n_add_credit/tests/src/Functional/AddCreditPermissionsTest.php
@@ -100,7 +100,6 @@ public function testAddCreditButtonPermissionsOnPrepaidBalancePage() {
 
     // Create and sign in a user with no add credit permissions.
     $this->developer = $this->signIn(['view own prepaid balance']);
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->developer);
     $this->queueMockResponses([
       'get-prepaid-balances',

diff --git a/modules/apigee_m10n_add_credit/tests/src/Functional/AddCreditPrepaidBalancePageTest.php b/modules/apigee_m10n_add_credit/tests/src/Functional/AddCreditPrepaidBalancePageTest.php
@@ -73,7 +73,6 @@ protected function setUp(): void {
    * @covers \Drupal\apigee_m10n_add_credit\AddCreditService::apigeeM10nPrepaidBalanceListAlter
    */
   public function testAddCreditButtonForCurrency() {
-    $this->warmOrganizationCache();
 
     // Configure an add credit product for USD.
     // There should be an add credit button for usd but NOT for aud.

diff --git a/...igee_m10n_add_credit/tests/src/FunctionalJavascript/AddCreditPrepaidBalanceButtonTest.php b/...igee_m10n_add_credit/tests/src/FunctionalJavascript/AddCreditPrepaidBalanceButtonTest.php
@@ -55,6 +55,7 @@ class AddCreditPrepaidBalanceButtonTest extends AddCreditFunctionalJavascriptTes
   protected function setUp(): void {
     parent::setUp();
 
+    $this->warmOrganizationCache();
     $this->developer = $this->signIn([
       'view own prepaid balance',
       'add credit to own developer prepaid balance',
@@ -86,7 +87,6 @@ protected function setUp(): void {
   public function testAddCreditButton() {
     $this->setAddCreditProductForCurrencyId($this->product, 'usd');
 
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->developer);
     $this->queueMockResponses([
       'get-prepaid-balances',

diff --git a/...n_add_credit/tests/src/FunctionalJavascript/AddCreditPrepaidBalanceToAnyDeveloperTest.php b/...n_add_credit/tests/src/FunctionalJavascript/AddCreditPrepaidBalanceToAnyDeveloperTest.php
@@ -62,6 +62,7 @@ class AddCreditPrepaidBalanceToAnyDeveloperTest extends AddCreditFunctionalJavas
   protected function setUp(): void {
     parent::setUp();
 
+    $this->warmOrganizationCache();
     $this->accountUser = $this->signIn([
       'view own prepaid balance',
       'add credit to own developer prepaid balance',
@@ -97,7 +98,6 @@ public function testAddCreditToAnyDeveloper() {
     ]);
 
     $this->setAddCreditProductForCurrencyId($this->product, 'usd');
-    $this->warmOrganizationCache();
 
     // Load authenticated developer.
     $this->queueDeveloperResponse($this->accountUser);

diff --git a/modules/apigee_m10n_add_credit/tests/src/Traits/ApigeeX/AddCreditFunctionalTestTrait.php b/modules/apigee_m10n_add_credit/tests/src/Traits/ApigeeX/AddCreditFunctionalTestTrait.php
@@ -58,6 +58,8 @@ protected function signIn(array $permissions = [], $billingType = 'postpaid'): U
       ->set('billing.billingtype', strtolower($billingType))
       ->save();
 
+    $this->warmApigeexOrganizationCache();
+
     $account = $this->createAccount($permissions, TRUE, '', ['billing_type' => strtoupper($billingType)]);
     $this->drupalLogin($account);
     return $account;

diff --git a/...apigee_m10n_teams/tests/src/Kernel/Controller/TeamPricingAndPlansControllerKernelTest.php b/...apigee_m10n_teams/tests/src/Kernel/Controller/TeamPricingAndPlansControllerKernelTest.php
@@ -135,9 +135,6 @@ protected function assertTeamPlansPage() {
       }
     }
 
-    // Queue up a monetized org response.
-    $this->stack->queueMockResponse('get_monetized_org');
-
     // Queue the product bundle response.
     $this->stack->queueMockResponse(['get_monetization_packages' => ['packages' => $product_bundles]]);
     foreach ($rate_plans as $product_bundle_id => $plans) {

diff --git a/modules/apigee_m10n_teams/tests/src/Kernel/Entity/PurchasedRatePlanEntityKernelTest.php b/modules/apigee_m10n_teams/tests/src/Kernel/Entity/PurchasedRatePlanEntityKernelTest.php
@@ -121,7 +121,6 @@ protected function setUp(): void {
     $this->rate_plan = $this->createRatePlan($this->product_bundle);
     $this->purchased_plan = $this->createTeamPurchasedPlan($this->team, $this->rate_plan);
 
-    $this->warmOrganizationCache();
     $this->warmTnsCache();
     $this->warmTeamTnsCache($this->team);
   }

diff --git a/tests/src/Functional/BillingDetailsTest.php b/tests/src/Functional/BillingDetailsTest.php
@@ -47,6 +47,8 @@ class BillingDetailsTest extends MonetizationFunctionalTestBase {
   protected function setUp(): void {
     parent::setUp();
 
+    $this->warmOrganizationCache();
+
     // If the user doesn't have the "view any monetization billing details"
     // permission, they should get access denied.
     $this->developer = $this->createAccount([]);
@@ -60,7 +62,6 @@ protected function setUp(): void {
    * @throws \Exception
    */
   public function testBillingDetailsPageView() {
-    $this->warmOrganizationCache();
     $this->stack->queueMockResponse([
       'developer_mint' => [
         'mail'  => ['value' => $this->developer->getEmail()],

diff --git a/tests/src/Functional/NavigationTest.php b/tests/src/Functional/NavigationTest.php
@@ -76,7 +76,6 @@ public function testNavigation() {
     $this->assertCssElementContains('.block-menu.navigation.menu--main ', 'Pricing & plans');
     $this->assertCssElementContains('.block-menu.navigation.menu--account', 'My account');
 
-    $this->warmOrganizationCache();
     $product_bundle = $this->createProductBundle();
     $rate_plan = $this->createRatePlan($product_bundle);
     $purchased_plan = $this->createPurchasedPlan($this->developer, $rate_plan);

diff --git a/tests/src/Functional/PrepaidBalanceCacheTest.php b/tests/src/Functional/PrepaidBalanceCacheTest.php
@@ -63,7 +63,6 @@ class PrepaidBalanceCacheTest extends MonetizationFunctionalTestBase {
    */
   protected function setUp(): void {
     parent::setUp();
-
     $this->developer = $this->createAccount([
       'view own prepaid balance',
       'download prepaid balance reports',
@@ -89,7 +88,6 @@ public function testNoPermission() {
     $authenticated_role->save();
 
     // User cannot refresh prepaid balance.
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->developer);
     $this->queueResponses();
     $this->drupalGet(Url::fromRoute('apigee_monetization.billing', [
@@ -108,7 +106,6 @@ public function testRefreshOwnPrepaidBalancePermission() {
     $this->grantPermissions(Role::load(reset($user_roles)), ['refresh own prepaid balance']);
 
     // User can refresh own account.
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->developer);
     $this->assertRefreshPrepaidBalanceForUser($this->developer);
   }
@@ -125,7 +122,6 @@ public function testRefreshAnyPrepaidBalancePermission() {
 
     // User can refresh another user account.
     $other_user = $this->createAccount();
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($other_user);
     $this->assertRefreshPrepaidBalanceForUser($other_user);
   }
@@ -139,7 +135,6 @@ public function testPrepaidBalanceCacheIds() {
 
     // Visit the prepaid balance page.
     $expected_expiration_time = time() + static::CACHE_MAX_AGE;
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->developer);
     $this->queueResponses();
     $this->drupalGet(Url::fromRoute('apigee_monetization.billing', [
@@ -156,7 +151,6 @@ public function testPrepaidBalanceCacheIds() {
    */
   public function testPrepaidBalanceCacheIdsRebuild() {
     // Visit the prepaid balance page to set the caches.
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->developer);
     $this->queueResponses();
     $this->drupalGet(Url::fromRoute('apigee_monetization.billing', [
@@ -187,7 +181,6 @@ public function testPrepaidBalanceCacheIdsRebuild() {
   public function testPrepaidBalanceCacheTags() {
     $this->checkDriverHeaderSupport();
 
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->developer);
     $this->queueResponses();
     $this->drupalGet(Url::fromRoute('apigee_monetization.billing', [
@@ -207,7 +200,6 @@ public function testPrepaidBalanceCacheDisable() {
       ->save();
 
     // Visit the prepaid balance page.
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->developer);
     $this->queueResponses();
     $this->drupalGet(Url::fromRoute('apigee_monetization.billing', [

diff --git a/tests/src/Functional/PrepaidBalanceReportsDownloadFunctionalTest.php b/tests/src/Functional/PrepaidBalanceReportsDownloadFunctionalTest.php
@@ -75,7 +75,6 @@ public function testAccountWithNoReports() {
     $month = $this->lastMonth->format('F');
     $month_numeric = $this->lastMonth->format('m');
 
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->account);
     $this->queueMockResponses([
       'get-prepaid-balances',
@@ -113,7 +112,6 @@ public function testDateWithNoReport() {
     $month = $this->lastMonth->format('F');
     $month_numeric = $this->lastMonth->format('m');
 
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->account);
     $this->queueMockResponses([
       'get-prepaid-balances',
@@ -150,7 +148,6 @@ public function testValidAccountAndDate() {
     $year = $this->lastMonth->format('Y');
     $month_numeric = $this->lastMonth->format('m');
 
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->account);
     $this->queueMockResponses([
       'get-prepaid-balances',

diff --git a/tests/src/Functional/PrepaidBalanceTest.php b/tests/src/Functional/PrepaidBalanceTest.php
@@ -52,7 +52,6 @@ public function testPrepaidBalancesView() {
 
     $this->drupalLogin($this->developer);
 
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->developer);
     $this->stack->queueMockResponse([
       'get-prepaid-balances' => [

diff --git a/tests/src/Functional/PricingAndPlansFunctionalTest.php b/tests/src/Functional/PricingAndPlansFunctionalTest.php
@@ -58,7 +58,6 @@ public function testPricingAndPlansForNonAdmin() {
     $this->accountUser = $this->createAccount(['view rate_plan']);
     $this->drupalLogin($this->accountUser);
 
-    $this->warmOrganizationCache();
     $this->queuePackagesAndPlansResponse();
 
     $this->drupalGet(Url::fromRoute('apigee_monetization.plans', [
@@ -74,7 +73,6 @@ public function testPricingAndPlansForAdmin() {
     $this->accountAdmin = $this->createAccount(['view rate_plan', 'administer apigee monetization']);
     $this->drupalLogin($this->accountAdmin);
 
-    $this->warmOrganizationCache();
     $this->queuePackagesAndPlansResponse();
 
     $this->drupalGet(Url::fromRoute('apigee_monetization.plans', [

diff --git a/tests/src/Functional/PurchasedPlanListTest.php b/tests/src/Functional/PurchasedPlanListTest.php
@@ -64,7 +64,6 @@ public function testPurchasedPlanListView() {
     $rate_plan = $this->createRatePlan($product_bundle);
     $purchased_plan = $this->createPurchasedPlan($this->developer, $rate_plan);
 
-    $this->warmOrganizationCache();
     $this->stack
       ->queueMockResponse(['get_developer_purchased_plans' => ['purchased_plans' => [$purchased_plan]]]);
 

diff --git a/tests/src/Functional/PurchasedPlanStatusTest.php b/tests/src/Functional/PurchasedPlanStatusTest.php
@@ -86,7 +86,6 @@ protected function setUp(): void {
   public function testPurchasedPlanActiveStatus() {
     $purchased_plan = $this->createPurchasedPlan($this->developer, $this->ratePlan);
 
-    $this->warmOrganizationCache();
     $this->stack
       ->queueMockResponse(['get_developer_purchased_plans' => ['purchased_plans' => [$purchased_plan]]]);
 
@@ -115,7 +114,6 @@ public function testPurchasedPlanEndedStatus() {
     $end_date->setTimezone($purchased_plan->getRatePlan()->getOrganization()->getTimezone());
     $purchased_plan->setEndDate($end_date);
 
-    $this->warmOrganizationCache();
     $this->stack
       ->queueMockResponse(['get_developer_purchased_plans' => ['purchased_plans' => [$purchased_plan]]]);
 
@@ -143,7 +141,6 @@ public function testPurchasedPlanGetFutureStatus() {
     $start_date = new \DateTimeImmutable('today +2 day', new \DateTimeZone($this->orgDefaultTimezone));
     $purchased_plan->setStartDate($start_date);
 
-    $this->warmOrganizationCache();
     $this->stack
       ->queueMockResponse(['get_developer_purchased_plans' => ['purchased_plans' => [$purchased_plan]]]);
 
@@ -173,7 +170,6 @@ public function testActivePurchasedPlanWithChangedTimezone() {
 
     $purchased_plan = $this->createPurchasedPlan($this->developer, $this->ratePlan);
 
-    $this->warmOrganizationCache();
     $this->stack
       ->queueMockResponse(['get_developer_purchased_plans' => ['purchased_plans' => [$purchased_plan]]]);
 
@@ -211,7 +207,6 @@ public function testExpiredPurchasedPlanWithChangedTimezone() {
     $end_date->setTimezone($purchased_plan->getRatePlan()->getOrganization()->getTimezone());
     $purchased_plan->setEndDate($end_date);
 
-    $this->warmOrganizationCache();
     $this->stack
       ->queueMockResponse(['get_developer_purchased_plans' => ['purchased_plans' => [$purchased_plan]]]);
 
@@ -247,7 +242,6 @@ public function testFuturePurchasedPlanWithChangedTimezone() {
     $start_date = new \DateTimeImmutable('today +2 day', new \DateTimeZone($this->orgDefaultTimezone));
     $purchased_plan->setStartDate($start_date);
 
-    $this->warmOrganizationCache();
     $this->stack
       ->queueMockResponse(['get_developer_purchased_plans' => ['purchased_plans' => [$purchased_plan]]]);
 

diff --git a/tests/src/FunctionalJavascript/PrepaidBalanceReportsDownloadFormFunctionalJavascriptTest.php b/tests/src/FunctionalJavascript/PrepaidBalanceReportsDownloadFormFunctionalJavascriptTest.php
@@ -87,7 +87,6 @@ public function testPrepaidBalanceReportsDownloadForm() {
     ]);
 
     $this->drupalLogin($this->account);
-    $this->warmOrganizationCache();
     $this->queueDeveloperResponse($this->account);
     $this->queueMockResponses([
       'get-prepaid-balances',

diff --git a/tests/src/Kernel/AutoAssignLegalNameKernelTest.php b/tests/src/Kernel/AutoAssignLegalNameKernelTest.php
@@ -49,6 +49,7 @@ protected function setUp(): void {
       'system',
     ]);
     $this->installEntitySchema('user');
+    $this->warmOrganizationCache();
     $this->developer = $this->createAccount(['view rate_plan']);
     $this->setCurrentUser($this->developer);
 
@@ -63,7 +64,6 @@ public function testAutoAssignLegalName() {
     $subscription = $this->createPurchasedPlan($this->developer, $rate_plan);
     $dev = $this->convertUserToEdgeDeveloper($this->developer, ['MINT_DEVELOPER_LEGAL_NAME' => $this->developer->getEmail()]);
     \Drupal::cache('apigee_edge_entity')->delete("values:developer:{$dev->id()}");
-    $this->warmOrganizationCache();
     $this->stack
       ->queueMockResponse([
         'developer_mint' => ['developer' => $dev],

diff --git a/tests/src/Kernel/Controller/PricingAndPlansControllerKernelTest.php b/tests/src/Kernel/Controller/PricingAndPlansControllerKernelTest.php
@@ -131,8 +131,6 @@ public function testMyRedirects() {
    * Tests the plan controller response.
    */
   public function testControllerResponse() {
-    // Queue up a monetized org response.
-    $this->stack->queueMockResponse('get_monetized_org');
     // Warm the cache for the monetized org check.
     \Drupal::service('apigee_m10n.monetization')->isMonetizationEnabled();
 
@@ -149,7 +147,6 @@ public function testControllerResponse() {
    * displayed on the page.
    */
   public function testPlansFiltering() {
-    $this->warmOrganizationCache();
 
     $rate_plans = [];
     $product_bundles = [

diff --git a/tests/src/Kernel/Entity/Access/RatePlanAccessControlHandlerTest.php b/tests/src/Kernel/Entity/Access/RatePlanAccessControlHandlerTest.php
@@ -72,7 +72,7 @@ protected function setUp():void {
     $this->installEntitySchema('user');
     $this->accessControlHandler = $this->container->get('entity_type.manager')
       ->getAccessControlHandler('rate_plan');
-
+    $this->warmOrganizationCache();
     // Create root user.
     $this->createUser();
 

diff --git a/tests/src/Traits/ApigeeMonetizationTestTrait.php b/tests/src/Traits/ApigeeMonetizationTestTrait.php
@@ -125,6 +125,7 @@ protected function setUp(): void {
    */
   protected function createAccount(array $permissions = [], bool $status = TRUE, string $prefix = '', $attributes = []): ?UserInterface {
     $rid = NULL;
+    $this->warmOrganizationCache();
     if ($permissions) {
       $rid = $this->createRole($permissions);
       $this->assertNotEmpty($rid, 'Role created');
@@ -233,6 +234,7 @@ protected function createProduct(): MonetizationApiProduct {
    */
   protected function createProductBundle(): ProductBundleInterface {
     $products = [];
+
     for ($i = rand(1, 4); $i > 0; $i--) {
       $products[] = $this->createProduct();
     }