1 files changed, 14 insertions, 14 deletions
diff --git a/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb b/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
index c9910487798..2fff4137934 100644
--- a/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
+++ b/spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
@@ -11,6 +11,15 @@ RSpec.shared_examples 'an editable merge request' do
       expect(page).to have_content user.name
     end
 
+    find('.js-reviewer-search').click
+    page.within '.dropdown-menu-user' do
+      click_link user.name
+    end
+    expect(find('input[name="merge_request[reviewer_ids][]"]', visible: false).value).to match(user.id.to_s)
+    page.within '.js-reviewer-search' do
+      expect(page).to have_content user.name
+    end
+
     click_button 'Milestone'
     page.within '.issue-milestone' do
       click_link milestone.title
@@ -38,6 +47,10 @@ RSpec.shared_examples 'an editable merge request' do
         expect(page).to have_content user.name
       end
 
+      page.within '.reviewer' do
+        expect(page).to have_content user.name
+      end
+
       page.within '.milestone' do
         expect(page).to have_content milestone.title
       end
@@ -69,7 +82,7 @@ RSpec.shared_examples 'an editable merge request' do
   end
 
   it 'warns about version conflict' do
-    merge_request.update(title: "New title")
+    merge_request.update!(title: "New title")
 
     fill_in 'merge_request_title', with: 'bug 345'
     fill_in 'merge_request_description', with: 'bug description'
@@ -124,16 +137,3 @@ end
 def get_textarea_height
   page.evaluate_script('document.getElementById("merge_request_description").offsetHeight')
 end
-
-RSpec.shared_examples 'an editable merge request with reviewers' do
-  it 'updates merge request', :js do
-    find('.js-reviewer-search').click
-    page.within '.dropdown-menu-user' do
-      click_link user.name
-    end
-    expect(find('input[name="merge_request[reviewer_ids][]"]', visible: false).value).to match(user.id.to_s)
-    page.within '.js-reviewer-search' do
-      expect(page).to have_content user.name
-    end
-  end
-end