Merge pull request #171 from RedisInsight/e2e/bugfix/folders-renaming

E2e/bugfix/folders renaming

Author: vlad-dargel

.circleci/config.yml

@@ -132,7 +132,7 @@ jobs:
                   APP_BUILD_TYPE="VSCode (Linux)" node ./.circleci/e2e-results.js
                   # curl -H "Content-type: application/json" --data @e2e.report.json -H "Authorization: Bearer $SLACK_TEST_REPORT_KEY" -X POST https://slack.com/api/chat.postMessage
       - store_test_results:
-          path: tests/e2e/results
+          path: tests/e2e/mochawesome-report
       - store_artifacts:
           path: tests/e2e/mochawesome-report
           destination: tests/e2e/mochawesome-report

.circleci/e2e-results.js

@@ -6,8 +6,8 @@ if (totalNodes > 1) {
   parallelNodeInfo = ` (node: ${parseInt(process.env.CIRCLE_NODE_INDEX, 10) + 1}/${totalNodes})`
 }
 
-const file = 'tests/e2e/results/e2e.results.json'
-const appBuildType = process.env.APP_BUILD_TYPE || 'Web'
+const file = fs.readdirSync('tests/e2e/mochawesome-report').find(file => file.endsWith('-setup-report.json'))
+const appBuildType = process.env.APP_BUILD_TYPE || 'VSCode (Linux)'
 const results = {
   message: {
     text: `*E2ETest - ${appBuildType}${parallelNodeInfo}* (Branch: *${process.env.CIRCLE_BRANCH}*)` +
@@ -19,22 +19,22 @@ const results = {
 const result = JSON.parse(fs.readFileSync(file, 'utf-8'))
 const testRunResult = {
   color: '#36a64f',
-  title: `Started at: *${result.startTime}`,
-  text: `Executed ${result.total} in ${(new Date(result.endTime) - new Date(result.startTime)) / 1000}s`,
+  title: `Started at: *${result.stats.start}`,
+  text: `Executed ${result.stats.tests} in ${(new Date(result.stats.end) - new Date(result.stats.start)) / 1000}s`,
   fields: [
     {
       title: 'Passed',
-      value: result.passed,
+      value: result.stats.passes,
       short: true,
     },
     {
       title: 'Skipped',
-      value: result.skipped,
+      value: result.stats.skipped,
       short: true,
     },
   ],
 };
-const failed = result.total - result.passed;
+const failed = result.stats.failures;
 if (failed) {
   results.passed = false;
   testRunResult.color = '#cc0000';

tests/e2e/.ci.env

@@ -1,7 +1,7 @@
 COMMON_URL=http://localhost:5541
 API_URL=http://127.0.0.1:5541/api
 OSS_SENTINEL_PASSWORD=password
-RI_APP_FOLDER_NAME=.redis-insight-vsc-stage
+RI_APP_FOLDER_NAME=.redis-for-vscode-stage
 EXTENSION_NAME=redis-for-vscode-extension-linux-x64.vsix
 RI_TEST=true
 

tests/e2e/.env

@@ -1,7 +1,7 @@
 API_URL=http://127.0.0.1:5541/api
 RI_TEST=true
 OSS_SENTINEL_PASSWORD=password
-RI_APP_FOLDER_NAME=.redis-insight-vsc-stage
+RI_APP_FOLDER_NAME=.redis-for-vscode-stage
 VSCODE_VERSION=1.82.0
 EXTENSION_NAME=redis-for-vscode-extension.vsix
 

tests/e2e/.mocharc.js

@@ -8,10 +8,17 @@ module.exports = {
   package: './package.json',
   parallel: false,
   recursive: false,
-  reporter: 'mochawesome',
+  reporter: 'mocha-multi-reporters',
   reporterOptions: {
-    reportFilename: '[status]_[datetime]-[name]-report',
-    quiet: true,
+    reporterEnabled: 'mochawesome, mocha-junit-reporter',
+    mochawesomeReporterOptions: {
+      reportFilename: '[status]_[datetime]-[name]-report',
+      quiet: true,
+    },
+    mochaJunitReporterReporterOptions: {
+      mochaFile: './mochawesome-report/junit-report.xml',
+      toConsole: false,
+    },
   },
   retries: 0,
   timeout: 100_000,

tests/e2e/package.json

@@ -34,6 +34,8 @@
     "eslint": "^7.5.0",
     "fs-extra": "^11.1.1",
     "mocha": "^10.2.0",
+    "mocha-junit-reporter": "^2.2.1",
+    "mocha-multi-reporters": "^1.5.1",
     "mochawesome": "^7.1.3",
     "redis": "^4.6.11",
     "rimraf": "^6.0.1",

tests/e2e/src/helpers/Conf.ts

@@ -13,7 +13,7 @@ export class Config {
 
   static workingDirectory =
     process.env.APP_FOLDER_ABSOLUTE_PATH ||
-    joinPath(os.homedir(), process.env.APP_FOLDER_NAME || '.redis-for-vscode')
+    joinPath(os.homedir(), process.env.RI_APP_FOLDER_NAME || '.redis-for-vscode')
   static fileDownloadPath = joinPath(os.homedir(), 'Downloads')
   static uniqueId = chance.string({ length: 10 })
 

tests/e2e/src/page-objects/components/bottom-bar/CliViewPanel.ts

@@ -98,11 +98,10 @@ export class CliViewPanel extends WebView {
   }
 
   /**
-   * Get text from the last cli output, no formatting.
-   * @param timeout optional maximum time to wait for completion in milliseconds, 0 for unlimited
+   * Get text from the last cli output, no formatting
    * @returns Promise resolving to cli result text
    */
-  async getCliLastCommandResponse(timeout: number = 5000): Promise<string> {
+  async getCliLastCommandResponse(): Promise<string> {
     await super.getElement(this.cliOutput)
     const commandsCount = await this.getNumberOfCommands()
     await super.getElement(this.cliOutput)

tests/e2e/src/page-objects/components/tree-view/TreeView.ts

@@ -294,7 +294,5 @@ export class TreeView extends WebView {
    */
   async openCliByDatabaseName(databaseName: string): Promise<void> {
     await ButtonActions.clickElement(this.getCLIDatabaseBtnByName(databaseName))
-    // TODO delete after fixing CLI issue with invalid db id
-    await ButtonActions.clickElement(this.getCLIDatabaseBtnByName(databaseName))
   }
 }

tests/e2e/src/tests/cli/cli.ts

@@ -32,17 +32,16 @@ describe('CLI critical', () => {
     )
   })
   beforeEach(async () => {
-    await cliViewPanel.switchBack()
+    await treeView.switchBack()
     await treeView.switchToInnerViewFrame(InnerViews.TreeInnerView)
     await treeView.openCliByDatabaseName(
       Config.ossStandaloneConfig.databaseName,
     )
     await treeView.switchBack()
+    await CommonDriverExtension.driverSleep(1000)
     await cliViewPanel.switchToInnerViewFrame(InnerViews.CliInnerView)
   })
   afterEach(async () => {
-    await cliViewPanel.switchBack()
-    await bottomBar.openTerminalView()
     await KeyAPIRequests.deleteKeyIfExistsApi(
       keyName,
       Config.ossStandaloneConfig.databaseName,