summaryrefslogtreecommitdiff
path: root/lib/tasks/test.rake
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 15:17:11 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 15:17:11 +0000
commitb902a9b83d71738c8b5fc0c1c461119e56100b07 (patch)
tree0e92793ca2ef7eea73dce5f7fdc7427d6a54d608 /lib/tasks/test.rake
parent541f7675f9a72a7156811ccc6cd58171b7583934 (diff)
parentb8f12d1917d2befe17cf8e8f47fb70a1bb6a99ff (diff)
downloadgitlab-ce-b902a9b83d71738c8b5fc0c1c461119e56100b07.tar.gz
Merge branch 'split-tests' into 'master'
Split rspec and spinach tests in parallel For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386 See merge request !874
Diffstat (limited to 'lib/tasks/test.rake')
-rw-r--r--lib/tasks/test.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index a39d9649876..b9f9c72c91f 100644
--- a/lib/tasks/test.rake
+++ b/lib/tasks/test.rake
@@ -1,6 +1,6 @@
Rake::Task["test"].clear
-desc "GITLAB | Run all tests"
+desc "GitLab | Run all tests"
task :test do
Rake::Task["gitlab:test"].invoke
end
@@ -8,6 +8,6 @@ end
unless Rails.env.production?
require 'coveralls/rake/task'
Coveralls::RakeTask.new
- desc "GITLAB | Run all tests on CI with simplecov"
+ desc "GitLab | Run all tests on CI with simplecov"
task :test_ci => [:rubocop, :brakeman, 'jasmine:ci', :spinach, :spec, 'coveralls:push']
end