diff options
| author | Phil Hughes <me@iamphill.com> | 2017-03-07 11:40:27 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-03-07 11:40:27 +0000 |
| commit | 12fe94c388ae9ec73e34852ef7d7b90f2f347df7 (patch) | |
| tree | 5182f89deddf9428b1d6ca70720f8ac8ee2b940a /features/project | |
| parent | 002d3a3e72de57c76a077ed5d09e857243c7effd (diff) | |
| parent | ac9d792946deb17a402646e5481087e4d92f88ad (diff) | |
| download | gitlab-ce-12fe94c388ae9ec73e34852ef7d7b90f2f347df7.tar.gz | |
Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages
Diffstat (limited to 'features/project')
| -rw-r--r-- | features/project/active_tab.feature | 23 | ||||
| -rw-r--r-- | features/project/shortcuts.feature | 15 |
2 files changed, 34 insertions, 4 deletions
diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature index 4bdaa6266c3..ba04b03c3cc 100644 --- a/features/project/active_tab.feature +++ b/features/project/active_tab.feature @@ -7,8 +7,9 @@ Feature: Project Active Tab Scenario: On Project Home Given I visit my project's home page - Then the active main tab should be Home - And no other main tabs should be active + Then the active sub tab should be Home + And no other sub tabs should be active + And the active main tab should be Project Scenario: On Project Repository Given I visit my project's files page @@ -34,9 +35,18 @@ Feature: Project Active Tab Scenario: On Project Home/Show Given I visit my project's home page - Then the active main tab should be Home + Then the active sub tab should be Home + And no other sub tabs should be active + And the active main tab should be Project And no other main tabs should be active + Scenario: On Project Home/Activity + Given I visit my project's home page + And I click the "Activity" tab + Then the active sub tab should be Activity + And no other sub tabs should be active + And the active main tab should be Project + # Sub Tabs: Settings Scenario: On Project Settings/Integrations @@ -93,6 +103,13 @@ Feature: Project Active Tab And no other sub tabs should be active And the active main tab should be Repository + Scenario: On Project Repository/Charts + Given I visit my project's commits page + And I click the "Charts" tab + Then the active sub tab should be Charts + And no other sub tabs should be active + And the active main tab should be Repository + Scenario: On Project Repository/Branches Given I visit my project's commits page And I click the "Branches" tab diff --git a/features/project/shortcuts.feature b/features/project/shortcuts.feature index 95de63ba21a..b47fca31ef2 100644 --- a/features/project/shortcuts.feature +++ b/features/project/shortcuts.feature @@ -25,6 +25,12 @@ Feature: Project Shortcuts And the active main tab should be Repository @javascript + Scenario: Navigate to repository charts tab + Given I press "g" and "g" + Then the active sub tab should be Charts + And the active main tab should be Repository + + @javascript Scenario: Navigate to issues tab Given I press "g" and "i" Then the active main tab should be Issues @@ -47,4 +53,11 @@ Feature: Project Shortcuts @javascript Scenario: Navigate to project home Given I press "g" and "p" - Then the active main tab should be Home + Then the active sub tab should be Home + And the active main tab should be Project + + @javascript + Scenario: Navigate to project feed + Given I press "g" and "e" + Then the active sub tab should be Activity + And the active main tab should be Project |