Merge pull request #50 from nobitlost/features/test-dev

Features/test dev

Author: Pavel Petroshenko

Diff for: spec/ImptTestHelper.js

@@ -33,7 +33,7 @@ const Utils = require('../lib/util/Utils');
 const UserInteractor = require('../lib/util/UserInteractor');
 const child_process = require('child_process');
 
-const TIMEOUT_MS = 999999;
+const TIMEOUT_MS = 10000000;
 const TESTS_EXECUTION_FOLDER = `${__dirname}/../__test${process.env.IMPT_FOLDER_SUFFIX ? process.env.IMPT_FOLDER_SUFFIX : ''}`;
 const KEY_ANSWER = {
     CTRL_C: '\x03',
@@ -255,6 +255,7 @@ class ImptTestHelper {
 
     // Checks success return code of the command
     static checkSuccessStatus(commandOut) {
+        expect(commandOut.output).not.toMatch(UserInteractor.ERRORS.ACCESS_FAILED);
         expect(commandOut.code).toEqual(0);
     }
 
@@ -271,7 +272,7 @@ class ImptTestHelper {
 
     // Checks if the command output contains the specified attribute name and value
     static checkAttribute(commandOut, attrName, attrValue) {
-        expect(commandOut.output).toMatch(new RegExp(`${attrName}"?:\\s+"?${attrValue.replace(new RegExp(/"/g), '\\\\?"')}"?`));
+        expect(commandOut.output).toMatch(new RegExp(`${attrName}"?:\\s+"?${attrValue.replace(new RegExp(/([\^\[\.\$\{\*\(\\\+\)\|\?\<\>])/g),'\\$&').replace(new RegExp(/"/g), '\\\\?"')}"?`));
     }
 
     // Checks if the command output contains the specified message for default or debug output mode

Diff for: spec/build/build_cleanup.spec.js

@@ -261,7 +261,7 @@ ImptTestHelper.OUTPUT_MODES.forEach((outputMode) => {
                 ImptTestHelper.runCommand(`impt build cleanup -q ${outputMode}`, (commandOut) => {
                     _checkSuccessDeleteDeploymentMessage(commandOut, build2_id);
                     _checkSuccessDeleteDeploymentMessage(commandOut, build4_id);
-                    ImptTestHelper.checkSuccessStatus(commandOut);
+                    ImptTestHelper.emptyCheck(commandOut);
                 }).
                     then(() => ImptTestHelper.runCommand(`impt build list -o me --zombie -z json`, (commandOut) => {
                         expect(commandOut).toContainBuild({ id: build_id });
@@ -282,7 +282,7 @@ ImptTestHelper.OUTPUT_MODES.forEach((outputMode) => {
                     _checkSuccessDeleteDeploymentMessage(commandOut, build2_id);
                     _checkSuccessDeleteDeploymentMessage(commandOut, build3_id);
                     _checkSuccessDeleteDeploymentMessage(commandOut, build4_id);
-                    ImptTestHelper.checkSuccessStatus(commandOut);
+                    ImptTestHelper.emptyCheck(commandOut);
                 }).
                     then(() => ImptTestHelper.runCommand(`impt build list -o me --zombie -z json`, (commandOut) => {
                         expect(commandOut).not.toContainBuild({ id: build_id });

Diff for: spec/device/device_assign.spec.js

@@ -49,7 +49,6 @@ ImptTestHelper.OUTPUT_MODES.forEach((outputMode) => {
         beforeAll((done) => {
             ImptTestHelper.init().
                 then(() => ImptTestHelper.checkDeviceStatus(config.devices[config.deviceidx])).
-                then(_testSuiteCleanUp).
                 then(_testSuiteInit).
                 then(done).
                 catch(error => done.fail(error));