test(e2e): wait for enabled button in quoting test

intershop · Apr 21, 2022 · 4c8b891 · 4c8b891
1 parent 811b540
commit 4c8b891
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/e2e/cypress/integration/pages/checkout/cart.page.ts b/e2e/cypress/integration/pages/checkout/cart.page.ts
@@ -10,17 +10,21 @@ export class CartPage {
   readonly addToWishlist = new AddToWishlistModule();
   readonly addToOrderTemplate = new AddToOrderTemplateModule();
 
-  private saveQuoteRequestButton = () => cy.get('[id="createQuote"]');
+  private saveQuoteRequestButton = () => cy.get('[data-testing-id="create-quote-from-basket"]');
 
   beginCheckout() {
     cy.wait(1000);
     cy.get(this.tag).find('button').contains('Checkout').click();
   }
 
-  createQuoteRequest() {
-    waitLoadingEnd(5000);
+  createQuoteRequest(waitEnabled = true) {
+    if (waitEnabled) {
+      this.saveQuoteRequestButton().should('not.have.class', 'disabled');
+      cy.wait(3000);
+      waitLoadingEnd();
+    }
     this.saveQuoteRequestButton().click();
-    waitLoadingEnd(5000);
+    waitLoadingEnd();
   }
 
   private addToWishlistButton = () => cy.get('ish-shopping-basket').find('[data-testing-id="addToWishlistButton"]');

diff --git a/e2e/cypress/integration/specs/checkout/basket-handling.b2c.e2e-spec.ts b/e2e/cypress/integration/specs/checkout/basket-handling.b2c.e2e-spec.ts
@@ -41,6 +41,7 @@ describe('Basket Handling', () => {
     at(FamilyPage, page => page.productList.gotoProductDetailPageBySku(_.product.sku));
     at(ProductDetailPage, page => {
       page.addProductToCart().its('response.statusCode').should('equal', 201);
+      waitLoadingEnd();
       page.header.miniCart.total.should('contain', _.product.price);
       page.header.logout();
     });

diff --git a/...ntegration/specs/quoting/quote-handling-anonymous-basket-to-quote-request.b2b.e2e-spec.ts b/...ntegration/specs/quoting/quote-handling-anonymous-basket-to-quote-request.b2b.e2e-spec.ts
@@ -30,7 +30,7 @@ describe('Quote Handling as Anonymous User', () => {
         page.header.miniCart.goToCart();
       });
       at(CartPage, page => {
-        page.createQuoteRequest();
+        page.createQuoteRequest(false);
       });
     });
 

diff --git a/src/app/extensions/quoting/shared/basket-add-to-quote/basket-add-to-quote.component.html b/src/app/extensions/quoting/shared/basket-add-to-quote/basket-add-to-quote.component.html
@@ -1,17 +1,20 @@
-<ng-container *ngIf="isLoggedIn$ | async; else elseTemplate">
+<ng-container *ngIf="isLoggedIn$ | async; else disabled">
   <a
     *ishHasNotRole="['APP_B2B_CXML_USER', 'APP_B2B_OCI_USER']"
     class="btn btn-secondary"
-    id="createQuote"
-    name="createQuote"
+    data-testing-id="create-quote-from-basket"
     (click)="addToQuote()"
   >
     {{ 'shopping_cart.quote.create.button' | translate }}
   </a>
 </ng-container>
-<ng-template #elseTemplate>
-  <span (click)="login()" id="createQuote">
-    <button class="btn btn-secondary disabled" [title]="'account.login.quotes.message' | translate">
+<ng-template #disabled>
+  <span (click)="login()">
+    <button
+      data-testing-id="create-quote-from-basket"
+      class="btn btn-secondary disabled"
+      [title]="'account.login.quotes.message' | translate"
+    >
       {{ 'shopping_cart.quote.create.button' | translate }}
     </button>
   </span>