diff --git a/.travis.yml b/.travis.yml index f0d00d1..17a1306 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,6 @@ language: node_js node_js: stable firefox: "39.0" before_script: + - "npm install -g bower" - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" diff --git a/Makefile b/Makefile index a09bc71..cf4dff6 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,19 @@ -SELENIUM_JAR = tmp/selenium-server-standalone.52.0.jar +SELENIUM_JAR = tmp/selenium-server-standalone.52.0.jar +BOWER_COMPONENTS = tests/integration/pages/components +NODE_MODULES = node_modules all: test dist_build $(SELENIUM_JAR): wget http://goo.gl/qTy1IB -O $(SELENIUM_JAR) -prepare: $(SELENIUM_JAR) +prepare: $(SELENIUM_JAR) $(BOWER_COMPONENTS) $(NODE_MODULES) + +$(NODE_MODULES): + npm install + +$(BOWER_COMPONENTS): + bower install unit: ./node_modules/.bin/gulp test @@ -32,6 +40,6 @@ run_integration: normal_build integration: selenium run_integration kill_selenium -test: lint unit integration +test: prepare lint unit integration .PHONY: test unit prepare