Преглед изворни кода

Compile frontend tests into web test directory and include module ES tests in karma

Alasdair Smith пре 8 година
родитељ
комит
96b1d8c812
2 измењених фајлова са 10 додато и 2 уклоњено
  1. 8 1
      services/web/Makefile.module
  2. 2 1
      services/web/karma.conf.js

+ 8 - 1
services/web/Makefile.module

@@ -8,6 +8,9 @@ APP_JS_FILES := $(subst coffee,js,$(APP_COFFEE_FILES))
 IDE_COFFEE_FILES := $(shell [ -e public/coffee/ide ] && find public/coffee/ide -name '*.coffee')
 IDE_JS_FILES := $(subst public/coffee/ide,../../public/js/ide/$(MODULE_NAME),$(IDE_COFFEE_FILES))
 IDE_JS_FILES := $(subst coffee,js,$(IDE_JS_FILES))
+IDE_TEST_COFFEE_FILES := $(shell [ -e test/unit_frontend/coffee ] && find test/unit_frontend/coffee -name '*.coffee')
+IDE_TEST_JS_FILES := $(subst test/unit_frontend/coffee/ide,../../test/unit_frontend/js/ide/$(MODULE_NAME),$(IDE_TEST_COFFEE_FILES))
+IDE_TEST_JS_FILES := $(subst coffee,js,$(IDE_TEST_JS_FILES))
 MAIN_COFFEE_FILES := $(shell [ -e public/coffee/main ] && find public/coffee/main -name '*.coffee')
 MAIN_JS_FILES := $(subst public/coffee/main,../../public/js/main/$(MODULE_NAME),$(MAIN_COFFEE_FILES))
 MAIN_JS_FILES := $(subst coffee,js,$(MAIN_JS_FILES))
@@ -26,6 +29,10 @@ test/acceptance/js/%.js: test/acceptance/coffee/%.coffee
 	@mkdir -p $(dir $@)
 	$(COFFEE) --compile --print $< > $@
 
+../../test/unit_frontend/js/ide/$(MODULE_NAME)/%.js: test/unit_frontend/coffee/ide/%.coffee
+	@mkdir -p $(dir $@)
+	$(COFFEE) --compile --print $< > $@
+
 ../../public/js/ide/$(MODULE_NAME)/%.js: public/coffee/ide/%.coffee
 	@mkdir -p $(dir $@)
 	$(COFFEE) --compile --print $< > $@
@@ -37,7 +44,7 @@ test/acceptance/js/%.js: test/acceptance/coffee/%.coffee
 index.js: index.coffee
 	$(COFFEE) --compile --print $< > $@
 
-compile: $(APP_JS_FILES) $(IDE_JS_FILES) $(MAIN_JS_FILES) index.js
+compile: $(APP_JS_FILES) $(IDE_JS_FILES) $(MAIN_JS_FILES) $(IDE_TEST_JS_FILES) index.js
 	@echo > /dev/null
 
 compile_full:

+ 2 - 1
services/web/karma.conf.js

@@ -25,7 +25,8 @@ module.exports = function (config) {
       { pattern: 'public/js/**/*.js', included: false },
       { pattern: 'test/unit_frontend/js/**/*.js', included: false },
       // Include ES test files
-      'test/unit_frontend/es/**/*.js'
+      'test/unit_frontend/es/**/*.js',
+      'modules/**/test/unit_frontend/es/**/*.js'
     ],
     middleware: ['fake-img'],
     preprocessors: {