vtex-apps · Syed-Vtex · Mar 23, 2023 · Mar 23, 2023 · Apr 12, 2023 · Apr 13, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,14 @@
 ## [Unreleased]
 
+### Changed
+- Improved/Fixed B2B new login user testcase
+
 ### Changed
 
 - E2E Tests improvements
 
+- [ENGINEERS-1228] - Use multiple email addresses in B2B tests
+
 ## [2.4.2] - 2023-03-12
 
 ### Changed

diff --git a/cypress-shared/integration/b2b/2.1.1-create_&_approve_organizationA.spec.js b/cypress-shared/integration/b2b/2.1.1-create_&_approve_organizationA.spec.js
@@ -15,7 +15,7 @@ describe('Create & Approve OrganizationA', () => {
   createOrganizationTestCase(
     {
       name: organizationName,
-      email: users.OrganizationAdmin1,
+      email: users.OrganizationAdmin1.email,
     },
     {
       costCenterName: costCenter1.name,

diff --git a/cypress-shared/integration/b2b/2.1.2-multi_organizations_requests_from_organizationB.spec.js b/cypress-shared/integration/b2b/2.1.2-multi_organizations_requests_from_organizationB.spec.js
@@ -11,7 +11,7 @@ describe('Create, Decline OrganizationB', () => {
     cy.clearLocalStorage()
   })
   loginViaCookies({ storeFrontCookie: false })
-  const email = b2b.OrganizationB.users.OrganizationAdmin1
+  const { email } = b2b.OrganizationB.users.OrganizationAdmin1
   const name = b2b.OrganizationB.organizationName
   const costCenterName = b2b.OrganizationB.costCenter1.name
   const [costCenterAddress] = b2b.OrganizationB.costCenter1.addresses
@@ -31,7 +31,7 @@ describe('Create, Decline OrganizationB', () => {
   createOrganizationTestCase(
     {
       name: organizationName,
-      email: users.OrganizationAdmin1,
+      email: users.OrganizationAdmin1.email,
     },
     {
       costCenterName: costCenter1.name,

diff --git a/cypress-shared/integration/b2b/2.1.3-organization_negative_testcases.spec.js b/cypress-shared/integration/b2b/2.1.3-organization_negative_testcases.spec.js
@@ -8,7 +8,7 @@ import b2b from '../../support/b2b/constants.js'
 
 describe('Organization Negative TestCases', () => {
   loginViaCookies({ storeFrontCookie: false })
-  const email = b2b.OrganizationA.users.OrganizationAdmin1
+  const { email } = b2b.OrganizationA.users.OrganizationAdmin1
 
   createOrganizationWithoutCostCenterNameAndAddress(
     b2b.OrganizationA.organizationName,

diff --git a/cypress-shared/integration/b2b/2.10-approver_scenarios_orgA_costcenter2.spec.js b/cypress-shared/integration/b2b/2.10-approver_scenarios_orgA_costcenter2.spec.js
@@ -28,19 +28,13 @@ import {
 describe('Organization A - Cost Center A2 - Approver Scenario', () => {
   loginViaCookies({ storeFrontCookie: false })
 
-  const {
-    organizationName,
-    quotes,
-    nonAvailableProduct,
-    costCenter2,
-    users,
-    gmailCreds,
-  } = b2b.OrganizationA
+  const { organizationName, quotes, nonAvailableProduct, costCenter2, users } =
+    b2b.OrganizationA
 
   const { organizationName: organizationB, quotes: organizationBquotes } =
     b2b.OrganizationB
 
-  loginToStoreFront(users.Approver2, ROLE_DROP_DOWN.Approver, gmailCreds)
+  loginToStoreFront(users.Approver2, ROLE_DROP_DOWN.Approver)
   verifySession(b2b.OrganizationA, costCenter2.name, ROLE_DROP_DOWN.Approver)
   productShouldNotbeAvailableTestCase(nonAvailableProduct)
   quoteShouldbeVisibleTestCase(

diff --git a/cypress-shared/integration/b2b/2.11-approver_scenarios_orgB.spec.js b/cypress-shared/integration/b2b/2.11-approver_scenarios_orgB.spec.js
@@ -31,13 +31,12 @@ describe('Organization B - Cost Center B1 - Approver Scenario', () => {
     users,
     quotes,
     organizationName,
-    gmailCreds,
   } = b2b.OrganizationB
 
   const { organizationName: organizationA, quotes: organizationAQuotes } =
     b2b.OrganizationA
 
-  loginToStoreFront(users.Approver1, ROLE_DROP_DOWN.Approver, gmailCreds)
+  loginToStoreFront(users.Approver1, ROLE_DROP_DOWN.Approver)
   verifySession(b2b.OrganizationB, costCenter1.name, ROLE_DROP_DOWN.Approver)
   productShouldNotbeAvailableTestCase(nonAvailableProduct)
   quoteShouldbeVisibleTestCase(

diff --git a/cypress-shared/integration/b2b/2.12.1-sales_admin_scenarios.spec.js b/cypress-shared/integration/b2b/2.12.1-sales_admin_scenarios.spec.js
@@ -25,21 +25,20 @@ import { salesAdminQuotesAccess } from '../../support/b2b/impersonation_quote_ac
 describe('Organization A - Cost Center A1 - Sales Admin Basic Scenario', () => {
   loginViaCookies({ storeFrontCookie: false })
 
-  const { nonAvailableProduct, costCenter1, users, quotes, gmailCreds } =
-    b2b.OrganizationA
+  const { nonAvailableProduct, costCenter1, users, quotes } = b2b.OrganizationA
 
   const { organizationName: organizationB, quotes: organizationBQuote } =
     b2b.OrganizationB
 
-  loginToStoreFront(users.SalesAdmin, roleObject.SalesAdmin.role, gmailCreds)
+  loginToStoreFront(users.SalesAdmin, roleObject.SalesAdmin.role)
   verifySession(b2b.OrganizationA, costCenter1.name, roleObject.SalesAdmin.role)
   productShouldNotbeAvailableTestCase(nonAvailableProduct)
 
   // Impersonate users
   userShouldNotImpersonateThisUser(
     roleObject.SalesAdmin.role,
     roleObject.SalesManager.role,
-    users.SalesManager
+    users.SalesManager.email
   )
   salesAdminQuotesAccess(b2b.OrganizationA, organizationB, organizationBQuote)
 

diff --git a/cypress-shared/integration/b2b/2.12.2-sales_admin_scenarios.spec.js b/cypress-shared/integration/b2b/2.12.2-sales_admin_scenarios.spec.js
@@ -29,20 +29,20 @@ import { salesAdminQuotesAccess } from '../../support/b2b/impersonation_quote_ac
 describe('Organization A - Cost Center A1 - Sales Admin Impersonation Scenario', () => {
   loginViaCookies({ storeFrontCookie: false })
 
-  const { product, costCenter1, users, quotes, gmailCreds } = b2b.OrganizationA
+  const { product, costCenter1, users, quotes } = b2b.OrganizationA
 
   const { organizationName: organizationB, quotes: organizationBQuote } =
     b2b.OrganizationB
 
   const impersonatedRole = ROLE_DROP_DOWN.Approver
 
-  loginToStoreFront(users.SalesAdmin, roleObject.SalesAdmin.role, gmailCreds)
+  loginToStoreFront(users.SalesAdmin, roleObject.SalesAdmin.role)
   verifySession(b2b.OrganizationA, costCenter1.name, roleObject.SalesAdmin.role)
 
   salesUserShouldImpersonateNonSalesUser(
     roleObject.SalesAdmin.role,
     impersonatedRole,
-    users.Approver1
+    users.Approver1.email
   )
 
   updateQuote(quotes.Buyer.quotes1, { discount: '20' })
@@ -63,7 +63,7 @@ describe('Organization A - Cost Center A1 - Sales Admin Impersonation Scenario',
     role: roleObject.SalesManager.role,
     impersonatedRole,
   })
-  searchQuote(quote, users.Approver1)
+  searchQuote(quote, users.Approver1.email)
   stopImpersonation(
     b2b.OrganizationA,
     costCenter1.name,

diff --git a/cypress-shared/integration/b2b/2.13.1-sales_manager_scenarios.spec.js b/cypress-shared/integration/b2b/2.13.1-sales_manager_scenarios.spec.js
@@ -19,17 +19,12 @@ import { salesManagerQuotesAccess } from '../../support/b2b/impersonation_quote_
 describe('Organization A - Cost Center A1 - Sales Manager Basic Scenario', () => {
   loginViaCookies({ storeFrontCookie: false })
 
-  const { nonAvailableProduct, users, costCenter1, quotes, gmailCreds } =
-    b2b.OrganizationA
+  const { nonAvailableProduct, users, costCenter1, quotes } = b2b.OrganizationA
 
   const { organizationName: organizationB, quotes: organizationBQuote } =
     b2b.OrganizationB
 
-  loginToStoreFront(
-    users.SalesManager,
-    roleObject.SalesManager.role,
-    gmailCreds
-  )
+  loginToStoreFront(users.SalesManager, roleObject.SalesManager.role)
   verifySession(
     b2b.OrganizationA,
     costCenter1.name,
@@ -38,7 +33,7 @@ describe('Organization A - Cost Center A1 - Sales Manager Basic Scenario', () =>
   userShouldNotImpersonateThisUser(
     roleObject.SalesManager.role,
     roleObject.SalesRepresentative.role,
-    users.SalesRep
+    users.SalesRepresentative.email
   )
   productShouldNotbeAvailableTestCase(nonAvailableProduct)
   salesManagerQuotesAccess(b2b.OrganizationA, organizationB, organizationBQuote)

diff --git a/cypress-shared/integration/b2b/2.13.2-sales_manager_scenarios.spec.js b/cypress-shared/integration/b2b/2.13.2-sales_manager_scenarios.spec.js
@@ -19,16 +19,12 @@ import { salesManagerQuotesAccess } from '../../support/b2b/impersonation_quote_
 describe('Organization A - Cost Center A1 - Sales Manager Impersonation Scenario', () => {
   loginViaCookies({ storeFrontCookie: false })
 
-  const { users, product, costCenter1, gmailCreds } = b2b.OrganizationA
+  const { users, product, costCenter1 } = b2b.OrganizationA
 
   const { organizationName: organizationB, quotes: organizationBQuote } =
     b2b.OrganizationB
 
-  loginToStoreFront(
-    users.SalesManager,
-    roleObject.SalesManager.role,
-    gmailCreds
-  )
+  loginToStoreFront(users.SalesManager, roleObject.SalesManager.role)
   verifySession(
     b2b.OrganizationA,
     costCenter1.name,
@@ -40,7 +36,7 @@ describe('Organization A - Cost Center A1 - Sales Manager Impersonation Scenario
   salesUserShouldImpersonateNonSalesUser(
     roleObject.SalesManager.role,
     impersonatedRole,
-    users.OrganizationAdmin1
+    users.OrganizationAdmin1.email
   )
   const quote = 'IMPERSONATE_QUOTE_2'
 
@@ -52,7 +48,7 @@ describe('Organization A - Cost Center A1 - Sales Manager Impersonation Scenario
     role: roleObject.SalesManager.role,
     impersonatedRole,
   })
-  searchQuote(quote, users.OrganizationAdmin1)
+  searchQuote(quote, users.OrganizationAdmin1.email)
   stopImpersonation(
     b2b.OrganizationA,
     costCenter1.name,

diff --git a/cypress-shared/integration/b2b/2.14.1-sales_rep_scenarios.spec.js b/cypress-shared/integration/b2b/2.14.1-sales_rep_scenarios.spec.js
@@ -23,16 +23,14 @@ import { salesRepQuotesAccess } from '../../support/b2b/impersonation_quote_acce
 describe('Organization A - Cost Center A1 - Sales Rep Basic Scenario', () => {
   loginViaCookies({ storeFrontCookie: false })
 
-  const { nonAvailableProduct, users, costCenter1, quotes, gmailCreds } =
-    b2b.OrganizationA
+  const { nonAvailableProduct, users, costCenter1, quotes } = b2b.OrganizationA
 
   const { organizationName: organizationB, quotes: organizationBQuote } =
     b2b.OrganizationB
 
   loginToStoreFront(
-    users.SalesRep,
-    roleObject.SalesRepresentative.role,
-    gmailCreds
+    users.SalesRepresentative,
+    roleObject.SalesRepresentative.role
   )
   verifySession(
     b2b.OrganizationA,
@@ -46,7 +44,7 @@ describe('Organization A - Cost Center A1 - Sales Rep Basic Scenario', () => {
   userShouldNotImpersonateThisUser(
     roleObject.SalesRepresentative.role,
     roleObject.SalesManager.role,
-    users.SalesManager
+    users.SalesManager.email
   )
   searchQuote(quotes.SalesRep.updateQuote)
   const price = '30.00'

diff --git a/cypress-shared/integration/b2b/2.14.2-sales_rep_scenarios.spec.js b/cypress-shared/integration/b2b/2.14.2-sales_rep_scenarios.spec.js
@@ -25,17 +25,16 @@ import { salesRepQuotesAccess } from '../../support/b2b/impersonation_quote_acce
 describe('Organization A - Cost Center A1 - Sales Rep Impersonation Scenario', () => {
   loginViaCookies({ storeFrontCookie: false })
 
-  const { users, product, costCenter1, quotes, gmailCreds } = b2b.OrganizationA
+  const { users, product, costCenter1, quotes } = b2b.OrganizationA
 
   const { organizationName: organizationB, quotes: organizationBQuote } =
     b2b.OrganizationB
 
   const impersonatedRole = ROLE_DROP_DOWN.Buyer
 
   loginToStoreFront(
-    users.SalesRep,
-    roleObject.SalesRepresentative.role,
-    gmailCreds
+    users.SalesRepresentative,
+    roleObject.SalesRepresentative.role
   )
   verifySession(
     b2b.OrganizationA,
@@ -46,7 +45,7 @@ describe('Organization A - Cost Center A1 - Sales Rep Impersonation Scenario', (
   salesUserShouldImpersonateNonSalesUser(
     roleObject.SalesRepresentative.role,
     impersonatedRole,
-    users.Buyer1
+    users.Buyer1.email
   )
 
   searchQuote(quotes.SalesRep.updateQuote)
@@ -64,7 +63,7 @@ describe('Organization A - Cost Center A1 - Sales Rep Impersonation Scenario', (
     role: roleObject.SalesRepresentative.role,
     impersonatedRole,
   })
-  searchQuote(quote, users.Buyer1)
+  searchQuote(quote, users.Buyer1.email)
   stopImpersonation(
     b2b.OrganizationA,
     costCenter1.name,

diff --git a/cypress-shared/integration/b2b/2.2.1-add_buyer_approver_organizationA.spec.js b/cypress-shared/integration/b2b/2.2.1-add_buyer_approver_organizationA.spec.js
@@ -21,22 +21,12 @@ import { verifyBindings } from '../../support/b2b/graphql.js'
 describe('OrganizationA - Create a Buyer and Approver, associate Cost Center and assign payment terms', () => {
   loginViaCookies({ storeFrontCookie: false })
 
-  const {
-    organizationName,
-    costCenter1,
-    costCenter2,
-    costCenter3,
-    users,
-    gmailCreds,
-  } = b2b.OrganizationA
-
-  verifyBindings(users.OrganizationAdmin1, true)
-
-  loginToStoreFront(
-    users.OrganizationAdmin1,
-    ROLE_DROP_DOWN.OrganizationAdmin,
-    gmailCreds
-  )
+  const { organizationName, costCenter1, costCenter2, costCenter3, users } =
+    b2b.OrganizationA
+
+  verifyBindings(users.OrganizationAdmin1.email, true)
+
+  loginToStoreFront(users.OrganizationAdmin1, ROLE_DROP_DOWN.OrganizationAdmin)
 
   setOrganizationIdInJSON(organizationName, costCenter1.name)
   addPaymentTermsCollectionPriceTablesTestCase(b2b.OrganizationA)

diff --git a/cypress-shared/integration/b2b/2.2.2-add_buyer_approver_organizationA.spec.js b/cypress-shared/integration/b2b/2.2.2-add_buyer_approver_organizationA.spec.js
@@ -19,42 +19,31 @@ import { verifyBindings } from '../../support/b2b/graphql.js'
 describe('OrganizationA - Create a Buyer and Approver, associate Cost Center and assign payment terms', () => {
   loginViaCookies({ storeFrontCookie: false })
 
-  const {
-    organizationName,
-    costCenter1,
-    costCenter2,
-    users,
-    product,
-    quotes,
-    gmailCreds,
-  } = b2b.OrganizationA
+  const { organizationName, costCenter1, costCenter2, users, product, quotes } =
+    b2b.OrganizationA
 
-  verifyBindings(users.OrganizationAdmin1, true)
+  verifyBindings(users.OrganizationAdmin1.email, true)
 
-  loginToStoreFront(
-    users.OrganizationAdmin1,
-    ROLE_DROP_DOWN.OrganizationAdmin,
-    gmailCreds
-  )
+  loginToStoreFront(users.OrganizationAdmin1, ROLE_DROP_DOWN.OrganizationAdmin)
 
   addUser({
     organizationName,
     costCenter: costCenter1.name,
     role: role.Buyer1,
-    gmailCreds,
+    email: users.Buyer1.email,
   })
   addUser({
     organizationName,
     costCenter: costCenter1.name,
     role: role.Approver1,
-    gmailCreds,
+    email: users.Approver1.email,
   })
 
   addUser({
     organizationName,
     costCenter: costCenter2.name,
     role: role.Buyer2,
-    gmailCreds,
+    email: users.Buyer2.email,
   })
 
   // Add/Delete users in costcenter1 - Hold
@@ -64,13 +53,13 @@ describe('OrganizationA - Create a Buyer and Approver, associate Cost Center and
     organizationName,
     costCenter: costCenter2.name,
     role: role.OrganizationAdmin2,
-    gmailCreds,
+    email: users.OrganizationAdmin2.email,
   })
   addUser({
     organizationName,
     costCenter: costCenter2.name,
     role: role.Approver2,
-    gmailCreds,
+    email: users.Approver2.email,
   })
 
   createQuote({