Merge pull request #21237 from wireapp/jl/refactor-dataShareConsent-modal

test: remove "dataShareConsent" modal [WPB-22420]

Author: JacquelineLehner

apps/webapp/test/e2e_tests/pageManager/index.ts

@@ -30,7 +30,6 @@ import {AcknowledgeModal} from './webapp/modals/acknowledge.modal';
 import {AppLockModal} from './webapp/modals/appLock.modal';
 import {ConfirmModal} from './webapp/modals/confirm.modal';
 import {ConfirmLogoutModal} from './webapp/modals/confirmLogout.modal';
-import {DataShareConsentModal} from './webapp/modals/dataShareConsent.modal';
 import {DetailViewModal} from './webapp/modals/detailView.modal';
 import {LeaveConversationModal} from './webapp/modals/leaveConversation.modal';
 import {OptionModal} from './webapp/modals/option.modal';
@@ -194,8 +193,6 @@ export class PageManager {
       conversationJoin: () => this.getOrCreate('webapp.pages.conversationJoin', () => ConversationJoinPage(this.page)),
     },
     modals: {
-      dataShareConsent: () =>
-        this.getOrCreate('webapp.modals.dataShareConsent', () => new DataShareConsentModal(this.page)),
       appLock: () => this.getOrCreate('webapp.modals.appLock', () => new AppLockModal(this.page)),
       userProfile: () => this.getOrCreate('webapp.modals.userProfile', () => new UserProfileModal(this.page)),
       confirmLogout: () => this.getOrCreate('webapp.modals.confirmLogout', () => new ConfirmLogoutModal(this.page)),

apps/webapp/test/e2e_tests/pageManager/webapp/modals/dataShareConsent.modal.ts

@@ -53,7 +53,7 @@ test.describe('Authentication', () => {
       const pageManager = await PageManager.from(createPage(withLogin(createUser({disableTelemetry: false}))));
       const {modals} = pageManager.webapp;
 
-      await expect(modals.dataShareConsent().modalTitle).toBeVisible();
+      await expect(modals.confirm().modalTitle).toBeVisible();
     },
   );
 

apps/webapp/test/e2e_tests/specs/Authentication/authentication.spec.ts

@@ -68,7 +68,7 @@ test('Personal Account Lifecycle', {tag: ['@TC-8638', '@crit-flow-web']}, async
 
   await test.step('Personal user A declines sending anonymous usage data', async () => {
     const {modals} = pageManagerA.webapp;
-    await modals.dataShareConsent().clickDecline();
+    await modals.confirm().cancelButton.click();
   });
 
   await test.step('Personal user A checks that username was set correctly', async () => {