Merge pull request #252 from LiskHQ/202_cucumber-for-e2e

Refactor e2e tests to multitple files and use cucumber - Closes #202
LiskArchive · May 23, 2017 · 2b00967 · 2b00967
2 parents 89ff7bc + 0513907
commit 2b00967
Show file tree

Hide file tree

Showing 37 changed files with 521 additions and 494 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -15,11 +15,23 @@
     "func-names": "off",
     "global-require": "off",
     "new-cap": ["error", { "newIsCapExceptions": ["mnemonic"]}],
+    "new-cap": ["error", {
+      "newIsCapExceptions": ["mnemonic"],
+      "capIsNewExceptions" : [
+        "When",
+        "Then",
+        "Given",
+        "After",
+        "Before"
+      ]
+    }],
+
     "no-loop-func": "off",
     "no-plusplus": "off",
     "no-restricted-properties": "off",
     "no-return-assign": "off",
     "no-underscore-dangle": "off",
+    "import/no-extraneous-dependencies": "off",
     "no-param-reassign": "off"
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ node_modules
 npm-debug.log
 src/.nyc_output
 coverage
-src/e2e-test-screenshots
+e2e-test-screenshots
 app/report.html
 app/*.map
 *.sw[pon]

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -9,7 +9,7 @@ module.exports = function (grunt) {
         fix: false,
       },
       all: {
-        src: ['src/**/*.js', 'e2e-test/**/*.js', 'test/**/*.js', 'app/main.js', '*.js'],
+        src: ['src/**/*.js', 'features/**/*.js', 'test/**/*.js', 'app/main.js', '*.js'],
       },
     },
   });

diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ npm run dev
 Run the protractor tests (replace `~/git/lisk/` with your path to lisk core):
 
 ```
-./spec/setup.sh ~/git/lisk/
+./e2e-test-setup.sh ~/git/lisk/
 npm run e2e-test
 ```
 

diff --git a/e2e-test/setup.sh → e2e-test-setup.sh b/e2e-test/setup.sh → e2e-test-setup.sh
diff --git a/e2e-test/conf.js b/e2e-test/conf.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ module.exports = function (grunt) { @@
             fix: false,
           },
           all: {
-            src: ['src/**/*.js', 'e2e-test/**/*.js', 'test/**/*.js', 'app/main.js', '*.js'],
+            src: ['src/**/*.js', 'features/**/*.js', 'test/**/*.js', 'app/main.js', '*.js'],
           },
         },
       });
@@ Expand Down @@