Merge branch 'ph/365891/revertAutoAssign' into 'master'

Revert auto assign merge request

See merge request gitlab-org/gitlab!90891

app/assets/javascripts/issuable/issuable_form.js

@@ -68,8 +68,7 @@ export default class IssuableForm {
     this.gfmAutoComplete = new GfmAutoComplete(
       gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources,
     ).setup();
-    const autoAssignToMe = form.get(0).id === 'new_merge_request';
-    this.usersSelect = new UsersSelect(undefined, undefined, { autoAssignToMe });
+    this.usersSelect = new UsersSelect();
     this.reviewersSelect = new UsersSelect(undefined, '.js-reviewer-search');
     this.zenMode = new ZenMode();
 

app/assets/javascripts/users_select/index.js

@@ -35,7 +35,7 @@ function UsersSelect(currentUser, els, options = {}) {
     }
   }
 
-  const { handleClick, autoAssignToMe } = options;
+  const { handleClick } = options;
   const userSelect = this;
 
   $els.each((i, dropdown) => {
@@ -172,7 +172,10 @@ function UsersSelect(currentUser, els, options = {}) {
       });
     };
 
-    const onAssignToMeClick = () => {
+    $assignToMeLink.on('click', (e) => {
+      e.preventDefault();
+      $(e.currentTarget).hide();
+
       if ($dropdown.data('multiSelect')) {
         assignYourself();
         checkMaxSelect();
@@ -191,19 +194,8 @@ function UsersSelect(currentUser, els, options = {}) {
           .text(gon.current_user_fullname)
           .removeClass('is-default');
       }
-    };
-
-    $assignToMeLink.on('click', (e) => {
-      e.preventDefault();
-      $(e.currentTarget).hide();
-      onAssignToMeClick();
     });
 
-    if (autoAssignToMe) {
-      $assignToMeLink.hide();
-      onAssignToMeClick();
-    }
-
     $block.on('click', '.js-assign-yourself', (e) => {
       e.preventDefault();
       return assignTo(userSelect.currentUser.id);

qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_spec.rb

@@ -24,6 +24,7 @@ module QA
         Resource::MergeRequest.fabricate_via_browser_ui! do |merge_request|
           merge_request.project = project
           merge_request.title = merge_request_title
+          merge_request.assignee = 'me'
           merge_request.description = merge_request_description
         end
 
@@ -53,6 +54,7 @@ module QA
           merge_request.description = merge_request_description
           merge_request.project = project
           merge_request.milestone = milestone
+          merge_request.assignee = 'me'
           merge_request.labels.push(label)
         end
 

spec/features/issues/user_creates_branch_and_merge_request_spec.rb

@@ -25,20 +25,6 @@
       sign_in(user)
     end
 
-    context 'when ’Create merge request’ button is clicked' do
-      before do
-        visit project_issue_path(project, issue)
-
-        wait_for_requests
-
-        click_button('Create merge request')
-
-        wait_for_requests
-      end
-
-      it_behaves_like 'merge request author auto assign'
-    end
-
     context 'when interacting with the dropdown' do
       before do
         visit project_issue_path(project, issue)

spec/features/merge_request/user_creates_merge_request_spec.rb

@@ -15,39 +15,27 @@
     sign_in(user)
   end
 
-  context 'when completed the compare branches form' do
-    before do
-      visit(project_new_merge_request_path(project))
+  it "creates a merge request" do
+    visit(project_new_merge_request_path(project))
 
-      find(".js-source-branch").click
-      click_link("fix")
+    find(".js-source-branch").click
+    click_link("fix")
 
-      find(".js-target-branch").click
-      click_link("feature")
+    find(".js-target-branch").click
+    click_link("feature")
 
-      click_button("Compare branches")
-    end
+    click_button("Compare branches")
 
-    it "shows merge request form" do
-      page.within('.merge-request-form') do
-        expect(page.find('#merge_request_description')['placeholder']).to eq 'Describe the goal of the changes and what reviewers should be aware of.'
-      end
+    page.within('.merge-request-form') do
+      expect(page.find('#merge_request_description')['placeholder']).to eq 'Describe the goal of the changes and what reviewers should be aware of.'
     end
 
-    context "when completed the merge request form" do
-      before do
-        fill_in("Title", with: title)
-        click_button("Create merge request")
-      end
+    fill_in("Title", with: title)
+    click_button("Create merge request")
 
-      it "creates a merge request" do
-        page.within(".merge-request") do
-          expect(page).to have_content(title)
-        end
-      end
+    page.within(".merge-request") do
+      expect(page).to have_content(title)
     end
-
-    it_behaves_like 'merge request author auto assign'
   end
 
   context "XSS branch name exists" do

spec/support/shared_examples/features/multiple_assignees_mr_shared_examples.rb

@@ -4,7 +4,7 @@
   it "#{action} a MR with multiple assignees", :js do
     find('.js-assignee-search').click
     page.within '.dropdown-menu-user' do
-      click_link user.name unless action == 'creates'
+      click_link user.name
       click_link user2.name
     end
 

spec/support/shared_examples/features/multiple_assignees_widget_mr_shared_examples.rb

@@ -4,7 +4,7 @@
   it "#{action} a MR with multiple assignees", :js do
     find('.js-assignee-search').click
     page.within '.dropdown-menu-user' do
-      click_link user.name unless action == 'creates'
+      click_link user.name
       click_link user2.name
     end
 

spec/support/shared_examples/merge_request_author_auto_assign_shared_examples.rb

-# frozen_string_literal: true
-
-RSpec.shared_examples 'merge request author auto assign' do
-  it 'populates merge request author as assignee' do
-    expect(find('.js-assignee-search')).to have_content(user.name)
-    expect(page).not_to have_content 'Assign yourself'
-  end
-end