summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-02 20:08:23 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-02 20:08:23 -0800
commit84a5a548a5e1377f34b7989fc546eaedf86c3510 (patch)
tree3ae050640124a85f0c65f4119facc949e010a159
parentafb8ecc3d1569520379a2d0613137c46d44a12ce (diff)
downloadgitlab-ce-84a5a548a5e1377f34b7989fc546eaedf86c3510.tar.gz
Add rubocop to rake test and rake test_ci
-rw-r--r--lib/tasks/gitlab/test.rake1
-rw-r--r--lib/tasks/rubocop.rake2
-rw-r--r--lib/tasks/test.rake2
3 files changed, 4 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/test.rake b/lib/tasks/gitlab/test.rake
index c01b00bd1c0..b4076f8238f 100644
--- a/lib/tasks/gitlab/test.rake
+++ b/lib/tasks/gitlab/test.rake
@@ -2,6 +2,7 @@ namespace :gitlab do
desc "GITLAB | Run all tests"
task :test do
cmds = [
+ %W(rake rubocop),
%W(rake spinach),
%W(rake spec),
%W(rake jasmine:ci)
diff --git a/lib/tasks/rubocop.rake b/lib/tasks/rubocop.rake
new file mode 100644
index 00000000000..c28e529f86d
--- /dev/null
+++ b/lib/tasks/rubocop.rake
@@ -0,0 +1,2 @@
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake
index 583f4a876da..3ea9290a814 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 => [:spinach, :spec, 'coveralls:push']
+ task :test_ci => [:rubocop, :spinach, :spec, 'coveralls:push']
end