diff options
-rw-r--r-- | .gitlab-ci.yml | 51 | ||||
-rw-r--r-- | lib/tasks/spec.rake | 2 | ||||
-rw-r--r-- | spec/features/issues/filter_by_milestone_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/merge_requests/filter_by_milestone_spec.rb | 2 |
4 files changed, 4 insertions, 53 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ddf4e31204a..a54aaa26982 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,58 +10,9 @@ before_script: - bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}" - bundle exec rake db:create RAILS_ENV=test -spec:feature: +wtf: script: - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature tags: - ruby - mysql - -spec:api: - script: - - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api - tags: - - ruby - - mysql - -spec:other: - script: - - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other - tags: - - ruby - - mysql - -spinach:project: - script: - - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project - tags: - - ruby - - mysql - -spinach:other: - script: - - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other - tags: - - ruby - - mysql - -teaspoon: - script: - - RAILS_ENV=test bundle exec teaspoon - tags: - - ruby - - mysql - -rubocop: - script: - - bundle exec rubocop - tags: - - ruby - - mysql - -brakeman: - script: - - bundle exec rake brakeman - tags: - - ruby - - mysql diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake index 831746815d7..e3d469ad74c 100644 --- a/lib/tasks/spec.rake +++ b/lib/tasks/spec.rake @@ -14,7 +14,7 @@ namespace :spec do task :feature do cmds = [ %W(rake gitlab:setup), - %W(rspec spec --tag @feature) + %W(rspec spec --tag @feature -t focus) ] run_commands(cmds) end diff --git a/spec/features/issues/filter_by_milestone_spec.rb b/spec/features/issues/filter_by_milestone_spec.rb index 13368ccc39c..965ebdf14f8 100644 --- a/spec/features/issues/filter_by_milestone_spec.rb +++ b/spec/features/issues/filter_by_milestone_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Issue filtering by Milestone', feature: true do +feature 'Issue filtering by Milestone', feature: true, focus: true do include Select2Helper scenario 'filters by no Milestone', js: true do diff --git a/spec/features/merge_requests/filter_by_milestone_spec.rb b/spec/features/merge_requests/filter_by_milestone_spec.rb index 5958a3f3a0c..72950c6401f 100644 --- a/spec/features/merge_requests/filter_by_milestone_spec.rb +++ b/spec/features/merge_requests/filter_by_milestone_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Merge Request filtering by Milestone', feature: true do +feature 'Merge Request filtering by Milestone', feature: true, focus: true do include Select2Helper scenario 'filters by no Milestone', js: true do |