[cordova-lib] branch master updated: Simplify jasmine configuration (#816)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

raphinesse pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-lib.git


The following commit(s) were added to refs/heads/master by this push:
     new bcfe83e  Simplify jasmine configuration (#816)
bcfe83e is described below

commit bcfe83ec4a75277e6e8530fbbc56e8aba9cb59c0
Author: Raphael von der Grün <ra...@gmail.com>
AuthorDate: Sat Nov 2 20:29:40 2019 +0100

    Simplify jasmine configuration (#816)
    
    - use one shared jasmine.json for all tests
    - remove key with default values from jasmine.json
    - use default location spec/support/jasmine.json for configuration
---
 integration-tests/jasmine.json  | 13 -------------
 package.json                    |  4 ++--
 spec/{ => support}/jasmine.json |  4 ----
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/integration-tests/jasmine.json b/integration-tests/jasmine.json
deleted file mode 100644
index 8b20184..0000000
--- a/integration-tests/jasmine.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "spec_dir": "integration-tests",
-    "spec_files": [
-        "**/*[sS]pec.js",
-        "**/*[sS]pec.js"
-    ],
-    "helpers": [
-        "../spec/helpers.js",
-        "../spec/helper.js"
-    ],
-    "stopSpecOnExpectationFailure": false,
-    "random": false
-}
diff --git a/package.json b/package.json
index 6457963..61920f4 100644
--- a/package.json
+++ b/package.json
@@ -53,10 +53,10 @@
   "scripts": {
     "test": "npm run eslint && npm run unit-tests && npm run e2e-tests",
     "eslint": "eslint .",
-    "unit-tests": "jasmine JASMINE_CONFIG_PATH=spec/jasmine.json",
+    "unit-tests": "jasmine \"spec/**/*.spec.js\"",
     "cover": "nyc -x spec/ -x integration-tests/ npm test",
     "report-coverage": "nyc report -r text-lcov > coverage.lcov && codecov",
-    "e2e-tests": "jasmine JASMINE_CONFIG_PATH=integration-tests/jasmine.json"
+    "e2e-tests": "jasmine \"integration-tests/**/*.spec.js\""
   },
   "contributors": [
     {
diff --git a/spec/jasmine.json b/spec/support/jasmine.json
similarity index 54%
rename from spec/jasmine.json
rename to spec/support/jasmine.json
index eff6928..a8a016a 100644
--- a/spec/jasmine.json
+++ b/spec/support/jasmine.json
@@ -1,12 +1,8 @@
 {
     "spec_dir": "spec",
-    "spec_files": [
-        "**/*[sS]pec.js"
-    ],
     "helpers": [
         "helpers.js",
         "helper.js"
     ],
-    "stopSpecOnExpectationFailure": false,
     "random": false
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org