Try another variation of the travis config!

compatriot · Nov 4, 2015 · 71dfce5 · 71dfce5
1 parent db52891
commit 71dfce5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,11 @@
 before_script:
+  - "mkdir -p /tmp/bin"
+  - "cd /tmp/bin && wget http://chromium.googlecode.com/files/chromedriver_linux32_16.0.902.0.zip && unzip chromedriver_linux32_16.0.902.0.zip"
+  - "export PATH=/tmp/bin:$PATH "
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
   - sleep 3 # give xvfb some time to start
-script: "bundle exec rake travis"
+script: "bundle exec rake test && bundle exec cucumber features"
 rvm:
   - 2.1.7
 sudo: false

diff --git a/Rakefile b/Rakefile
@@ -14,13 +14,3 @@ desc "Run tests"
 task :spec do
   task("test").execute
 end
-
-task :travis do
-  puts "Grabbing chromedriver..."
-  mkdir_p "/tmp/bin"
-  system "cd /tmp/bin && wget http://chromium.googlecode.com/files/chromedriver_linux32_16.0.902.0.zip && unzip chromedriver_linux32_16.0.902.0.zip"
-
-  puts "Starting to run tests..."
-  system("export PATH=/tmp/bin:$PATH && export DISPLAY=:99.0 && bundle exec rake test && bundle exec cucumber features")
-  raise "`rake test` failed!" unless $?.exitstatus == 0
-end