test: add missing test and move all NotSavedPopup tests to updating-attributions.test.ts

Author: PhilippMa

src/e2e-tests/__tests__/import-dialog.test.ts

@@ -22,28 +22,26 @@ test.use({
     outputData: faker.opossum.outputData({}),
     provideImportFiles: true,
   },
-  isImportFileTest: true,
+  openFromCLI: false,
 });
 
 test('opens, displays and closes import dialog', async ({
   menuBar,
   importDialog,
 }) => {
-  await menuBar.openImportLegacyOpossumFile();
+  await menuBar.importLegacyOpossumFile();
   await importDialog.assert.titleIsVisible();
 
   await importDialog.cancelButton.click();
 
   await importDialog.assert.titleIsHidden();
 });
 
-test('imports legacy opossum file and checks for unsaved changes', async ({
+test('imports legacy opossum file', async ({
   menuBar,
   importDialog,
   resourcesTree,
   window,
-  attributionDetails,
-  notSavedPopup,
 }) => {
   await stubDialog(window.app, 'showOpenDialogSync', [
     importDialog.legacyFilePath,
@@ -54,7 +52,7 @@ test('imports legacy opossum file and checks for unsaved changes', async ({
     getDotOpossumFilePath(importDialog.legacyFilePath, ['json', 'json.gz']),
   );
 
-  await menuBar.openImportLegacyOpossumFile();
+  await menuBar.importLegacyOpossumFile();
   await importDialog.assert.titleIsVisible();
 
   await importDialog.inputFileSelection.click();
@@ -63,15 +61,6 @@ test('imports legacy opossum file and checks for unsaved changes', async ({
 
   await importDialog.assert.titleIsHidden();
   await resourcesTree.assert.resourceIsVisible(resourceName);
-
-  const comment = faker.lorem.sentences();
-  await resourcesTree.goto(resourceName);
-  await attributionDetails.attributionForm.comment.fill(comment);
-
-  await menuBar.openImportLegacyOpossumFile();
-  await notSavedPopup.assert.isVisible();
-  await notSavedPopup.discardButton.click();
-  await importDialog.assert.titleIsVisible();
 });
 
 test('imports scancode file', async ({
@@ -89,7 +78,7 @@ test('imports scancode file', async ({
     getDotOpossumFilePath(importDialog.scancodeFilePath, ['json']),
   );
 
-  await menuBar.openImportScanCodeFile();
+  await menuBar.importScanCodeFile();
   await importDialog.assert.titleIsVisible();
 
   await importDialog.inputFileSelection.click();
@@ -104,7 +93,7 @@ test('shows error when no file path is set', async ({
   menuBar,
   importDialog,
 }) => {
-  await menuBar.openImportLegacyOpossumFile();
+  await menuBar.importLegacyOpossumFile();
   await importDialog.assert.titleIsVisible();
 
   await importDialog.importButton.click();

src/e2e-tests/__tests__/updating-attributions.test.ts

@@ -66,6 +66,7 @@ test('warns user of unsaved changes if user attempts to open new file before sav
   notSavedPopup,
   resourcesTree,
   topBar,
+  menuBar,
 }) => {
   const comment = faker.lorem.sentences();
   await resourcesTree.goto(resourceName1);
@@ -77,7 +78,7 @@ test('warns user of unsaved changes if user attempts to open new file before sav
   await notSavedPopup.cancelButton.click();
   await attributionDetails.attributionForm.assert.commentIs(comment);
 
-  await topBar.openFileButton.click();
+  await menuBar.openFile();
   await notSavedPopup.assert.isVisible();
 });
 
@@ -109,6 +110,34 @@ test('warns user of unsaved changes if user attempts to navigate away before sav
   await topBar.assert.reportViewIsActive();
 });
 
+test('warns user of unsaved changes if user attempts to import new file before saving', async ({
+  attributionDetails,
+  notSavedPopup,
+  resourcesTree,
+  menuBar,
+}) => {
+  const comment = faker.lorem.sentences();
+  await resourcesTree.goto(resourceName1);
+  await attributionDetails.attributionForm.comment.fill(comment);
+
+  await menuBar.importLegacyOpossumFile();
+  await notSavedPopup.assert.isVisible();
+});
+
+test('warns user of unsaved changes if user attempts to export data before saving', async ({
+  attributionDetails,
+  notSavedPopup,
+  resourcesTree,
+  menuBar,
+}) => {
+  const comment = faker.lorem.sentences();
+  await resourcesTree.goto(resourceName1);
+  await attributionDetails.attributionForm.comment.fill(comment);
+
+  await menuBar.exportFollowUp();
+  await notSavedPopup.assert.isVisible();
+});
+
 test('allows user to update an attribution on the selected resource only', async ({
   attributionDetails,
   resourcesTree,

src/e2e-tests/page-objects/MenuBar.ts

@@ -22,22 +22,30 @@ export class MenuBar {
     await clickMenuItem(this.window.app, 'label', 'Project Metadata');
   }
 
+  async openFile(): Promise<void> {
+    await clickMenuItem(this.window.app, 'label', 'Open File');
+  }
+
   async openProjectStatistics(): Promise<void> {
     await clickMenuItem(this.window.app, 'label', 'Project Statistics');
   }
 
-  async openImportLegacyOpossumFile(): Promise<void> {
+  async importLegacyOpossumFile(): Promise<void> {
     await clickMenuItem(
       this.window.app,
       'label',
       'Legacy Opossum File (.json/.json.gz)',
     );
   }
 
-  async openImportScanCodeFile(): Promise<void> {
+  async importScanCodeFile(): Promise<void> {
     await clickMenuItem(this.window.app, 'label', 'ScanCode File (.json)');
   }
 
+  async exportFollowUp(): Promise<void> {
+    await clickMenuItem(this.window.app, 'label', 'Follow-Up');
+  }
+
   async toggleQaMode(): Promise<void> {
     await clickMenuItem(this.window.app, 'label', 'QA Mode');
   }

src/e2e-tests/utils/fixtures.ts

@@ -67,7 +67,7 @@ export const test = base.extend<{
   linkedResourcesTree: LinkedResourcesTree;
   menuBar: MenuBar;
   notSavedPopup: NotSavedPopup;
-  isImportFileTest: boolean;
+  openFromCLI: boolean;
   pathBar: PathBar;
   projectMetadataPopup: ProjectMetadataPopup;
   projectStatisticsPopup: ProjectStatisticsPopup;
@@ -77,8 +77,8 @@ export const test = base.extend<{
   topBar: TopBar;
 }>({
   data: undefined,
-  isImportFileTest: false,
-  window: async ({ data, isImportFileTest }, use, info) => {
+  openFromCLI: true,
+  window: async ({ data, openFromCLI }, use, info) => {
     const filePath = data && (await createTestFile({ data, info }));
 
     const [executablePath, main] = getLaunchProps();
@@ -90,7 +90,7 @@ export const test = base.extend<{
     const app = await electron.launch({
       args: [
         main,
-        ...(!filePath || isImportFileTest ? args : args.concat([filePath])),
+        ...(!filePath || !openFromCLI ? args : args.concat([filePath])),
       ],
       executablePath,
     });