Skip to content

Commit

Permalink
Use new way to run travis ci rspec and cucumber
Browse files Browse the repository at this point in the history
  • Loading branch information
oivoodoo committed Aug 7, 2015
1 parent d31d71a commit cde91f3
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
8 changes: 7 additions & 1 deletion .travis.yml
@@ -1,4 +1,10 @@
language: ruby
rvm:
- "1.9.3"
- 1.9.3
- 2.0.0
- 2.2.1
- jruby-19mode
gemfile:
- Gemfile
script: time ./script/travis.sh

6 changes: 0 additions & 6 deletions Rakefile
@@ -1,7 +1 @@
require "bundler/gem_tasks"

task :default do
system 'cd spec/dummy/ && bundle exec rake db:setup && bundle exec rake db:test:prepare && cd ../../'
system 'bundle exec rspec && bundle exec cucumber'
end

3 changes: 1 addition & 2 deletions features/step_definitions/auth_steps.rb
Expand Up @@ -6,6 +6,5 @@
fill_in 'user[email]', :with => @user.email
fill_in 'user[password]', :with => 'password'

click_on 'Sign in'
click_on 'Log in'
end

9 changes: 9 additions & 0 deletions script/travis.sh
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

set -e

function red() {
echo -e "\e[00;31m$1\e[00m"
}

(bundle exec rspec && bundle exec cucumber) || { red "Failed specs"; exit 1; }

0 comments on commit cde91f3

Please sign in to comment.