Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-pages-introdocs-pages-intro

4 files changed, 28 insertions, 11 deletions

diff --git a/spec/features/merge_request/user_creates_image_diff_notes_spec.rb b/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
index c837a6752f9..65de0afae0c 100644
--- a/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_creates_image_diff_notes_spec.rb
@@ -113,7 +113,7 @@ describe 'Merge request > User creates image diff notes', :js do
           create_image_diff_note
         end
 
-        it 'shows indicator and avatar badges, and allows collapsing/expanding the discussion notes' do
+        it 'shows indicator and avatar badges, and allows collapsing/expanding the discussion notes', :quarantine do
           indicator = find('.js-image-badge', match: :first)
           badge = find('.user-avatar-link .badge', match: :first)
 
diff --git a/spec/features/merge_request/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb
index ea2bb1503bb..bcc11217389 100644
--- a/spec/features/merge_request/user_creates_merge_request_spec.rb
+++ b/spec/features/merge_request/user_creates_merge_request_spec.rb
@@ -68,15 +68,15 @@ describe "User creates a merge request", :js do
         fill_in("Title", with: title)
       end
 
-      click_button("Assignee")
-
       expect(find(".js-assignee-search")["data-project-id"]).to eq(project.id.to_s)
+      find('.js-assignee-search').click
 
       page.within(".dropdown-menu-user") do
         expect(page).to have_content("Unassigned")
                    .and have_content(user.name)
                    .and have_content(project.users.first.name)
       end
+      find('.js-assignee-search').click
 
       click_button("Submit merge request")
 
diff --git a/spec/features/merge_request/user_creates_mr_spec.rb b/spec/features/merge_request/user_creates_mr_spec.rb
index c169a68cd1c..c9dedab048a 100644
--- a/spec/features/merge_request/user_creates_mr_spec.rb
+++ b/spec/features/merge_request/user_creates_mr_spec.rb
@@ -1,11 +1,18 @@
 require 'rails_helper'
 
 describe 'Merge request > User creates MR' do
-  it_behaves_like 'a creatable merge request'
+  include ProjectForksHelper
 
-  context 'from a forked project' do
-    include ProjectForksHelper
+  before do
+    stub_licensed_features(multiple_merge_request_assignees: false)
+  end
 
+  context 'non-fork merge request' do
+    include_context 'merge request create context'
+    it_behaves_like 'a creatable merge request'
+  end
+
+  context 'from a forked project' do
     let(:canonical_project) { create(:project, :public, :repository) }
 
     let(:source_project) do
@@ -15,6 +22,7 @@ describe 'Merge request > User creates MR' do
     end
 
     context 'to canonical project' do
+      include_context 'merge request create context'
       it_behaves_like 'a creatable merge request'
     end
 
@@ -25,6 +33,7 @@ describe 'Merge request > User creates MR' do
           namespace: user.namespace)
       end
 
+      include_context 'merge request create context'
       it_behaves_like 'a creatable merge request'
     end
   end
diff --git a/spec/features/merge_request/user_edits_mr_spec.rb b/spec/features/merge_request/user_edits_mr_spec.rb
index 3152707136c..25979513ead 100644
--- a/spec/features/merge_request/user_edits_mr_spec.rb
+++ b/spec/features/merge_request/user_edits_mr_spec.rb
@@ -1,13 +1,21 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Merge request > User edits MR' do
   include ProjectForksHelper
 
-  it_behaves_like 'an editable merge request'
+  before do
+    stub_licensed_features(multiple_merge_request_assignees: false)
+  end
+
+  context 'non-fork merge request' do
+    include_context 'merge request edit context'
+    it_behaves_like 'an editable merge request'
+  end
 
   context 'for a forked project' do
-    it_behaves_like 'an editable merge request' do
-      let(:source_project) { fork_project(target_project, nil, repository: true) }
-    end
+    let(:source_project) { fork_project(target_project, nil, repository: true) }
+
+    include_context 'merge request edit context'
+    it_behaves_like 'an editable merge request'
   end
 end