chore: fix conflicts

stone-payments · Nov 7, 2018 · 5a83faf · 5a83faf
2 parents 1269465 + 1e56ef2
commit 5a83faf
Show file tree

Hide file tree

Showing 14 changed files with 272 additions and 387 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,4 +34,4 @@ lerna-debug.log
 
 # nightwatch
 reports
-bin
+bin
diff --git a/nightwatch.json b/nightwatch.json
@@ -1,9 +1,6 @@
 {
-  "src_folders": ["packages/sling-web-component-input/src/component/Input.regression.test.js"],
+  "src_folders": ["./packages"],
   "output_folder": "reports",
-  "custom_commands_path": "",
-  "custom_assertions_path": "",
-  "page_objects_path": "",
   "selenium": {
     "start_process": true,
     "server_path": "./bin/selenium.jar",
@@ -16,8 +13,7 @@
   },
   "test_settings": {
     "default": {
-      "filter" : "/*/src/component/*.regression.test.js",
-      "launch_url": "",
+      "filter" : "./*.regression.test.js",
       "silent": true,
       "desiredCapabilities": {
         "browserName": "chrome",
@@ -26,7 +22,13 @@
         },
         "javascriptEnabled": true,
         "acceptSslCerts": true
+      },
+      "screenshots" : {
+        "enabled" : true,
+        "on_failure" : true,
+        "on_error" : false,
+        "path" : ""
       }
     }
   }
-}
+}