summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-05 21:56:48 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-05 21:56:48 +0300
commitdb779388fee09b14ee591d9cb4981bdae3d23be9 (patch)
tree3155c3c218e373bddb6fb6463d730fa43d69d5ca /features
parent08c3c0659ca65d89c7998ce690b30a1d09b6df87 (diff)
parente84057da1bc0d96e7f24424f423a9491d99d5585 (diff)
downloadgitlab-ce-db779388fee09b14ee591d9cb4981bdae3d23be9.tar.gz
Merge pull request #7075 from jvanbaarsen/split-spinach-tests
Splitted the Spinach tests to prevent time-outs
Diffstat (limited to 'features')
-rw-r--r--features/admin/active_tab.feature1
-rw-r--r--features/admin/broadcast_messages.feature1
-rw-r--r--features/admin/groups.feature1
-rw-r--r--features/admin/logs.feature1
-rw-r--r--features/admin/projects.feature1
-rw-r--r--features/admin/users.feature1
-rw-r--r--features/dashboard/active_tab.feature1
-rw-r--r--features/dashboard/archived_projects.feature1
-rw-r--r--features/dashboard/dashboard.feature1
-rw-r--r--features/dashboard/event_filters.feature1
-rw-r--r--features/dashboard/help.feature1
-rw-r--r--features/dashboard/issues.feature1
-rw-r--r--features/dashboard/merge_requests.feature1
-rw-r--r--features/dashboard/projects.feature1
-rw-r--r--features/dashboard/search.feature1
-rw-r--r--features/profile/active_tab.feature1
-rw-r--r--features/profile/emails.feature1
-rw-r--r--features/profile/group.feature1
-rw-r--r--features/profile/notifications.feature1
-rw-r--r--features/profile/profile.feature1
-rw-r--r--features/profile/ssh_keys.feature1
-rw-r--r--features/public/projects.feature1
-rw-r--r--features/public/public_groups.feature1
-rw-r--r--features/snippets/discover.feature1
-rw-r--r--features/snippets/snippets.feature1
-rw-r--r--features/snippets/user.feature1
26 files changed, 26 insertions, 0 deletions
diff --git a/features/admin/active_tab.feature b/features/admin/active_tab.feature
index 15fcda45e40..b28e16f0d6a 100644
--- a/features/admin/active_tab.feature
+++ b/features/admin/active_tab.feature
@@ -1,3 +1,4 @@
+@admin
Feature: Admin active tab
Background:
Given I sign in as an admin
diff --git a/features/admin/broadcast_messages.feature b/features/admin/broadcast_messages.feature
index 5f16120b7cc..b2c3112320a 100644
--- a/features/admin/broadcast_messages.feature
+++ b/features/admin/broadcast_messages.feature
@@ -1,3 +1,4 @@
+@admin
Feature: Admin Broadcast Messages
Background:
Given I sign in as an admin
diff --git a/features/admin/groups.feature b/features/admin/groups.feature
index 352c1b3803f..1a465c1be55 100644
--- a/features/admin/groups.feature
+++ b/features/admin/groups.feature
@@ -1,3 +1,4 @@
+@admin
Feature: Admin Groups
Background:
Given I sign in as an admin
diff --git a/features/admin/logs.feature b/features/admin/logs.feature
index d07f0048080..ceb3bc34927 100644
--- a/features/admin/logs.feature
+++ b/features/admin/logs.feature
@@ -1,3 +1,4 @@
+@admin
Feature: Admin Logs
Background:
Given I sign in as an admin
diff --git a/features/admin/projects.feature b/features/admin/projects.feature
index 4a4ee1c11e0..fb07ccdb352 100644
--- a/features/admin/projects.feature
+++ b/features/admin/projects.feature
@@ -1,3 +1,4 @@
+@admin
Feature: Admin Projects
Background:
Given I sign in as an admin
diff --git a/features/admin/users.feature b/features/admin/users.feature
index ce9f32f50d9..ce31aafd290 100644
--- a/features/admin/users.feature
+++ b/features/admin/users.feature
@@ -1,3 +1,4 @@
+@admin
Feature: Admin Users
Background:
Given I sign in as an admin
diff --git a/features/dashboard/active_tab.feature b/features/dashboard/active_tab.feature
index 3e1cf5aa0ca..22dfa2f7840 100644
--- a/features/dashboard/active_tab.feature
+++ b/features/dashboard/active_tab.feature
@@ -1,3 +1,4 @@
+@dashboard
Feature: Dashboard active tab
Background:
Given I sign in as a user
diff --git a/features/dashboard/archived_projects.feature b/features/dashboard/archived_projects.feature
index 399c9b53d81..e23238d225c 100644
--- a/features/dashboard/archived_projects.feature
+++ b/features/dashboard/archived_projects.feature
@@ -1,3 +1,4 @@
+@dashboard
Feature: Dashboard with archived projects
Background:
Given I sign in as a user
diff --git a/features/dashboard/dashboard.feature b/features/dashboard/dashboard.feature
index e249f392de7..bebaa78e46c 100644
--- a/features/dashboard/dashboard.feature
+++ b/features/dashboard/dashboard.feature
@@ -1,3 +1,4 @@
+@dashboard
Feature: Dashboard
Background:
Given I sign in as a user
diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature
index e0c6b84b008..41de0ae8317 100644
--- a/features/dashboard/event_filters.feature
+++ b/features/dashboard/event_filters.feature
@@ -1,3 +1,4 @@
+@dashboard
Feature: Event filters
Background:
Given I sign in as a user
diff --git a/features/dashboard/help.feature b/features/dashboard/help.feature
index 02ec688f804..56a0a860ab9 100644
--- a/features/dashboard/help.feature
+++ b/features/dashboard/help.feature
@@ -1,3 +1,4 @@
+@dashboard
Feature: Help
Background:
Given I sign in as a user
diff --git a/features/dashboard/issues.feature b/features/dashboard/issues.feature
index d316b2d9205..72627e43e05 100644
--- a/features/dashboard/issues.feature
+++ b/features/dashboard/issues.feature
@@ -1,3 +1,4 @@
+@dashboard
Feature: Dashboard Issues
Background:
Given I sign in as a user
diff --git a/features/dashboard/merge_requests.feature b/features/dashboard/merge_requests.feature
index de560300735..dcef1290e7e 100644
--- a/features/dashboard/merge_requests.feature
+++ b/features/dashboard/merge_requests.feature
@@ -1,3 +1,4 @@
+@dashboard
Feature: Dashboard Merge Requests
Background:
Given I sign in as a user
diff --git a/features/dashboard/projects.feature b/features/dashboard/projects.feature
index 7d8c129face..5214cfc28ef 100644
--- a/features/dashboard/projects.feature
+++ b/features/dashboard/projects.feature
@@ -1,3 +1,4 @@
+@dashboard
Feature: Dashboard projects
Background:
Given I sign in as a user
diff --git a/features/dashboard/search.feature b/features/dashboard/search.feature
index 91d870f46f3..24c45028697 100644
--- a/features/dashboard/search.feature
+++ b/features/dashboard/search.feature
@@ -1,3 +1,4 @@
+@dashboard
Feature: Dashboard Search
Background:
Given I sign in as a user
diff --git a/features/profile/active_tab.feature b/features/profile/active_tab.feature
index 475641a33ed..a99409d9fd7 100644
--- a/features/profile/active_tab.feature
+++ b/features/profile/active_tab.feature
@@ -1,3 +1,4 @@
+@profile
Feature: Profile active tab
Background:
Given I sign in as a user
diff --git a/features/profile/emails.feature b/features/profile/emails.feature
index 148fc766081..19ed949f6ae 100644
--- a/features/profile/emails.feature
+++ b/features/profile/emails.feature
@@ -1,3 +1,4 @@
+@profile
Feature: Profile Emails
Background:
Given I sign in as a user
diff --git a/features/profile/group.feature b/features/profile/group.feature
index 70b682e2913..e2fbfde77be 100644
--- a/features/profile/group.feature
+++ b/features/profile/group.feature
@@ -1,3 +1,4 @@
+@profile
Feature: Profile Group
Background:
Given I sign in as "John Doe"
diff --git a/features/profile/notifications.feature b/features/profile/notifications.feature
index e7937953c1b..55997d44dec 100644
--- a/features/profile/notifications.feature
+++ b/features/profile/notifications.feature
@@ -1,3 +1,4 @@
+@profile
Feature: Profile Notifications
Background:
Given I sign in as a user
diff --git a/features/profile/profile.feature b/features/profile/profile.feature
index 44bb190f624..d2125e013bc 100644
--- a/features/profile/profile.feature
+++ b/features/profile/profile.feature
@@ -1,3 +1,4 @@
+@profile
Feature: Profile
Background:
Given I sign in as a user
diff --git a/features/profile/ssh_keys.feature b/features/profile/ssh_keys.feature
index 018d124e412..581503fc5f9 100644
--- a/features/profile/ssh_keys.feature
+++ b/features/profile/ssh_keys.feature
@@ -1,3 +1,4 @@
+@profile
Feature: Profile SSH Keys
Background:
Given I sign in as a user
diff --git a/features/public/projects.feature b/features/public/projects.feature
index 57fe834b4bf..c7bb3b4f8ce 100644
--- a/features/public/projects.feature
+++ b/features/public/projects.feature
@@ -1,3 +1,4 @@
+@public
Feature: Public Projects Feature
Background:
Given public project "Community"
diff --git a/features/public/public_groups.feature b/features/public/public_groups.feature
index 7f1ec718e35..8bbda8cb6d4 100644
--- a/features/public/public_groups.feature
+++ b/features/public/public_groups.feature
@@ -1,3 +1,4 @@
+@public
Feature: Public Projects Feature
Background:
Given group "TestGroup" has private project "Enterprise"
diff --git a/features/snippets/discover.feature b/features/snippets/discover.feature
index d6fd2cd7808..f0b8d3a408a 100644
--- a/features/snippets/discover.feature
+++ b/features/snippets/discover.feature
@@ -1,3 +1,4 @@
+@snippets
Feature: Discover Snippets
Background:
Given I sign in as a user
diff --git a/features/snippets/snippets.feature b/features/snippets/snippets.feature
index 1119defa17d..3ee8720ddd5 100644
--- a/features/snippets/snippets.feature
+++ b/features/snippets/snippets.feature
@@ -1,3 +1,4 @@
+@snippets
Feature: Snippets Feature
Background:
Given I sign in as a user
diff --git a/features/snippets/user.feature b/features/snippets/user.feature
index 4c8a91501c4..d032a33686b 100644
--- a/features/snippets/user.feature
+++ b/features/snippets/user.feature
@@ -1,3 +1,4 @@
+@snippets
Feature: User Snippets
Background:
Given I sign in as a user