diff options
author | James Lopez <james@jameslopez.es> | 2016-02-17 17:53:24 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-02-17 17:53:24 +0100 |
commit | dd68d100e659d315ce6b21dac914beeda0fd1d4c (patch) | |
tree | 0742729ee62b1396172f2b6f6da02c286376453f /features/project | |
parent | b1731adf4385b982348746564e7365b7b70e50fb (diff) | |
parent | a4ffdf922da488b2f04e81f5fc29243413e42cd3 (diff) | |
download | gitlab-ce-dd68d100e659d315ce6b21dac914beeda0fd1d4c.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-forks-page
Diffstat (limited to 'features/project')
-rw-r--r-- | features/project/issues/issues.feature | 9 | ||||
-rw-r--r-- | features/project/merge_requests.feature | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index 0b3d03aa2a5..ca2399d85a9 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -25,9 +25,16 @@ Feature: Project Issues Scenario: I visit issue page Given I click link "Release 0.4" Then I should see issue "Release 0.4" + And I should see "1 of 2" in the sidebar + + Scenario: I navigate between issues + Given I click link "Release 0.4" + Then I click link "Next" in the sidebar + Then I should see issue "Tweet control" + And I should see "2 of 2" in the sidebar @javascript - Scenario: I visit issue page + Scenario: I filter by author Given I add a user to project "Shop" And I click "author" dropdown Then I see current user as the first user diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index ca1ee6b3c2b..5995e787961 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -39,6 +39,7 @@ Feature: Project Merge Requests Scenario: I visit merge request page Given I click link "Bug NS-04" Then I should see merge request "Bug NS-04" + And I should see "1 of 1" in the sidebar Scenario: I close merge request page Given I click link "Bug NS-04" |