diff options
author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-25 22:08:45 -0500 |
---|---|---|
committer | Rubén Dávila <rdavila84@gmail.com> | 2016-03-02 12:51:29 -0500 |
commit | b41a274b62804d93e1dec57d8886d86602274dac (patch) | |
tree | f051159d3a56be282c05dd25cb03b5ec4ff07b7f /features | |
parent | 0b86b46a2c0eeaa397d2dccb49bf51d096ac12c6 (diff) | |
download | gitlab-ce-b41a274b62804d93e1dec57d8886d86602274dac.tar.gz |
Don't list merge requests from archived projects in Group view.
Diffstat (limited to 'features')
-rw-r--r-- | features/groups.feature | 6 | ||||
-rw-r--r-- | features/steps/groups.rb | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/features/groups.feature b/features/groups.feature index 4f9c28f813c..a60c3860b83 100644 --- a/features/groups.feature +++ b/features/groups.feature @@ -33,6 +33,12 @@ Feature: Groups When I visit group "Owned" merge requests page Then I should see merge requests from group "Owned" assigned to me + Scenario: I should not see merge requests from archived project in "Owned" group merge requests list + Given Group "Owned" has archived project + And the archived project have some merge_requests + When I visit group "Owned" merge requests page + Then I should not see merge requests from the archived project + Scenario: I should see edit group "Owned" page When I visit group "Owned" settings page And I change group "Owned" name to "new-name" diff --git a/features/steps/groups.rb b/features/steps/groups.rb index b0ec402531b..7a6ae15ffa5 100644 --- a/features/steps/groups.rb +++ b/features/steps/groups.rb @@ -50,6 +50,12 @@ class Spinach::Features::Groups < Spinach::FeatureSteps end end + step 'I should not see merge requests from the archived project' do + @archived_project.merge_requests.each do |mr| + expect(page).not_to have_content mr.title + end + end + step 'I should see merge requests from group "Owned" assigned to me' do assigned_to_me(:merge_requests).each do |issue| expect(page).to have_content issue.title[0..80] @@ -137,6 +143,14 @@ class Spinach::Features::Groups < Spinach::FeatureSteps author: current_user end + step 'the archived project have some merge requests' do + create :merge_request, + source_project: @archived_project, + target_project: @archived_project, + assignee: current_user, + author: current_user + end + private def assigned_to_me(key) |