aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-06-13 14:18:38 +0200
committerGitHub <noreply@github.com>2016-06-13 14:18:38 +0200
commit0b2940ecb5cd600df4d4867bbc052d8c3926075d (patch)
tree2a7aadd63390143bac50908260865766b12cd64d
parent01f8434a754d3822cf0bed4ad473a9a7aec7d623 (diff)
parentc64c723027db9170121c0f7209548ee7f0505109 (diff)
downloadnextcloud-server-0b2940ecb5cd600df4d4867bbc052d8c3926075d.tar.gz
nextcloud-server-0b2940ecb5cd600df4d4867bbc052d8c3926075d.zip
Merge pull request #33 from nextcloud/LukasReschke-patch-1
Add JS unit test execution
-rw-r--r--.drone.yml6
-rw-r--r--build/package.json2
2 files changed, 6 insertions, 2 deletions
diff --git a/.drone.yml b/.drone.yml
index bf993b99a70..bfd173c1347 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,5 +1,9 @@
build:
- backend:
+ jsunit:
+ image: morrisjobke/nextcloud-ci-jsunit:1.0.2
+ commands:
+ - ./autotest-js.sh
+ sqlite:
image: morrisjobke/nextcloud-ci-php7:1.0
commands:
- git submodule update --init
diff --git a/build/package.json b/build/package.json
index f5a637171ed..df26ba97785 100644
--- a/build/package.json
+++ b/build/package.json
@@ -16,7 +16,7 @@
"karma-junit-reporter": "*",
"karma-coverage": "*",
"karma-phantomjs-launcher": "*",
- "phantomjs": "*",
+ "phantomjs-prebuilt": "*",
"jasmine-core": "~2.3.4"
},
"engine": "node >= 0.8"