Merge pull request #713 from owncloud/move-tests-js

Move tests/Unit/js to tests/js
owncloud · Mar 5, 2019 · 136afa9 · 136afa9
2 parents 062988c + d68d5ac
commit 136afa9
Show file tree

Hide file tree

Showing 8 changed files with 2,302 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -58,8 +58,7 @@ node_modules
 vendor-bin/**/composer.lock
 vendor/
 /build/
-tests/Unit/js/package-lock.json
-
+tests/js/package-lock.json
 
 # php-cs-fixer
 .php_cs.cache
diff --git a/Makefile b/Makefile
@@ -15,6 +15,7 @@ endif
 
 NODE_PREFIX=$(shell pwd)
 BOWER=$(NODE_PREFIX)/node_modules/bower/bin/bower
+KARMA=$(NODE_PREFIX)/node_modules/.bin/karma
 JSDOC=$(NODE_PREFIX)/node_modules/.bin/jsdoc
 
 app_name=$(notdir $(CURDIR))
@@ -25,7 +26,7 @@ build_dir=$(CURDIR)/build
 dist_dir=$(build_dir)/dist
 
 # dependency folders (leave empty if not required)
-nodejs_deps=
+nodejs_deps=node_modules
 bower_deps=
 
 # composer
@@ -109,6 +110,16 @@ endif
 	tar -czf $(dist_dir)/$(app_name).tar.gz -C $(dist_dir) $(app_name)
 	tar -cjf $(dist_dir)/$(app_name).tar.bz2 -C $(dist_dir) $(app_name)
 
+$(nodejs_deps): package.json yarn.lock
+	yarn install
+	touch $@
+
+$(KARMA): $(nodejs_deps)
+
+##------------
+## Tests
+##------------
+
 .PHONY: test-php-unit
 test-php-unit:             ## Run php unit tests
 test-php-unit: vendor/bin/phpunit
@@ -120,9 +131,9 @@ test-php-unit-dbg: vendor/bin/phpunit
 	$(PHPUNITDBG) --configuration ./phpunit.xml --testsuite unit
 
 .PHONY: test-js
-test-js:
-	cd tests/Unit/js && npm install --deps
-	cd tests/Unit/js && node_modules/karma/bin/karma start karma.config.js --single-run
+test-js: ## Run JavaScript tests
+test-js: $(nodejs_deps)
+	$(KARMA) start tests/js/karma.config.js --single-run
 
 .PHONY: test-php-style
 test-php-style:            ## Run php-cs-fixer and check owncloud code-style

diff --git a/tests/Unit/js/package.json → package.json b/tests/Unit/js/package.json → package.json
diff --git a/tests/Unit/js/activitycollectionSpec.js → tests/js/activitycollectionSpec.js b/tests/Unit/js/activitycollectionSpec.js → tests/js/activitycollectionSpec.js
diff --git a/tests/Unit/js/activitytabviewSpec.js → tests/js/activitytabviewSpec.js b/tests/Unit/js/activitytabviewSpec.js → tests/js/activitytabviewSpec.js
diff --git a/tests/Unit/js/karma.config.js → tests/js/karma.config.js b/tests/Unit/js/karma.config.js → tests/js/karma.config.js
@@ -36,13 +36,13 @@ module.exports = function(config) {
 	];
 
 	var testFiles = [
-		'tests/Unit/js/*.js'
+		'tests/js/*.js'
 	];
 
-	var basePath = '../../../';
+	var basePath = '../../';
 	var ownCloudPath = '../../';
 
-	var coreModules = require(ownCloudPath + '../../../core/js/core.json');
+	var coreModules = require(ownCloudPath + '../../core/js/core.json');
 	var coreLibs = [
 		ownCloudPath + 'core/js/tests/specHelper.js'
 	];

diff --git a/tests/Unit/js/scriptSpec.js → tests/js/scriptSpec.js b/tests/Unit/js/scriptSpec.js → tests/js/scriptSpec.js