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

Splitted the Spinach tests to prevent time-outs

Merge pull request #7075 from jvanbaarsen/split-spinach-tests
Splitted the Spinach tests to prevent time-outs
Dmitriy Zaporozhets
2 parents 08c3c065 e84057da
Showing 28 changed files with 51 additions and 2 deletions Show diff stats
.travis.yml
features/admin/active_tab.feature
features/admin/broadcast_messages.feature
features/admin/groups.feature
features/admin/logs.feature
features/admin/projects.feature
features/admin/users.feature
features/dashboard/active_tab.feature
features/dashboard/archived_projects.feature
features/dashboard/dashboard.feature
features/dashboard/event_filters.feature
features/dashboard/help.feature
features/dashboard/issues.feature
features/dashboard/merge_requests.feature
features/dashboard/projects.feature
features/dashboard/search.feature
features/profile/active_tab.feature
features/profile/emails.feature
features/profile/group.feature
features/profile/notifications.feature
@@ -3,12 +3,14 @@ env:
   global:
     - TRAVIS=true
   matrix:
-    - TASK=spinach DB=mysql
+    - TASK=spinach_project DB=mysql
+    - TASK=spinach_other DB=mysql
     - TASK=spec:api DB=mysql
     - TASK=spec:feature DB=mysql
     - TASK=spec:other 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:feature DB=postgresql
     - TASK=spec:other DB=postgresql
+@admin
 Feature: Admin active tab
   Background:
     Given I sign in as an admin
+@admin
 Feature: Admin Broadcast Messages
   Background:
     Given I sign in as an admin
+@admin
 Feature: Admin Groups
   Background:
     Given I sign in as an admin
+@admin
 Feature: Admin Logs
   Background:
     Given I sign in as an admin
+@admin
 Feature: Admin Projects
   Background:
     Given I sign in as an admin
+@admin
 Feature: Admin Users
   Background:
     Given I sign in as an admin
+@dashboard
 Feature: Dashboard active tab
   Background:
     Given I sign in as a user
+@dashboard
 Feature: Dashboard with archived projects
   Background:
     Given I sign in as a user
+@dashboard
 Feature: Dashboard
   Background:
     Given I sign in as a user
+@dashboard
 Feature: Event filters
   Background:
     Given I sign in as a user
+@dashboard
 Feature: Help
   Background:
     Given I sign in as a user
+@dashboard
 Feature: Dashboard Issues
   Background:
     Given I sign in as a user
+@dashboard
 Feature: Dashboard Merge Requests
   Background:
     Given I sign in as a user
+@dashboard
 Feature: Dashboard projects
   Background:
     Given I sign in as a user
+@dashboard
 Feature: Dashboard Search
   Background:
     Given I sign in as a user
+@profile
 Feature: Profile active tab
   Background:
     Given I sign in as a user
+@profile
 Feature: Profile Emails
   Background:
     Given I sign in as a user
+@profile
 Feature: Profile Group
   Background:
     Given I sign in as "John Doe"
+@profile
 Feature: Profile Notifications
   Background:
     Given I sign in as a user
+@profile
 Feature: Profile
   Background:
     Given I sign in as a user
+@profile
 Feature: Profile SSH Keys
   Background:
     Given I sign in as a user
+@public
 Feature: Public Projects Feature
   Background:
     Given public project "Community"
+@public
 Feature: Public Projects Feature
   Background:
     Given group "TestGroup" has private project "Enterprise"
+@snippets
 Feature: Discover Snippets
   Background:
     Given I sign in as a user
+@snippets
 Feature: Snippets Feature
   Background:
     Given I sign in as a user
+@snippets
 Feature: User Snippets
   Background:
     Given I sign in as a user
@@ -6,7 +6,28 @@ task :spinach do
     %W(rake gitlab:setup),
     %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|
     system({'RAILS_ENV' => 'test', 'force' => 'yes'}, *cmd) or raise("#{cmd} failed!")
   end
...	...	@@ -3,12 +3,14 @@ env:
3	3	global:
4	4	- TRAVIS=true
5	5	matrix:
6		- - TASK=spinach DB=mysql
	6	+ - TASK=spinach_project DB=mysql
	7	+ - TASK=spinach_other DB=mysql
7	8	- TASK=spec:api DB=mysql
8	9	- TASK=spec:feature DB=mysql
9	10	- TASK=spec:other DB=mysql
10	11	- TASK=jasmine:ci DB=mysql
11		- - TASK=spinach DB=postgresql
	12	+ - TASK=spinach_project DB=postgresql
	13	+ - TASK=spinach_other DB=postgresql
12	14	- TASK=spec:api DB=postgresql
13	15	- TASK=spec:feature DB=postgresql
14	16	- TASK=spec:other DB=postgresql
...	...
	1	+@admin
1	2	Feature: Admin active tab
2	3	Background:
3	4	Given I sign in as an admin
...	...
	1	+@admin
1	2	Feature: Admin Broadcast Messages
2	3	Background:
3	4	Given I sign in as an admin
...	...
	1	+@admin
1	2	Feature: Admin Groups
2	3	Background:
3	4	Given I sign in as an admin
...	...
	1	+@admin
1	2	Feature: Admin Logs
2	3	Background:
3	4	Given I sign in as an admin
...	...
	1	+@admin
1	2	Feature: Admin Projects
2	3	Background:
3	4	Given I sign in as an admin
...	...
	1	+@admin
1	2	Feature: Admin Users
2	3	Background:
3	4	Given I sign in as an admin
...	...
	1	+@dashboard
1	2	Feature: Dashboard active tab
2	3	Background:
3	4	Given I sign in as a user
...	...
	1	+@dashboard
1	2	Feature: Dashboard with archived projects
2	3	Background:
3	4	Given I sign in as a user
...	...
	1	+@dashboard
1	2	Feature: Dashboard
2	3	Background:
3	4	Given I sign in as a user
...	...