Merge branch 'develop' into productpro4

tests/pw/pages/basePage.ts

@@ -91,8 +91,9 @@ export class BasePage {
     }
 
     // goto subPath if not already there
-    async goIfNotThere(subPath: string, waitUntil: 'load' | 'domcontentloaded' | 'networkidle' | 'commit' = 'domcontentloaded'): Promise<void> {
-        if (!this.isCurrentUrl(subPath)) {
+    async goIfNotThere(subPath: string, waitUntil: 'load' | 'domcontentloaded' | 'networkidle' | 'commit' = 'domcontentloaded', force = false): Promise<void> {
+        const alreadyThere = this.isCurrentUrl(subPath);
+        if (!alreadyThere) {
             const url = this.createUrl(subPath);
             // console.log('url: ', url);
             await this.toPass(async () => {
@@ -101,6 +102,9 @@ export class BasePage {
                 expect(currentUrl).toMatch(subPath);
             });
         }
+        if (force) {
+            await this.reload();
+        }
     }
 
     // goto subPath if about:blank is loaded
@@ -1614,6 +1618,13 @@ export class BasePage {
         await this.toHaveBackgroundColor(selector, color);
     }
 
+    async forceLinkToSameTab(selector: string): Promise<void> {
+        // ensure link suppose to open on new tab
+        await this.toHaveAttribute(selector, 'target', '_blank');
+        // force link to open on the same tab
+        await this.setAttributeValue(selector, 'target', '_self');
+    }
+
     /**
      * Custom methods
      */

tests/pw/pages/loginPage.ts

@@ -46,12 +46,12 @@ export class LoginPage extends BasePage {
 
     // user login backend
     async loginBackend(user: user, url: string = data.subUrls.backend.login, storageState?: string): Promise<void> {
-        await this.goIfNotThere(url);
+        await this.gotoUntilNetworkidle(url);
         const emailField = await this.isVisible(selector.backend.email);
         if (emailField) {
             await this.clearAndType(selector.backend.email, user.username);
             await this.clearAndType(selector.backend.password, user.password);
-            await this.clickAndWaitForResponseAndLoadState(data.subUrls.backend.login, selector.backend.login, 302);
+            await this.clickAndWaitForResponseAndLoadState(data.subUrls.backend.adminDashboard, selector.backend.login);
             if (storageState) {
                 await this.page.context().storageState({ path: storageState });
             }

tests/pw/pages/privacyPolicyPage.ts

@@ -29,10 +29,7 @@ export class PrivacyPolicyPage extends CustomerPage {
     // go to privacy policy
     async goToPrivacyPolicy(storeName: string) {
         await this.gotoSingleStore(storeName);
-        // ensure link suppose to open on new tab
-        await this.toHaveAttribute(singleStoreCustomer.storeContactForm.privacyPolicyLink, 'target', '_blank');
-        // force link to open on the same tab
-        await this.setAttributeValue(singleStoreCustomer.storeContactForm.privacyPolicyLink, 'target', '_self');
+        await this.forceLinkToSameTab(singleStoreCustomer.storeContactForm.privacyPolicyLink);
         await this.clickAndWaitForUrl(helpers.stringToRegex('privacy-policy'), singleStoreCustomer.storeContactForm.privacyPolicyLink);
     }
 

tests/pw/pages/singleStorePage.ts

@@ -95,10 +95,7 @@ export class SingleStorePage extends CustomerPage {
     async storeShare(storeName: string, site: string): Promise<void> {
         await this.gotoSingleStore(storeName);
         await this.click(singleStoreCustomer.storeTabs.share);
-        // ensure link suppose to open on new tab
-        await this.toHaveAttribute(singleStoreCustomer.sharePlatForms[site as keyof typeof singleStoreCustomer.sharePlatForms], 'target', '_blank');
-        // force link to open on the same tab
-        await this.setAttributeValue(singleStoreCustomer.sharePlatForms[site as keyof typeof singleStoreCustomer.sharePlatForms], 'target', '_self');
+        await this.forceLinkToSameTab(singleStoreCustomer.sharePlatForms[site as keyof typeof singleStoreCustomer.sharePlatForms]);
         await this.clickAndWaitForUrl(new RegExp('.*' + site + '.*'), singleStoreCustomer.sharePlatForms[site as keyof typeof singleStoreCustomer.sharePlatForms]);
     }
 }

tests/pw/pages/vendorPage.ts

@@ -313,10 +313,7 @@ export class VendorPage extends BasePage {
     // visit store
     async visitStore(storeName: string) {
         await this.goIfNotThere(data.subUrls.frontend.vDashboard.dashboard);
-        // ensure link suppose to open on new tab
-        await this.toHaveAttribute(vendorDashboard.menus.primary.visitStore, 'target', '_blank');
-        // force link to open on the same tab
-        await this.setAttributeValue(vendorDashboard.menus.primary.visitStore, 'target', '_self');
+        await this.forceLinkToSameTab(vendorDashboard.menus.primary.visitStore);
         await this.click(vendorDashboard.menus.primary.visitStore);
         await expect(this.page).toHaveURL(data.subUrls.frontend.vendorDetails(helpers.slugify(storeName)) + '/');
     }

tests/pw/pages/vendorVerificationsPage.ts

@@ -201,11 +201,7 @@ export class VendorVerificationsPage extends AdminPage {
     async viewVerificationRequestDocument(requestId: string): Promise<void> {
         await this.goIfNotThere(data.subUrls.backend.dokan.verifications);
         await this.reloadIfVisible(verificationsAdmin.filters.reset);
-
-        // ensure link suppose to open on new tab
-        await this.toHaveAttribute(verificationsAdmin.verificationRequestDocument(requestId), 'target', '_blank');
-        // force link to open on the same tab
-        await this.setAttributeValue(verificationsAdmin.verificationRequestDocument(requestId), 'target', '_self');
+        await this.forceLinkToSameTab(verificationsAdmin.verificationRequestDocument(requestId));
         const documentLink = (await this.getAttributeValue(verificationsAdmin.verificationRequestDocument(requestId), 'href')) as string;
         await this.clickAndWaitForUrl(documentLink, verificationsAdmin.verificationRequestDocument(requestId));
         await this.toHaveAttribute('body img', 'src', documentLink);
@@ -322,11 +318,7 @@ export class VendorVerificationsPage extends AdminPage {
             // await this.click(setupWizardVendor.skipTheStepStoreSetup);
             await this.click(setupWizardVendor.skipTheStepPaymentSetup);
         }
-
-        // ensure link suppose to open on new tab
-        await this.toHaveAttribute(verificationsVendor.verificationRequestDocument(methodName), 'target', '_blank');
-        // force link to open on the same tab
-        await this.setAttributeValue(verificationsVendor.verificationRequestDocument(methodName), 'target', '_self');
+        await this.forceLinkToSameTab(verificationsVendor.verificationRequestDocument(methodName));
         const documentLink = (await this.getAttributeValue(verificationsVendor.verificationRequestDocument(methodName), 'href')) as string;
         await this.clickAndWaitForUrl(documentLink, verificationsVendor.verificationRequestDocument(methodName));
         await this.toHaveAttribute('body img', 'src', documentLink);

tests/pw/tests/api/quoteRequests.spec.ts

@@ -78,7 +78,7 @@ test.describe('request quote api test', () => {
         expect(responseBody).toMatchSchema(schemas.quoteRequestsSchema.quoteRequestSchema);
     });
 
-    test('update batch request quote', { tag: ['@pro'] }, async () => {
+    test.skip('update batch request quote', { tag: ['@pro'] }, async () => {
         const allRequestQuoteIds = (await apiUtils.getAllQuoteRequests()).map((a: { id: unknown }) => a.id);
         const [response, responseBody] = await apiUtils.put(endPoints.updateBatchRequestQuotes, { data: { trash: allRequestQuoteIds } });
         expect(response.ok()).toBeTruthy();

tests/pw/tests/e2e/catalogmode.spec.ts

@@ -86,8 +86,9 @@ test.describe('Catalog mode test', () => {
 
     test('vendor can enable RFQ in catalog mode', { tag: ['@pro', '@admin'] }, async () => {
         const [previousMeta] = await dbUtils.updateUserMeta(sellerId, 'dokan_profile_settings', { catalog_mode: { ...payloads.catalogModeSetting, request_a_quote_enabled: 'on' } });
-        const [, productId, productName] = await apiUtils.createProduct(helpers.deepMergeObjects(payloads.createProduct(), payloads.catalogMode), payloads.userAuth(vendorName));
-        await apiUtils.createQuoteRule({ ...payloads.createQuoteRule(), apply_on_all_product: '', product_ids: [productId] }, payloads.adminAuth);
+        const [, productId, productName] = await apiUtils.createProduct(payloads.createProduct(), payloads.userAuth(vendorName));
+        const [, quoteRuleId] = await apiUtils.createQuoteRule({ ...payloads.createQuoteRule(), product_ids: [productId] }, payloads.adminAuth);
+        await dbUtils.updateQuoteRuleContent(quoteRuleId, { switches: { product_switch: 'true' } }); // todo: remove after api fix
         await customer.viewRfqInCatalogMode(productName, vendorName, ShopPage, SingleStorePage);
 
         // reset

tests/pw/tests/e2e/requestForQuoteRules.spec.ts

@@ -16,11 +16,10 @@ test.describe('Request for quotation Rules test', () => {
         admin = new RequestForQuotationsPage(aPage);
 
         apiUtils = new ApiUtils(await request.newContext());
-        [, , quoteRuleTitle] = await apiUtils.createQuoteRule(payloads.createQuoteRule(), payloads.adminAuth);
+        [, , quoteRuleTitle] = await apiUtils.createQuoteRule(payloads.createQuoteRule(), payloads.adminAuth); // todo: fix after api is updated
     });
 
     test.afterAll(async () => {
-        await apiUtils.deleteAllQuoteRules(payloads.adminAuth); //todo: remove in future
         await aPage.close();
         await apiUtils.dispose();
     });
@@ -34,11 +33,12 @@ test.describe('Request for quotation Rules test', () => {
     });
 
     test('admin can add quote rule', { tag: ['@pro', '@admin'] }, async () => {
-        await admin.addQuoteRule(data.requestForQuotation.quoteRule());
+        const [, , productName] = await apiUtils.createProduct(payloads.createProduct(), payloads.vendorAuth);
+        await admin.addQuoteRule({ ...data.requestForQuotation.quoteRule(), includeProducts: productName });
     });
 
     test('admin can edit quote rule', { tag: ['@pro', '@admin'] }, async () => {
-        await admin.editQuoteRule({ ...data.requestForQuotation.quoteRule(), title: quoteRuleTitle });
+        await admin.editQuoteRule({ ...data.requestForQuotation.quoteRule(), title: quoteRuleTitle, specificProducts: false, });
     });
 
     test('admin can trash quote rule', { tag: ['@pro', '@admin'] }, async () => {

tests/pw/tests/e2e/requestForQuotes.spec.ts

@@ -3,6 +3,7 @@ import { RequestForQuotationsPage } from '@pages/requestForQuotationsPage';
 import { ApiUtils } from '@utils/apiUtils';
 import { data } from '@utils/testData';
 import { payloads } from '@utils/payloads';
+import { dbUtils } from '@utils/dbUtils';
 
 const { CUSTOMER_ID } = process.env;
 
@@ -11,7 +12,7 @@ test.describe('Request for quotation test admin', () => {
     let aPage: Page;
     let apiUtils: ApiUtils;
     const productId: string[] = [];
-    let quoteTitle: string;
+    let quoteId: string;
 
     test.beforeAll(async ({ browser }) => {
         const adminContext = await browser.newContext(data.auth.adminAuth);
@@ -20,7 +21,7 @@ test.describe('Request for quotation test admin', () => {
 
         apiUtils = new ApiUtils(await request.newContext());
         [, productId[0]] = await apiUtils.createProduct(payloads.createProduct(), payloads.vendorAuth);
-        [, , quoteTitle] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, user_id: CUSTOMER_ID }, payloads.adminAuth);
+        [, quoteId] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, user_id: CUSTOMER_ID }, payloads.adminAuth);
     });
 
     test.afterAll(async () => {
@@ -40,33 +41,33 @@ test.describe('Request for quotation test admin', () => {
         await admin.addQuote(data.requestForQuotation.quote());
     });
 
-    test('admin can edit quote', { tag: ['@pro', '@admin'] }, async () => {
-        await admin.editQuote({ ...data.requestForQuotation.quote(), title: quoteTitle });
+    test.skip('admin can edit quote', { tag: ['@pro', '@admin'] }, async () => {
+        await admin.editQuote({ ...data.requestForQuotation.quote(), id: quoteId });
     });
 
     test('admin can trash quote', { tag: ['@pro', '@admin'] }, async () => {
-        const [, , quoteTitle] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, user_id: CUSTOMER_ID }, payloads.adminAuth);
-        await admin.updateQuote(quoteTitle, 'trash');
+        const [, quoteId] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, user_id: CUSTOMER_ID }, payloads.adminAuth);
+        await admin.updateQuote(quoteId, 'trash');
     });
 
     test('admin can restore quote', { tag: ['@pro', '@admin'] }, async () => {
-        const [, , quoteTitle] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, status: 'trash', user_id: CUSTOMER_ID }, payloads.adminAuth);
-        await admin.updateQuote(quoteTitle, 'restore');
+        const [, quoteId] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, status: 'trash', user_id: CUSTOMER_ID }, payloads.adminAuth);
+        await admin.updateQuote(quoteId, 'restore');
     });
 
     test('admin can permanently delete quote', { tag: ['@pro', '@admin'] }, async () => {
-        const [, , quoteTitle] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, status: 'trash', user_id: CUSTOMER_ID }, payloads.adminAuth);
-        await admin.updateQuote(quoteTitle, 'permanently-delete');
+        const [, quoteId] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, status: 'trash', user_id: CUSTOMER_ID }, payloads.adminAuth);
+        await admin.updateQuote(quoteId, 'permanently-delete');
     });
 
     test('admin can approve quote', { tag: ['@pro', '@admin'] }, async () => {
-        const [, , quoteTitle] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, user_id: CUSTOMER_ID }, payloads.adminAuth);
-        await admin.approveQuote(quoteTitle);
+        const [, quoteId] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, user_id: CUSTOMER_ID }, payloads.adminAuth);
+        await admin.approveQuote(quoteId);
     });
 
     test('admin can convert quote to order', { tag: ['@pro', '@admin'] }, async () => {
-        const [, , quoteTitle] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, status: 'approve', user_id: CUSTOMER_ID }, payloads.adminAuth);
-        await admin.convertQuoteToOrder(quoteTitle);
+        const [, quoteId] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, status: 'approve', user_id: CUSTOMER_ID }, payloads.adminAuth);
+        await admin.convertQuoteToOrder(quoteId);
     });
 
     test('admin can perform quote bulk actions', { tag: ['@pro', '@admin', '@serial'] }, async () => {
@@ -79,9 +80,8 @@ test.describe('Request for quotation test vendor', () => {
     let vPage: Page;
     let apiUtils: ApiUtils;
     const productId: string[] = [];
-    let quoteTitle: string;
-    let productName: string;
     let quoteId: string;
+    let productName: string;
 
     test.beforeAll(async ({ browser }) => {
         const vendorContext = await browser.newContext(data.auth.vendorAuth);
@@ -90,7 +90,7 @@ test.describe('Request for quotation test vendor', () => {
 
         apiUtils = new ApiUtils(await request.newContext());
         [, productId[0], productName] = await apiUtils.createProduct(payloads.createProduct(), payloads.vendorAuth);
-        [, quoteId, quoteTitle] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, user_id: CUSTOMER_ID }, payloads.adminAuth);
+        [, quoteId] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, user_id: CUSTOMER_ID }, payloads.adminAuth);
     });
 
     test.afterAll(async () => {
@@ -103,7 +103,7 @@ test.describe('Request for quotation test vendor', () => {
     });
 
     test('vendor can view request quote details', { tag: ['@pro', '@exploratory', '@vendor'] }, async () => {
-        await vendor.vendorViewQuoteDetails(quoteTitle);
+        await vendor.vendorViewQuoteDetails(quoteId);
     });
 
     test('vendor can update quote request', { tag: ['@pro', '@vendor'] }, async () => {
@@ -138,7 +138,8 @@ test.describe('Request for quotation test customer', () => {
         apiUtils = new ApiUtils(await request.newContext());
 
         [, productId[0], productName] = await apiUtils.createProduct(payloads.createProduct(), payloads.vendorAuth);
-        await apiUtils.createQuoteRule({ ...payloads.createQuoteRule(), product_ids: productId, apply_on_all_product: '0' }, payloads.adminAuth);
+        const [, quoteRuleId] = await apiUtils.createQuoteRule({ ...payloads.createQuoteRule(), product_ids: productId }, payloads.adminAuth);
+        await dbUtils.updateQuoteRuleContent(quoteRuleId, { switches: { product_switch: 'true' } }); // todo: remove after api fix
         [, quoteId] = await apiUtils.createQuoteRequest({ ...payloads.createQuoteRequest(), product_ids: productId, user_id: CUSTOMER_ID }, payloads.adminAuth);
     });
 
@@ -161,7 +162,7 @@ test.describe('Request for quotation test customer', () => {
         await customer.customerViewRequestedQuoteDetails(quoteId);
     });
 
-    test('customer can update quote request', { tag: ['@pro', '@customer'] }, async () => {
+    test.skip('customer can update quote request', { tag: ['@pro', '@customer'] }, async () => {
         await customer.customerUpdateRequestedQuote(quoteId, { ...data.requestForQuotation.customerQuoteProduct, productName: productName });
     });
 

tests/pw/tests/e2e/vendorSettings.spec.ts

@@ -120,7 +120,7 @@ test.describe('Vendor settings test', () => {
         await vendor.setSocialProfile(data.vendor.socialProfileUrls);
     });
 
-    test('vendor can set rma settings (no warranty):', { tag: ['@pro', '@vendor'] }, async () => {
+    test('vendor can set rma settings (no warranty)', { tag: ['@pro', '@vendor'] }, async () => {
         await vendor.setRmaSettings({ ...data.vendor.rma, type: 'no_warranty' });
     });
 

tests/pw/tests/e2e/vendorStaff.spec.ts

@@ -4,7 +4,7 @@ import { ApiUtils } from '@utils/apiUtils';
 import { data } from '@utils/testData';
 import { payloads } from '@utils/payloads';
 
-test.describe('Vendor staff test', () => {
+test.describe('Vendor staff test (vendor)', () => {
     let vendor: VendorStaffPage;
     let vPage: Page;
     let apiUtils: ApiUtils;
@@ -45,7 +45,7 @@ test.describe('Vendor staff test', () => {
     });
 });
 
-test.describe('Wholesale test (customer)', () => {
+test.describe('Vendor staff test (vendorStaff)', () => {
     let staff: VendorStaffPage;
     let sPage: Page;
     let apiUtils: ApiUtils;

tests/pw/utils/dbUtils.ts

@@ -234,4 +234,15 @@ export const dbUtils = {
         const updateCountQuery = `UPDATE ${dbPrefix}_term_taxonomy SET count = count + 1 WHERE term_taxonomy_id = ?;`;
         await dbUtils.dbQuery(updateCountQuery, [subscriptionTermTaxonomyId]);
     },
+
+    async updateQuoteRuleContent(quoted: string, updatedRuleContent: object) {
+        const querySelect = `SELECT rule_contents FROM ${dbPrefix}_dokan_request_quote_rules WHERE id = ?`;
+        const res = await dbUtils.dbQuery(querySelect, [quoted]);
+
+        const currentRuleContent = unserialize(res[0].rule_contents);
+        const newRuleContent = helpers.deepMergeObjects(currentRuleContent, updatedRuleContent);
+
+        const queryUpdate = `UPDATE ${dbPrefix}_dokan_request_quote_rules SET rule_contents = ? WHERE id = ?`;
+        await dbUtils.dbQuery(queryUpdate, [serialize(newRuleContent), quoted]);
+    },
 };