From 522d754dfee9673befc7e6dc93c8a080eba7ae66 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 1 Oct 2014 11:43:16 +0300
Subject: [PATCH] Try wear_merged! without argument
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
features/support/env.rb | 2 +-
lib/tasks/test.rake | 2 +-
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'
--
GitLab