fix 12

Author: vlad-dargel

tests/e2e/src/helpers/api/Eula.ts

@@ -13,4 +13,16 @@ export class Eula {
     )
     expect(await response.status).eql(200)
   }
+
+  /**
+   * Reset eula
+   */
+    static async reset(): Promise<void> {
+      const spec = { agreements: { analytics: false, notifications: false, eula: false, encryption: false } }
+      const response = await CommonAPIRequests.sendPatchRequest(
+        `/settings`,
+        spec,
+      )
+      expect(await response.status).eql(200)
+    }
 }

tests/e2e/src/tests/setup.ts

@@ -19,6 +19,8 @@ import {
 import { ButtonActions, CheckboxActions } from '@e2eSrc/helpers/common-actions'
 import { WelcomeView } from '@e2eSrc/page-objects/components/editor-view/WelcomeView'
 import { CommonElementActions } from '@e2eSrc/helpers/common-actions/actions/CommonElementActions'
+import { Eula } from '@e2eSrc/helpers/api/Eula'
+import { CommonDriverExtension } from '@e2eSrc/helpers'
 
 describe('Agreements Verification', () => {
   let browser: VSBrowser
@@ -37,9 +39,14 @@ describe('Agreements Verification', () => {
     await ServerActions.waitForServerInitialized()
     await browser.waitForWorkbench(20_000)
     await new TitleBar().getWindowControls().maximize()
-    await (await new ActivityBar().getViewControl('Redis for VS Code'))?.openView()
   })
   beforeEach(async () => {
+    await Eula.reset()
+    await (await new ActivityBar().getViewControl('Redis for VS Code'))?.openView()
+    await CommonDriverExtension.driverSleep(200)
+    await (await new ActivityBar().getViewControl('Redis for VS Code'))?.closeView()
+    await CommonDriverExtension.driverSleep(200)
+    await (await new ActivityBar().getViewControl('Redis for VS Code'))?.openView()
     await eulaView.switchToInnerViewFrame(InnerViews.EulaInnerView)
     await eulaView.waitForElementVisibility(eulaView.submitButton)
   })

tests/e2e/src/vscode.runner.ts

@@ -58,10 +58,8 @@ import { VScodeScripts } from './helpers/scripts/vscodeScripts'
     console.log('Test Files to run: ', process.env.TEST_FILES)
     // Run tests
     await exTester.runTests(
-      process.env.TEST_FILES || [
-        path.join(__dirname, '..', 'dist', 'tests', 'setup.js'),
-        path.join(__dirname, '..', 'dist', 'tests', '**', '*.js'),
-      ],
+      ((process.env.TEST_FILES ||
+        path.join(__dirname, '..', 'dist', 'tests', '**', '*.js')).split('\n')),
       {
         settings: 'settings.json',
         logLevel: logging.Level.INFO,