updates for test

Author: vlad-dargel

tests/e2e/helpers/common.ts

@@ -1,9 +1,9 @@
 import * as path from 'path';
 import * as fs from 'fs';
-import archiver from 'archiver';
 import { ClientFunction, RequestMock, t } from 'testcafe';
 import { Chance } from 'chance';
 import { apiUrl, commonUrl } from './conf';
+const archiver = require('archiver');
 
 const chance = new Chance();
 
@@ -222,14 +222,6 @@ export class Common {
         return parsedJson[property];
     }
 
-    /**
-     * Get json file value as a string
-     * @param filePath Path to json file
-     */
-    static getJsonFileAsString(filePath: string): string {
-        return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
-    }
-
     /**
      * Create Zip archive from folder
      * @param folderPath Path to folder to archive

tests/e2e/package.json

@@ -13,7 +13,7 @@
     "build:ui": "yarn --cwd ../../ build:ui",
     "redis:last": "docker run --name redis-last-version -p 7777:6379 -d redislabs/redismod",
     "start:app": "cross-env yarn start:api",
-    "test:chrome": "testcafe --compiler-options typescript.configPath=tsconfig.testcafe.json --cache --allow-insecure-localhost --ignore-certificate-errors --disable-multiple-windows --concurrency 1 chrome tests/ -r html:./report/report.html,spec -e -s takeOnFails=true,path=report/screenshots/,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png",
+    "test:chrome": "testcafe --compiler-options typescript.configPath=tsconfig.testcafe.json --cache --allow-insecure-localhost --disable-multiple-windows --concurrency 1 chrome tests/ -r html:./report/report.html,spec -e -s takeOnFails=true,path=report/screenshots/,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png",
     "test:chrome:ci": "ts-node ./web.runner.ts",
     "test": "yarn test:chrome",
     "lint": "eslint . --ext .ts,.js,.tsx,.jsx",

tests/e2e/pageObjects/browser-page.ts

@@ -841,8 +841,8 @@ export class BrowserPage extends InstancePage {
      */
     async addJsonKeyOnTheSameLevel(jsonKey: string, jsonKeyValue: string): Promise<void> {
         await t.click(this.addJsonObjectButton);
-        await t.typeText(this.jsonKeyInput, jsonKey, { replace: true, paste: true });
-        await t.typeText(this.jsonValueInput, jsonKeyValue, { replace: true, paste: true });
+        await t.typeText(this.jsonKeyInput, jsonKey, { paste: true });
+        await t.typeText(this.jsonValueInput, jsonKeyValue, { paste: true });
         await t.click(this.applyButton);
     }
 
@@ -854,8 +854,8 @@ export class BrowserPage extends InstancePage {
     async addJsonKeyInsideStructure(jsonKey: string, jsonKeyValue: string): Promise<void> {
         await t.click(this.expandJsonObject);
         await t.click(this.addJsonFieldButton);
-        await t.typeText(this.jsonKeyInput, jsonKey, { replace: true, paste: true });
-        await t.typeText(this.jsonValueInput, jsonKeyValue, { replace: true, paste: true });
+        await t.typeText(this.jsonKeyInput, jsonKey, { paste: true });
+        await t.typeText(this.jsonValueInput, jsonKeyValue, { paste: true });
         await t.click(this.applyButton);
     }
 
@@ -868,7 +868,7 @@ export class BrowserPage extends InstancePage {
             await t.click(this.expandJsonObject);
         }
         await t.click(this.editJsonObjectButton);
-        await t.typeText(this.jsonValueInput, jsonStructure, { replace: true, paste: true });
+        await t.typeText(this.jsonValueInput, jsonStructure, { paste: true });
         await t.click(this.applyEditButton);
     }
 

tests/e2e/tests/web/smoke/browser/json-key.e2e.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import * as path from 'path';
 import { rte } from '../../../../helpers/constants';
 import { DatabaseHelper } from '../../../../helpers/database';
 import { BrowserPage } from '../../../../pageObjects';
@@ -17,7 +17,6 @@ const keyTTL = '2147476121';
 const value = '{"name":"xyz"}';
 const jsonObjectValue = '{name:"xyz"}';
 const jsonFilePath = path.join('..', '..', '..', '..', 'test-data', 'big-json', 'big-json.json');
-const jsonString = Common.getJsonFileAsString(jsonFilePath);
 
 fixture `JSON Key verification`
     .meta({ type: 'smoke', rte: rte.standalone })
@@ -55,15 +54,18 @@ test('Verify that user can add key with value to any level of JSON structure', a
 test('Verify that user can add key with value to any level of JSON structure for big JSON object', async t => {
     keyName = Common.generateWord(10);
     // Add Json key with json object
-    await browserPage.addJsonKey(keyName, jsonString, keyTTL);
+    await t.click(browserPage.plusAddKeyButton);
+    await t.click(browserPage.keyTypeDropDown);
+    await t.click(browserPage.jsonOption);
+    await t.click(browserPage.addKeyNameInput);
+    await t.typeText(browserPage.addKeyNameInput, keyName, { replace: true, paste: true });
+    await t.setFilesToUpload(browserPage.jsonUploadInput, [jsonFilePath]);
+    await t.click(browserPage.addKeyButton);
     // Check the notification message
     const notification = browserPage.Toast.toastHeader.textContent;
     await t.expect(notification).contains('Key has been added', 'The notification not found');
-    // Verify that user can create JSON object
-    await t.expect(browserPage.addJsonObjectButton.exists).ok('The add Json object button not found', { timeout: 10000 });
-    await t.expect(browserPage.jsonKeyValue.textContent).eql(jsonObjectValue, 'The json object value not found');
-
     // Add key with value on the same level
+    await t.debug()
     await browserPage.addJsonKeyOnTheSameLevel('"key1"', '"value1"');
     // Check the added key contains json object with added key
     await t.expect(browserPage.addJsonObjectButton.exists).ok('The add Json object button not found', { timeout: 10000 });