diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-01 13:08:27 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-01 13:08:27 +0400 |
commit | a89af6ab8f6ca8118f942e2b2fdaeaf54f81cb31 (patch) | |
tree | cc5209a89c602814795cbe0108664f5d740a4103 | |
parent | 6cb4e488ab0b04a9f06042c53ba96301b4f21bbe (diff) | |
parent | 560c3280e00af228ed6a716b3fc9d18b311ccf6f (diff) |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r-- | features/support/env.rb | 2 | ||||
-rw-r--r-- | lib/tasks/test.rake | 2 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index 4b76faab564..67660777842 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -4,7 +4,7 @@ end if ENV['COVERALLS'] require 'coveralls' - Coveralls.wear_merged!('rails') + Coveralls.wear_merged! end ENV['RAILS_ENV'] = 'test' diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake index c868e1c4314..583f4a876da 100644 --- a/lib/tasks/test.rake +++ b/lib/tasks/test.rake @@ -9,5 +9,5 @@ unless Rails.env.production? require 'coveralls/rake/task' Coveralls::RakeTask.new desc "GITLAB | Run all tests on CI with simplecov" - task :test_ci => [:spec, :spinach, 'coveralls:push'] + task :test_ci => [:spinach, :spec, 'coveralls:push'] end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 60322b67a79..773de6628b1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,7 +4,7 @@ end if ENV['COVERALLS'] require 'coveralls' - Coveralls.wear_merged!('rails') + Coveralls.wear_merged! end ENV["RAILS_ENV"] ||= 'test' |