Commit db779388 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #7075 from jvanbaarsen/split-spinach-tests

Splitted the Spinach tests to prevent time-outs
parents 08c3c065 e84057da
...@@ -3,12 +3,14 @@ env: ...@@ -3,12 +3,14 @@ env:
global: global:
- TRAVIS=true - TRAVIS=true
matrix: matrix:
- TASK=spinach DB=mysql - TASK=spinach_project DB=mysql
- TASK=spinach_other DB=mysql
- TASK=spec:api DB=mysql - TASK=spec:api DB=mysql
- TASK=spec:feature DB=mysql - TASK=spec:feature DB=mysql
- TASK=spec:other DB=mysql - TASK=spec:other DB=mysql
- TASK=jasmine:ci DB=mysql - TASK=jasmine:ci DB=mysql
- TASK=spinach DB=postgresql - TASK=spinach_project DB=postgresql
- TASK=spinach_other DB=postgresql
- TASK=spec:api DB=postgresql - TASK=spec:api DB=postgresql
- TASK=spec:feature DB=postgresql - TASK=spec:feature DB=postgresql
- TASK=spec:other DB=postgresql - TASK=spec:other DB=postgresql
......
@admin
Feature: Admin active tab Feature: Admin active tab
Background: Background:
Given I sign in as an admin Given I sign in as an admin
......
@admin
Feature: Admin Broadcast Messages Feature: Admin Broadcast Messages
Background: Background:
Given I sign in as an admin Given I sign in as an admin
......
@admin
Feature: Admin Groups Feature: Admin Groups
Background: Background:
Given I sign in as an admin Given I sign in as an admin
......
@admin
Feature: Admin Logs Feature: Admin Logs
Background: Background:
Given I sign in as an admin Given I sign in as an admin
......
@admin
Feature: Admin Projects Feature: Admin Projects
Background: Background:
Given I sign in as an admin Given I sign in as an admin
......
@admin
Feature: Admin Users Feature: Admin Users
Background: Background:
Given I sign in as an admin Given I sign in as an admin
......
@dashboard
Feature: Dashboard active tab Feature: Dashboard active tab
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@dashboard
Feature: Dashboard with archived projects Feature: Dashboard with archived projects
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@dashboard
Feature: Dashboard Feature: Dashboard
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@dashboard
Feature: Event filters Feature: Event filters
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@dashboard
Feature: Help Feature: Help
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@dashboard
Feature: Dashboard Issues Feature: Dashboard Issues
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@dashboard
Feature: Dashboard Merge Requests Feature: Dashboard Merge Requests
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@dashboard
Feature: Dashboard projects Feature: Dashboard projects
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@dashboard
Feature: Dashboard Search Feature: Dashboard Search
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@profile
Feature: Profile active tab Feature: Profile active tab
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@profile
Feature: Profile Emails Feature: Profile Emails
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@profile
Feature: Profile Group Feature: Profile Group
Background: Background:
Given I sign in as "John Doe" Given I sign in as "John Doe"
......
@profile
Feature: Profile Notifications Feature: Profile Notifications
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@profile
Feature: Profile Feature: Profile
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@profile
Feature: Profile SSH Keys Feature: Profile SSH Keys
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@public
Feature: Public Projects Feature Feature: Public Projects Feature
Background: Background:
Given public project "Community" Given public project "Community"
......
@public
Feature: Public Projects Feature Feature: Public Projects Feature
Background: Background:
Given group "TestGroup" has private project "Enterprise" Given group "TestGroup" has private project "Enterprise"
......
@snippets
Feature: Discover Snippets Feature: Discover Snippets
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@snippets
Feature: Snippets Feature Feature: Snippets Feature
Background: Background:
Given I sign in as a user Given I sign in as a user
......
@snippets
Feature: User Snippets Feature: User Snippets
Background: Background:
Given I sign in as a user Given I sign in as a user
......
...@@ -6,7 +6,28 @@ task :spinach do ...@@ -6,7 +6,28 @@ task :spinach do
%W(rake gitlab:setup), %W(rake gitlab:setup),
%W(spinach), %W(spinach),
] ]
run_commands(cmds)
end
desc "GITLAB | Run project spinach features"
task :spinach_project do
cmds = [
%W(rake gitlab:setup),
%W(spinach --tags ~@admin,~@dashboard,~@profile,~@public,~@snippets),
]
run_commands(cmds)
end
desc "GITLAB | Run other spinach features"
task :spinach_other do
cmds = [
%W(rake gitlab:setup),
%W(spinach --tags @admin,@dashboard,@profile,@public,@snippets),
]
run_commands(cmds)
end
def run_commands(cmds)
cmds.each do |cmd| cmds.each do |cmd|
system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!") system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment