Add latest changes from gitlab-org/gitlab@master

6 files changed, 63 insertions, 26 deletions

diff --git a/spec/features/markdown/gitlab_flavored_markdown_spec.rb b/spec/features/markdown/gitlab_flavored_markdown_spec.rb
index e831d1be608..17fe2dab8f7 100644
--- a/spec/features/markdown/gitlab_flavored_markdown_spec.rb
+++ b/spec/features/markdown/gitlab_flavored_markdown_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe "GitLab Flavored Markdown" do
-  include CycleAnalyticsHelpers
-
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:issue) { create(:issue, project: project) }
@@ -24,7 +22,12 @@ RSpec.describe "GitLab Flavored Markdown" do
     let(:commit) { project.commit }
 
     before do
-      create_commit("fix #{issue.to_reference}\n\nask #{fred.to_reference} for details", project, user, 'master')
+      project.repository.commit_files(
+        user,
+        branch_name: 'master',
+        message: "fix #{issue.to_reference}\n\nask #{fred.to_reference} for details",
+        actions: [{ action: :create, file_path: 'a/new.file', content: 'This is a file' }]
+      )
     end
 
     it "renders title in commits#index" do
diff --git a/spec/features/search/user_searches_for_commits_spec.rb b/spec/features/search/user_searches_for_commits_spec.rb
index 2dceda09d7c..a157483ce70 100644
--- a/spec/features/search/user_searches_for_commits_spec.rb
+++ b/spec/features/search/user_searches_for_commits_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe 'User searches for commits', :js do
-  include CycleAnalyticsHelpers
-
   let(:project) { create(:project, :repository) }
   let(:sha) { '6d394385cf567f80a8fd85055db1ab4c5295806f' }
   let(:user) { create(:user) }
@@ -34,7 +32,12 @@ RSpec.describe 'User searches for commits', :js do
 
   context 'when searching by message' do
     it 'finds a commit and holds on /search page' do
-      create_commit('Message referencing another sha: "deadbeef"', project, user, 'master')
+      project.repository.commit_files(
+        user,
+        message: 'Message referencing another sha: "deadbeef"',
+        branch_name: 'master',
+        actions: [{ action: :create, file_path: 'a/new.file', contents: 'new file' }]
+      )
 
       submit_search('deadbeef')
 
diff --git a/spec/frontend/lib/utils/text_markdown_spec.js b/spec/frontend/lib/utils/text_markdown_spec.js
index ba3c73d662d..9fbb3d0a660 100644
--- a/spec/frontend/lib/utils/text_markdown_spec.js
+++ b/spec/frontend/lib/utils/text_markdown_spec.js
@@ -198,6 +198,7 @@ describe('init markdown', () => {
           textArea.addEventListener('keydown', keypressNoteText);
           textArea.addEventListener('compositionstart', compositionStartNoteText);
           textArea.addEventListener('compositionend', compositionEndNoteText);
+          gon.markdown_automatic_lists = true;
         });
 
         it.each`
@@ -317,6 +318,18 @@ describe('init markdown', () => {
           expect(textArea.value).toEqual(expected);
           expect(textArea.selectionStart).toBe(expected.length);
         });
+
+        it('does nothing if user preference disabled', () => {
+          const text = '- test';
+
+          gon.markdown_automatic_lists = false;
+
+          textArea.value = text;
+          textArea.setSelectionRange(text.length, text.length);
+          textArea.dispatchEvent(enterEvent);
+
+          expect(textArea.value).toEqual(text);
+        });
       });
     });
 
diff --git a/spec/helpers/ci/pipeline_editor_helper_spec.rb b/spec/helpers/ci/pipeline_editor_helper_spec.rb
index 95d90ff5dde..c9aac63a883 100644
--- a/spec/helpers/ci/pipeline_editor_helper_spec.rb
+++ b/spec/helpers/ci/pipeline_editor_helper_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe Ci::PipelineEditorHelper do
-  include CycleAnalyticsHelpers
-
   let_it_be(:project) { create(:project) }
 
   describe 'can_view_pipeline_editor?' do
@@ -125,7 +123,12 @@ RSpec.describe Ci::PipelineEditorHelper do
       let(:user) { create(:user) }
 
       before do
-        create_commit('Message', project, user, 'feature')
+        project.repository.commit_files(
+          user,
+          branch_name: 'feature',
+          message: 'Message',
+          actions: [{ action: :create, file_path: 'a/new.file', content: 'This is a new file' }]
+        )
         controller.params[:branch_name] = 'feature'
       end
 
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index d3976d57cee..b16fa4df6c1 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -5417,21 +5417,21 @@ RSpec.describe MergeRequest, factory_default: :keep do
     subject(:suggested_reviewer_users) { merge_request.suggested_reviewer_users }
 
     shared_examples 'blank suggestions' do
-      it 'returns blank' do
-        expect(suggested_reviewer_users).to eq([])
+      it 'returns an empty relation' do
+        expect(suggested_reviewer_users).to be_empty
       end
     end
 
-    context 'predictions is nil' do
+    context 'when predictions is nil' do
       it_behaves_like 'blank suggestions'
     end
 
-    context 'predictions is not nil' do
+    context 'when predictions is not nil' do
       before do
         merge_request.build_predictions
       end
 
-      context 'a non hash' do
+      context 'when predictions is a non hash' do
         before do
           merge_request.build_predictions
           merge_request.predictions.suggested_reviewers = 1
@@ -5440,7 +5440,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
         it_behaves_like 'blank suggestions'
       end
 
-      context 'an empty hash' do
+      context 'when predictions is an empty hash' do
         before do
           merge_request.predictions.suggested_reviewers = {}
         end
@@ -5448,7 +5448,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
         it_behaves_like 'blank suggestions'
       end
 
-      context 'suggests a user which is not a member' do
+      context 'when suggests a user who is not a member' do
         let_it_be(:non_member) { create(:user) }
 
         before do
@@ -5458,25 +5458,37 @@ RSpec.describe MergeRequest, factory_default: :keep do
         it_behaves_like 'blank suggestions'
       end
 
-      context 'suggests a user which is a non member' do
-        let_it_be(:member) { create(:user) }
+      context 'when suggests users who are members' do
+        let_it_be(:first_member) { create(:user) }
+        let_it_be(:second_member) { create(:user) }
+
+        before_all do
+          project.add_developer(first_member)
+          project.add_developer(second_member)
+        end
 
         before do
-          project.add_developer(member)
-          merge_request.predictions.suggested_reviewers = { 'reviewers' => [member.username] }
+          merge_request.predictions.suggested_reviewers = {
+            'reviewers' => [
+              second_member.username,
+              first_member.username
+            ]
+          }
         end
 
-        context 'user is nonactive' do
+        context 'when a user is inactive' do
           before do
-            member.deactivate
+            second_member.deactivate
           end
 
-          it_behaves_like 'blank suggestions'
+          it 'returns only active users' do
+            expect(suggested_reviewer_users).to eq([first_member])
+          end
         end
 
-        context 'user is active' do
-          it 'returns the user' do
-            expect(suggested_reviewer_users).to eq([member])
+        context 'when all users are active' do
+          it 'returns users in correct suggested order' do
+            expect(suggested_reviewer_users).to eq([second_member, first_member])
           end
         end
       end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d789533f76b..a32eea7dfc9 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -69,6 +69,9 @@ RSpec.describe User do
     it { is_expected.to delegate_method(:markdown_surround_selection).to(:user_preference) }
     it { is_expected.to delegate_method(:markdown_surround_selection=).to(:user_preference).with_arguments(:args) }
 
+    it { is_expected.to delegate_method(:markdown_automatic_lists).to(:user_preference) }
+    it { is_expected.to delegate_method(:markdown_automatic_lists=).to(:user_preference).with_arguments(:args) }
+
     it { is_expected.to delegate_method(:diffs_deletion_color).to(:user_preference) }
     it { is_expected.to delegate_method(:diffs_deletion_color=).to(:user_preference).with_arguments(:args) }