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

Splitted the Spinach tests to prevent time-outs

.travis.yml

@@ -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

features/admin/active_tab.feature

+@admin
 Feature: Admin active tab
   Background:
     Given I sign in as an admin

features/admin/broadcast_messages.feature

+@admin
 Feature: Admin Broadcast Messages
   Background:
     Given I sign in as an admin

features/admin/groups.feature

+@admin
 Feature: Admin Groups
   Background:
     Given I sign in as an admin

features/admin/logs.feature

+@admin
 Feature: Admin Logs
   Background:
     Given I sign in as an admin

features/admin/projects.feature

+@admin
 Feature: Admin Projects
   Background:
     Given I sign in as an admin

features/admin/users.feature

+@admin
 Feature: Admin Users
   Background:
     Given I sign in as an admin

features/dashboard/active_tab.feature

+@dashboard
 Feature: Dashboard active tab
   Background:
     Given I sign in as a user

features/dashboard/archived_projects.feature

+@dashboard
 Feature: Dashboard with archived projects
   Background:
     Given I sign in as a user

features/dashboard/dashboard.feature

+@dashboard
 Feature: Dashboard
   Background:
     Given I sign in as a user

features/dashboard/event_filters.feature

+@dashboard
 Feature: Event filters
   Background:
     Given I sign in as a user

features/dashboard/help.feature

+@dashboard
 Feature: Help
   Background:
     Given I sign in as a user

features/dashboard/issues.feature

+@dashboard
 Feature: Dashboard Issues
   Background:
     Given I sign in as a user

features/dashboard/merge_requests.feature

+@dashboard
 Feature: Dashboard Merge Requests
   Background:
     Given I sign in as a user

features/dashboard/projects.feature

+@dashboard
 Feature: Dashboard projects
   Background:
     Given I sign in as a user

features/dashboard/search.feature

+@dashboard
 Feature: Dashboard Search
   Background:
     Given I sign in as a user

features/profile/active_tab.feature

+@profile
 Feature: Profile active tab
   Background:
     Given I sign in as a user

features/profile/emails.feature

+@profile
 Feature: Profile Emails
   Background:
     Given I sign in as a user

features/profile/group.feature

+@profile
 Feature: Profile Group
   Background:
     Given I sign in as "John Doe"

features/profile/notifications.feature

+@profile
 Feature: Profile Notifications
   Background:
     Given I sign in as a user

features/profile/profile.feature

+@profile
 Feature: Profile
   Background:
     Given I sign in as a user

features/profile/ssh_keys.feature

+@profile
 Feature: Profile SSH Keys
   Background:
     Given I sign in as a user

features/public/projects.feature

+@public
 Feature: Public Projects Feature
   Background:
     Given public project "Community"

features/public/public_groups.feature

+@public
 Feature: Public Projects Feature
   Background:
     Given group "TestGroup" has private project "Enterprise"

features/snippets/discover.feature

+@snippets
 Feature: Discover Snippets
   Background:
     Given I sign in as a user

features/snippets/snippets.feature

+@snippets
 Feature: Snippets Feature
   Background:
     Given I sign in as a user

features/snippets/user.feature

+@snippets
 Feature: User Snippets
   Background:
     Given I sign in as a user

lib/tasks/spinach.rake

@@ -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