Merge pull request #3532 from RedisInsight/e2e/bugfix/remove-rdi-server-mocked

fixes for desktop e2e

Author: vlad-dargel

.circleci/config.yml

@@ -391,6 +391,15 @@ jobs:
       - attach_workspace:
           at: .
       - run: sudo apt-get install net-tools
+      - run:
+          name: Install WM
+          command: sudo apt install fluxbox
+      - run:
+          name: Run X11
+          command: |
+            Xvfb :99 -screen 0 1920x1080x24 &
+            sleep 3
+            fluxbox &
       # - run:
       #     name: Clone mocked RDI server
       #     command: |

tests/e2e/desktop.runner.ts

@@ -12,12 +12,11 @@ import testcafe from 'testcafe';
                     } })
                 .src((process.env.TEST_FILES || 'tests/electron/**/*.e2e.ts').split('\n'))
                 .browsers(['electron'])
-                // Skipped because screenshots don't work for electron app on linux
-                // .screenshots({
-                //     path: './report/screenshots/',
-                //     takeOnFails: true,
-                //     pathPattern: '${USERAGENT}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png'
-                // })
+                .screenshots({
+                    path: './report/screenshots/',
+                    takeOnFails: true,
+                    pathPattern: '${USERAGENT}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png'
+                })
                 .reporter([
                     'spec',
                     {
@@ -40,6 +39,7 @@ import testcafe from 'testcafe';
                     assertionTimeout: 5000,
                     speed: 1,
                     quarantineMode: { successThreshold: 1, attemptLimit: 3 },
+                    pageRequestTimeout: 8000,
                     disableMultipleWindows: true
                 });
         })

tests/e2e/helpers/common.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import { ClientFunction, RequestMock, t } from 'testcafe';
 import { Chance } from 'chance';
-import { apiUrl, commonUrl } from './conf';
+import { apiUrl } from './conf';
 const archiver = require('archiver');
 
 const chance = new Chance();
@@ -13,7 +13,7 @@ declare global {
     }
   }
 
-const settingsApiUrl = `${commonUrl}/api/settings`;
+const settingsApiUrl = `${apiUrl}/settings`;
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // lgtm[js/disabling-certificate-validation]
 const mockedSettingsResponse = {
     agreements: {

tests/e2e/tests/electron/critical-path/a-first-start-form/user-agreements-form.e2e.ts

@@ -1,4 +1,4 @@
-import { commonUrl, workingDirectory } from '../../../../helpers/conf';
+import { commonUrl } from '../../../../helpers/conf';
 import { MyRedisDatabasePage } from '../../../../pageObjects';
 import { Common } from '../../../../helpers/common';
 import { rte } from '../../../../helpers/constants';
@@ -7,16 +7,12 @@ import { UserAgreementDialog } from '../../../../pageObjects/dialogs';
 const userAgreementDialog = new UserAgreementDialog();
 const myRedisDatabasePage = new MyRedisDatabasePage();
 
-const dbPath = `${workingDirectory}/redisinsight.db`;
-
-fixture `Agreements Verification`
+// Skipped due to unworking mocs to refresh eula https://redislabs.atlassian.net/browse/RI-5868
+fixture.skip `Agreements Verification`
     .meta({ type: 'critical_path', rte: rte.none })
     .page(commonUrl)
-    .requestHooks(Common.mockSettingsResponse());
-test
-    .before(async() => {
-        await Common.deleteFileFromFolderIfExists(dbPath);
-    })('Verify that user should accept User Agreements to continue working with the application', async t => {
+    .requestHooks(Common.mockSettingsResponse())
+test('Verify that user should accept User Agreements to continue working with the application', async t => {
         await t.expect(userAgreementDialog.userAgreementsPopup.exists).ok('User Agreements Popup is shown');
         // Verify that I still has agreements popup & cannot add a database
         await t.expect(userAgreementDialog.submitButton.hasAttribute('disabled')).ok('Submit button not disabled by default');

tests/e2e/tests/web/regression/monitor/monitor.e2e.ts

@@ -115,7 +115,8 @@ test
             await t.expect(previousTimestamp).notEql(nextTimestamp, 'Monitor results not correct');
         }
     });
-test
+// Skipped due to redis issue https://redislabs.atlassian.net/browse/RI-4111
+test.skip
     .before(async t => {
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
         await browserPage.Cli.sendCommandInCli('acl setuser noperm nopass on +@all ~* -monitor -client');