diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-28 11:41:21 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-28 11:41:21 +0100 |
| commit | 1e9c5be33d5a7a447168c2e293191e49f8231d21 (patch) | |
| tree | e7decd8d39a1eac3bdade5718883b86fd73004f5 | |
| parent | ef2c176eef2d2ba242400fe35a013122453bc0c5 (diff) | |
| parent | e37455493b3db5f89e734ae840bd65b71ee46b6e (diff) | |
| download | nextcloud-server-1e9c5be33d5a7a447168c2e293191e49f8231d21.tar.gz nextcloud-server-1e9c5be33d5a7a447168c2e293191e49f8231d21.zip | |
Merge pull request #7703 from rnveach/jstest
Fixing issues found with running 'autotest-js' locally
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | build/package.json | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index e61ec6f0359..b24edc91282 100644 --- a/.gitignore +++ b/.gitignore @@ -86,6 +86,11 @@ nbproject # Node Modules /build/node_modules/ +# nodejs +/build/lib/ +/npm-debug.log + + # Tests - auto-generated files /data-autotest /tests/coverage* diff --git a/build/package.json b/build/package.json index c9ed7b96c6c..0c395839cf9 100644 --- a/build/package.json +++ b/build/package.json @@ -14,7 +14,9 @@ "karma": "*", "karma-jasmine": "*", "karma-junit-reporter": "*", - "karma-coverage": "*" + "karma-coverage": "*", + "karma-phantomjs-launcher": "*", + "phantomjs": "*" }, "engine": "node >= 0.8" } |