Add latest changes from gitlab-org/gitlab@master

6 files changed, 200 insertions, 42 deletions

diff --git a/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb
new file mode 100644
index 00000000000..98a2e8b6a57
--- /dev/null
+++ b/spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb
@@ -0,0 +1,176 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe BulkImports::Projects::Pipelines::CiPipelinesPipeline do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, group: group) }
+  let_it_be(:bulk_import) { create(:bulk_import, user: user) }
+  let_it_be(:entity) do
+    create(
+      :bulk_import_entity,
+      :project_entity,
+      project: project,
+      bulk_import: bulk_import,
+      source_full_path: 'source/full/path',
+      destination_name: 'My Destination Project',
+      destination_namespace: group.full_path
+    )
+  end
+
+  let(:ci_pipeline_attributes) { {} }
+  let(:ci_pipeline) do
+    {
+      sha: "fakesha",
+      ref: "fakeref",
+      project: project,
+      source: "web"
+    }.merge(ci_pipeline_attributes)
+  end
+
+  let(:ci_pipeline2) do
+    {
+      sha: "fakesha2",
+      ref: "fakeref2",
+      project: project,
+      source: "web"
+    }.merge(ci_pipeline_attributes)
+  end
+
+  let_it_be(:tracker) { create(:bulk_import_tracker, entity: entity) }
+  let_it_be(:context) { BulkImports::Pipeline::Context.new(tracker) }
+
+  subject(:pipeline) { described_class.new(context) }
+
+  describe '#run' do
+    before do
+      group.add_owner(user)
+
+      allow_next_instance_of(BulkImports::Common::Extractors::NdjsonExtractor) do |extractor|
+        allow(extractor).to receive(:extract).and_return(
+          BulkImports::Pipeline::ExtractedData.new(data: [ci_pipeline, ci_pipeline2])
+        )
+      end
+
+      allow_next_instance_of(Repository) do |repository|
+        allow(repository).to receive(:fetch_source_branch!)
+      end
+
+      pipeline.run
+    end
+
+    it 'imports Ci::Pipeline into destination project' do
+      expect(project.all_pipelines.count).to eq(2)
+      expect(project.ci_pipelines.first.sha).to eq('fakesha')
+      expect(project.ci_pipelines.second.sha).to eq('fakesha2')
+    end
+
+    context 'notes' do
+      let(:ci_pipeline_attributes) do
+        {
+          'notes' => [
+            {
+              'note' => 'test note',
+              'author_id' => 22,
+              'noteable_type' => 'Commit',
+              'sha' => '',
+              'author' => {
+                'name' => 'User 22'
+              },
+              'commit_id' => 'fakesha',
+              'updated_at' => '2016-06-14T15:02:47.770Z',
+              'events' => [
+                {
+                  'action' => 'created',
+                  'author_id' => 22
+                }
+              ]
+            }
+          ]
+        }
+      end
+
+      it 'imports pipeline with notes' do
+        note = project.all_pipelines.first.notes.first
+        expect(note.note).to include('test note')
+        expect(note.events.first.action).to eq('created')
+      end
+    end
+
+    context 'stages' do
+      let(:ci_pipeline_attributes) do
+        {
+          'stages' => [
+            {
+              'name' => 'test stage',
+              'statuses' => [
+                {
+                  'name' => 'first status',
+                  'status' => 'created'
+                }
+              ]
+            }
+          ]
+        }
+      end
+
+      it 'imports pipeline with notes' do
+        stage = project.all_pipelines.first.stages.first
+        expect(stage.name).to eq('test stage')
+        expect(stage.statuses.first.name).to eq('first status')
+      end
+    end
+
+    context 'external pull request' do
+      let(:ci_pipeline_attributes) do
+        {
+          'source' => 'external_pull_request_event',
+          'external_pull_request' => {
+            'source_branch' => 'test source branch',
+            'target_branch' => 'master',
+            'source_sha' => 'testsha',
+            'target_sha' => 'targetsha',
+            'source_repository' => 'test repository',
+            'target_repository' => 'test repository',
+            'status' => 1,
+            'pull_request_iid' => 1
+          }
+        }
+      end
+
+      it 'imports pipeline with external pull request' do
+        pull_request = project.all_pipelines.first.external_pull_request
+        expect(pull_request.source_branch).to eq('test source branch')
+        expect(pull_request.status).to eq('open')
+      end
+    end
+
+    context 'merge request' do
+      let(:ci_pipeline_attributes) do
+        {
+          'source' => 'merge_request_event',
+          'merge_request' => {
+            'description' => 'test merge request',
+            'title' => 'test MR',
+            'source_branch' => 'test source branch',
+            'target_branch' => 'master',
+            'source_sha' => 'testsha',
+            'target_sha' => 'targetsha',
+            'source_repository' => 'test repository',
+            'target_repository' => 'test repository',
+            'target_project_id' => project.id,
+            'source_project_id' => project.id,
+            'author_id' => user.id
+          }
+        }
+      end
+
+      it 'imports pipeline with external pull request' do
+        merge_request = project.all_pipelines.first.merge_request
+        expect(merge_request.source_branch).to eq('test source branch')
+        expect(merge_request.description).to eq('test merge request')
+      end
+    end
+  end
+end
diff --git a/spec/lib/bulk_imports/projects/stage_spec.rb b/spec/lib/bulk_imports/projects/stage_spec.rb
index e7670085f60..58106bff161 100644
--- a/spec/lib/bulk_imports/projects/stage_spec.rb
+++ b/spec/lib/bulk_imports/projects/stage_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe BulkImports::Projects::Stage do
       [4, BulkImports::Projects::Pipelines::MergeRequestsPipeline],
       [4, BulkImports::Projects::Pipelines::ExternalPullRequestsPipeline],
       [4, BulkImports::Projects::Pipelines::ProtectedBranchesPipeline],
+      [4, BulkImports::Projects::Pipelines::CiPipelinesPipeline],
       [5, BulkImports::Common::Pipelines::WikiPipeline],
       [5, BulkImports::Common::Pipelines::UploadsPipeline],
       [6, BulkImports::Common::Pipelines::EntityFinisher]
diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb
index 4b437397688..45a49a36fe2 100644
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe Gitlab::Diff::File do
 
   describe 'initialize' do
     context 'when file is ipynb with a change after transformation' do
-      let(:commit) { project.commit("f6b7a707") }
+      let(:commit) { project.commit("532c837") }
       let(:diff) { commit.raw_diffs.first }
       let(:diff_file) { described_class.new(diff, diff_refs: commit.diff_refs, repository: project.repository) }
 
@@ -63,7 +63,7 @@ RSpec.describe Gitlab::Diff::File do
         end
 
         it 'recreates the diff by transforming the files' do
-          expect(diff_file.diff.diff).not_to include('"| Fake')
+          expect(diff_file.diff.diff).not_to include('cell_type')
         end
       end
 
@@ -73,7 +73,7 @@ RSpec.describe Gitlab::Diff::File do
         end
 
         it 'does not recreate the diff' do
-          expect(diff_file.diff.diff).to include('"| Fake')
+          expect(diff_file.diff.diff).to include('cell_type')
         end
       end
     end
diff --git a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
index d8e397dd6f3..703201c7b29 100644
--- a/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/commit_service_spec.rb
@@ -108,45 +108,6 @@ RSpec.describe Gitlab::GitalyClient::CommitService do
     end
   end
 
-  describe '#between' do
-    let(:from) { 'master' }
-    let(:to) { Gitlab::Git::EMPTY_TREE_ID }
-
-    context 'with between_commits_via_list_commits enabled' do
-      before do
-        stub_feature_flags(between_commits_via_list_commits: true)
-      end
-
-      it 'sends an RPC request' do
-        request = Gitaly::ListCommitsRequest.new(
-          repository: repository_message, revisions: ["^" + from, to], reverse: true
-        )
-
-        expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:list_commits)
-          .with(request, kind_of(Hash)).and_return([])
-
-        described_class.new(repository).between(from, to)
-      end
-    end
-
-    context 'with between_commits_via_list_commits disabled' do
-      before do
-        stub_feature_flags(between_commits_via_list_commits: false)
-      end
-
-      it 'sends an RPC request' do
-        request = Gitaly::CommitsBetweenRequest.new(
-          repository: repository_message, from: from, to: to
-        )
-
-        expect_any_instance_of(Gitaly::CommitService::Stub).to receive(:commits_between)
-          .with(request, kind_of(Hash)).and_return([])
-
-        described_class.new(repository).between(from, to)
-      end
-    end
-  end
-
   describe '#diff_stats' do
     let(:left_commit_id) { 'master' }
     let(:right_commit_id) { 'cfe32cf61b73a0d5e9f13e774abde7ff789b1660' }
diff --git a/spec/lib/gitlab/hook_data/merge_request_builder_spec.rb b/spec/lib/gitlab/hook_data/merge_request_builder_spec.rb
index 9e6ad35861f..ddd681f75f0 100644
--- a/spec/lib/gitlab/hook_data/merge_request_builder_spec.rb
+++ b/spec/lib/gitlab/hook_data/merge_request_builder_spec.rb
@@ -15,6 +15,7 @@ RSpec.describe Gitlab::HookData::MergeRequestBuilder do
         assignee_id
         assignee_ids
         author_id
+        blocking_discussions_resolved
         created_at
         description
         head_pipeline_id
diff --git a/spec/lib/sidebars/menu_spec.rb b/spec/lib/sidebars/menu_spec.rb
index eb6a68f1afd..bdd9f22d5a0 100644
--- a/spec/lib/sidebars/menu_spec.rb
+++ b/spec/lib/sidebars/menu_spec.rb
@@ -153,6 +153,25 @@ RSpec.describe Sidebars::Menu do
     end
   end
 
+  describe '#remove_element' do
+    let(:item1) { Sidebars::MenuItem.new(title: 'foo1', link: 'foo1', active_routes: {}, item_id: :foo1) }
+    let(:item2) { Sidebars::MenuItem.new(title: 'foo2', link: 'foo2', active_routes: {}, item_id: :foo2) }
+    let(:item3) { Sidebars::MenuItem.new(title: 'foo3', link: 'foo3', active_routes: {}, item_id: :foo3) }
+    let(:list) { [item1, item2, item3] }
+
+    it 'removes specific element' do
+      menu.remove_element(list, :foo2)
+
+      expect(list).to eq [item1, item3]
+    end
+
+    it 'does not remove nil elements' do
+      menu.remove_element(list, nil)
+
+      expect(list).to eq [item1, item2, item3]
+    end
+  end
+
   describe '#container_html_options' do
     before do
       allow(menu).to receive(:title).and_return('Foo Menu')