Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-10 00:21:56 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-10 00:21:56 +0300
commitd7044c5ccf4df625bf90cca9b5197ffe9da99076 (patch)
treeb62aebada05f078b909e2c3ac69c1931cbf7975c /features/project
parent8f6892500a0ceefb30f762c7627f0472f51b203b (diff)
parent2c61e3c057af02068bfb57f1c3f921d9f0c87b1d (diff)
Merge branch 'move-network'
Diffstat (limited to 'features/project')
-rw-r--r--features/project/active_tab.feature11
-rw-r--r--features/project/shortcuts.feature3
2 files changed, 8 insertions, 6 deletions
diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 8661ea98c20..2fd097d100b 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -20,11 +20,6 @@ Feature: Project Active Tab
Then the active main tab should be Commits
And no other main tabs should be active
- Scenario: On Project Network
- Given I visit my project's network page
- Then the active main tab should be Network
- And no other main tabs should be active
-
Scenario: On Project Issues
Given I visit my project's issues page
Then the active main tab should be Issues
@@ -83,6 +78,12 @@ Feature: Project Active Tab
And no other sub tabs should be active
And the active main tab should be Commits
+ Scenario: On Project Commits/Network
+ Given I visit my project's network page
+ Then the active sub tab should be Network
+ And no other sub tabs should be active
+ And the active main tab should be Commits
+
Scenario: On Project Commits/Compare
Given I visit my project's commits page
And I click the "Compare" tab
diff --git a/features/project/shortcuts.feature b/features/project/shortcuts.feature
index 0f71c32380b..10e7c234610 100644
--- a/features/project/shortcuts.feature
+++ b/features/project/shortcuts.feature
@@ -19,7 +19,8 @@ Feature: Project Shortcuts
@javascript
Scenario: Navigate to network tab
Given I press "g" and "n"
- Then the active main tab should be Network
+ Then the active sub tab should be Network
+ And the active main tab should be Commits
@javascript
Scenario: Navigate to graphs tab