diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/features/merge_requests | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/features/merge_requests')
-rw-r--r-- | spec/features/merge_requests/user_filters_by_milestones_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/merge_requests/user_lists_merge_requests_spec.rb | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/spec/features/merge_requests/user_filters_by_milestones_spec.rb b/spec/features/merge_requests/user_filters_by_milestones_spec.rb index 41a0b0012d1..877d5e6a4ee 100644 --- a/spec/features/merge_requests/user_filters_by_milestones_spec.rb +++ b/spec/features/merge_requests/user_filters_by_milestones_spec.rb @@ -10,7 +10,7 @@ RSpec.describe 'Merge Requests > User filters by milestones', :js do let(:milestone) { create(:milestone, project: project) } before do - create(:merge_request, :with_diffs, source_project: project) + create(:merge_request, source_project: project) create(:merge_request, :simple, source_project: project, milestone: milestone) sign_in(user) diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb index 36d28ae2822..6b8dcd7dbb6 100644 --- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb +++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb @@ -40,9 +40,8 @@ RSpec.describe 'Merge requests > User lists merge requests' do updated_at: 10.seconds.ago) end - context 'when merge_request_reviewers is turned on' do + context 'merge request reviewers' do before do - stub_feature_flags(merge_request_reviewers: true) visit_merge_requests(project, reviewer_id: user.id) end @@ -62,15 +61,6 @@ RSpec.describe 'Merge requests > User lists merge requests' do end end - context 'when merge_request_reviewers is turned false' do - it 'has no reviewers in MR list' do - stub_feature_flags(merge_request_reviewers: false) - visit_merge_requests(project, reviewer_id: user.id) - - expect(page).not_to have_css('.issuable-reviewers') - end - end - it 'filters on no assignee' do visit_merge_requests(project, assignee_id: IssuableFinder::Params::FILTER_NONE) |