Skip to content

Commit

Permalink
Fix travis build.
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Perez committed Mar 26, 2016
1 parent b268f24 commit fc5c253
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
14 changes: 11 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

0 comments on commit fc5c253

Please sign in to comment.