diff options
| -rw-r--r-- | lib/tasks/gitlab/test.rake | 19 | ||||
| -rw-r--r-- | spec/javascripts/support/jasmine_helper.rb | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/lib/tasks/gitlab/test.rake b/lib/tasks/gitlab/test.rake index 38fa8b1a208..011748c9711 100644 --- a/lib/tasks/gitlab/test.rake +++ b/lib/tasks/gitlab/test.rake @@ -1,11 +1,18 @@ namespace :gitlab do desc "GITLAB | Run all tests" task :test do - Rails.env = "test" - Rake::Task["db:setup"].invoke - Rake::Task["db:seed_fu"].invoke - Rake::Task["spinach"].invoke - Rake::Task["spec"].invoke - Rake::Task["jasmince:ci"].invoke + cmds = [ + "rake db:setup", + "rake db:seed_fu", + "rake spinach", + "rake spec", + "rake jasmine:ci" + ] + + cmds.each do |cmd| + system(cmd + " RAILS_ENV=test") + + raise "#{cmd} failed!" unless $?.exitstatus.zero? + end end end diff --git a/spec/javascripts/support/jasmine_helper.rb b/spec/javascripts/support/jasmine_helper.rb index 13e55023b4c..34b418a9ca3 100644 --- a/spec/javascripts/support/jasmine_helper.rb +++ b/spec/javascripts/support/jasmine_helper.rb @@ -1,3 +1,5 @@ +WebMock.allow_net_connect! + Jasmine.configure do |config| config.browser = :phantomjs end |