diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-03 09:53:06 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-03 09:53:06 +0000 |
commit | 7e710acc1c72de7d11ad393ee3e111e250e0cb66 (patch) | |
tree | 46e4225a7932d5866a76b75ae02f116193450de2 /features | |
parent | 1fa7671f44291f78131c0fa31f6d1ffcb3ff6bbc (diff) | |
parent | 7dd2e37a9d5c2c6acc45bf636432154ed0d73164 (diff) | |
download | gitlab-ce-7e710acc1c72de7d11ad393ee3e111e250e0cb66.tar.gz |
Merge branch 'issue_4095' into 'master'
Don't show Issues/MRs from archived projects in Groups view
Fixes #4095
See merge request !2980
Diffstat (limited to 'features')
-rw-r--r-- | features/groups.feature | 12 | ||||
-rw-r--r-- | features/steps/groups.rb | 29 |
2 files changed, 40 insertions, 1 deletions
diff --git a/features/groups.feature b/features/groups.feature index 55fffb012ae..a60c3860b83 100644 --- a/features/groups.feature +++ b/features/groups.feature @@ -22,11 +22,23 @@ Feature: Groups When I visit group "Owned" issues page Then I should see issues from group "Owned" assigned to me + Scenario: I should not see issues from archived project in "Owned" group issues list + Given Group "Owned" has archived project + And the archived project have some issues + When I visit group "Owned" issues page + Then I should not see issues from the archived project + Scenario: I should see group "Owned" merge requests list Given project from group "Owned" has merge requests assigned to me 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 1e2a78a6029..7a6ae15ffa5 100644 --- a/features/steps/groups.rb +++ b/features/steps/groups.rb @@ -44,6 +44,18 @@ class Spinach::Features::Groups < Spinach::FeatureSteps end end + step 'I should not see issues from the archived project' do + @archived_project.issues.each do |issue| + expect(page).not_to have_content issue.title + 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] @@ -113,7 +125,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps step 'Group "Owned" has archived project' do group = Group.find_by(name: 'Owned') - create(:project, namespace: group, archived: true, path: "archived-project") + @archived_project = create(:project, namespace: group, archived: true, path: "archived-project") end step 'I should see "archived" label' do @@ -124,6 +136,21 @@ class Spinach::Features::Groups < Spinach::FeatureSteps visit group_path(-1) end + step 'the archived project have some issues' do + create :issue, + project: @archived_project, + assignee: current_user, + 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) |