diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-01 11:43:16 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-01 11:43:16 +0300 |
| commit | 522d754dfee9673befc7e6dc93c8a080eba7ae66 (patch) | |
| tree | cbe61eb0dcf5305c2327ccbe2761afe8b45bdc46 | |
| parent | 3dde6bb3fa74238df0e1a2bbf4077852a9fd0bdb (diff) | |
| download | gitlab-ce-522d754dfee9673befc7e6dc93c8a080eba7ae66.tar.gz | |
Try wear_merged! without argument
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -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' |