Skip to content

Commit

Permalink
Tweaks for continuous integration.
Browse files Browse the repository at this point in the history
- Setup database before server side tests.
- Fix rake test_all task.
  • Loading branch information
icarito committed Jun 14, 2016
1 parent bf812ae commit 87e4dd2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ install:
- docker-compose build
- docker-compose run web bundle exec bower install --allow-root
- docker-compose run web bundle exec rake assets:precompile --trace
- docker-compose run web bundle exec rake db:setup

script:
- docker-compose run web bundle exec rake test_all
15 changes: 5 additions & 10 deletions lib/tasks/test_all.rake
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
desc 'Combined tests task'
task :test_all do |t|
begin
Rake::Task["test"].invoke
rescue SystemExit => e
ts = e.status
next
ensure
Rake::Task["jasmine:ci"].invoke
end
return ts
task :test_all do
begin
Rake::Task["test"].invoke
Rake::Task["jasmine:ci"].invoke
end
end

0 comments on commit 87e4dd2

Please sign in to comment.