Merge branch 'sh-support-bitbucket-server-import' into 'master'

Add support for Bitbucket Server imports

Closes #25393

See merge request gitlab-org/gitlab-ce!20164

11 files changed, 849 insertions, 11 deletions

diff --git a/spec/lib/bitbucket_server/client_spec.rb b/spec/lib/bitbucket_server/client_spec.rb
new file mode 100644
index 00000000000..f926ae963a4
--- /dev/null
+++ b/spec/lib/bitbucket_server/client_spec.rb
@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe BitbucketServer::Client do
+  let(:base_uri) { 'https://test:7990/stash/' }
+  let(:options) { { base_uri: base_uri, user: 'bitbucket', password: 'mypassword' } }
+  let(:project) { 'SOME-PROJECT' }
+  let(:repo_slug) { 'my-repo' }
+  let(:headers) { { "Content-Type" => "application/json" } }
+
+  subject { described_class.new(options) }
+
+  describe '#pull_requests' do
+    let(:path) { "/projects/#{project}/repos/#{repo_slug}/pull-requests?state=ALL" }
+
+    it 'requests a collection' do
+      expect(BitbucketServer::Paginator).to receive(:new).with(anything, path, :pull_request)
+
+      subject.pull_requests(project, repo_slug)
+    end
+
+    it 'throws an exception when connection fails' do
+      allow(BitbucketServer::Collection).to receive(:new).and_raise(OpenSSL::SSL::SSLError)
+
+      expect { subject.pull_requests(project, repo_slug) }.to raise_error(described_class::ServerError)
+    end
+  end
+
+  describe '#activities' do
+    let(:path) { "/projects/#{project}/repos/#{repo_slug}/pull-requests/1/activities" }
+
+    it 'requests a collection' do
+      expect(BitbucketServer::Paginator).to receive(:new).with(anything, path, :activity)
+
+      subject.activities(project, repo_slug, 1)
+    end
+  end
+
+  describe '#repo' do
+    let(:path) { "/projects/#{project}/repos/#{repo_slug}" }
+    let(:url) { "#{base_uri}rest/api/1.0/projects/SOME-PROJECT/repos/my-repo" }
+
+    it 'requests a specific repository' do
+      stub_request(:get, url).to_return(status: 200, headers: headers, body: '{}')
+
+      subject.repo(project, repo_slug)
+
+      expect(WebMock).to have_requested(:get, url)
+    end
+  end
+
+  describe '#repos' do
+    let(:path) { "/repos" }
+
+    it 'requests a collection' do
+      expect(BitbucketServer::Paginator).to receive(:new).with(anything, path, :repo)
+
+      subject.repos
+    end
+  end
+
+  describe '#create_branch' do
+    let(:branch) { 'test-branch' }
+    let(:sha) { '12345678' }
+    let(:url) { "#{base_uri}rest/api/1.0/projects/SOME-PROJECT/repos/my-repo/branches" }
+
+    it 'requests Bitbucket to create a branch' do
+      stub_request(:post, url).to_return(status: 204, headers: headers, body: '{}')
+
+      subject.create_branch(project, repo_slug, branch, sha)
+
+      expect(WebMock).to have_requested(:post, url)
+    end
+  end
+
+  describe '#delete_branch' do
+    let(:branch) { 'test-branch' }
+    let(:sha) { '12345678' }
+    let(:url) { "#{base_uri}rest/branch-utils/1.0/projects/SOME-PROJECT/repos/my-repo/branches" }
+
+    it 'requests Bitbucket to create a branch' do
+      stub_request(:delete, url).to_return(status: 204, headers: headers, body: '{}')
+
+      subject.delete_branch(project, repo_slug, branch, sha)
+
+      expect(WebMock).to have_requested(:delete, url)
+    end
+  end
+end
diff --git a/spec/lib/bitbucket_server/connection_spec.rb b/spec/lib/bitbucket_server/connection_spec.rb
new file mode 100644
index 00000000000..b5da4cb1a49
--- /dev/null
+++ b/spec/lib/bitbucket_server/connection_spec.rb
@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe BitbucketServer::Connection do
+  let(:options) { { base_uri: 'https://test:7990', user: 'bitbucket', password: 'mypassword' } }
+  let(:payload) { { 'test' => 1 } }
+  let(:headers) { { "Content-Type" => "application/json" } }
+  let(:url) { 'https://test:7990/rest/api/1.0/test?something=1' }
+
+  subject { described_class.new(options) }
+
+  describe '#get' do
+    it 'returns JSON body' do
+      WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_return(body: payload.to_json, status: 200, headers: headers)
+
+      expect(subject.get(url, { something: 1 })).to eq(payload)
+    end
+
+    it 'throws an exception if the response is not 200' do
+      WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_return(body: payload.to_json, status: 500, headers: headers)
+
+      expect { subject.get(url) }.to raise_error(described_class::ConnectionError)
+    end
+
+    it 'throws an exception if the response is not JSON' do
+      WebMock.stub_request(:get, url).with(headers: { 'Accept' => 'application/json' }).to_return(body: 'bad data', status: 200, headers: headers)
+
+      expect { subject.get(url) }.to raise_error(described_class::ConnectionError)
+    end
+  end
+
+  describe '#post' do
+    let(:headers) { { 'Accept' => 'application/json', 'Content-Type' => 'application/json' } }
+
+    it 'returns JSON body' do
+      WebMock.stub_request(:post, url).with(headers: headers).to_return(body: payload.to_json, status: 200, headers: headers)
+
+      expect(subject.post(url, payload)).to eq(payload)
+    end
+
+    it 'throws an exception if the response is not 200' do
+      WebMock.stub_request(:post, url).with(headers: headers).to_return(body: payload.to_json, status: 500, headers: headers)
+
+      expect { subject.post(url, payload) }.to raise_error(described_class::ConnectionError)
+    end
+  end
+
+  describe '#delete' do
+    let(:headers) { { 'Accept' => 'application/json', 'Content-Type' => 'application/json' } }
+
+    context 'branch API' do
+      let(:branch_path) { '/projects/foo/repos/bar/branches' }
+      let(:branch_url) { 'https://test:7990/rest/branch-utils/1.0/projects/foo/repos/bar/branches' }
+      let(:path) { }
+
+      it 'returns JSON body' do
+        WebMock.stub_request(:delete, branch_url).with(headers: headers).to_return(body: payload.to_json, status: 200, headers: headers)
+
+        expect(subject.delete(:branches, branch_path, payload)).to eq(payload)
+      end
+
+      it 'throws an exception if the response is not 200' do
+        WebMock.stub_request(:delete, branch_url).with(headers: headers).to_return(body: payload.to_json, status: 500, headers: headers)
+
+        expect { subject.delete(:branches, branch_path, payload) }.to raise_error(described_class::ConnectionError)
+      end
+    end
+  end
+end
diff --git a/spec/lib/bitbucket_server/page_spec.rb b/spec/lib/bitbucket_server/page_spec.rb
new file mode 100644
index 00000000000..cf419a9045b
--- /dev/null
+++ b/spec/lib/bitbucket_server/page_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe BitbucketServer::Page do
+  let(:response) { { 'values' => [{ 'description' => 'Test' }], 'isLastPage' => false, 'nextPageStart' => 2 } }
+
+  before do
+    # Autoloading hack
+    BitbucketServer::Representation::PullRequest.new({})
+  end
+
+  describe '#items' do
+    it 'returns collection of needed objects' do
+      page = described_class.new(response, :pull_request)
+
+      expect(page.items.first).to be_a(BitbucketServer::Representation::PullRequest)
+      expect(page.items.count).to eq(1)
+    end
+  end
+
+  describe '#attrs' do
+    it 'returns attributes' do
+      page = described_class.new(response, :pull_request)
+
+      expect(page.attrs.keys).to include(:isLastPage, :nextPageStart)
+    end
+  end
+
+  describe '#next?' do
+    it 'returns true' do
+      page = described_class.new(response, :pull_request)
+
+      expect(page.next?).to be_truthy
+    end
+
+    it 'returns false' do
+      response['isLastPage'] = true
+      response.delete('nextPageStart')
+      page = described_class.new(response, :pull_request)
+
+      expect(page.next?).to be_falsey
+    end
+  end
+
+  describe '#next' do
+    it 'returns next attribute' do
+      page = described_class.new(response, :pull_request)
+
+      expect(page.next).to eq(2)
+    end
+  end
+end
diff --git a/spec/lib/bitbucket_server/paginator_spec.rb b/spec/lib/bitbucket_server/paginator_spec.rb
new file mode 100644
index 00000000000..2de50eba3c4
--- /dev/null
+++ b/spec/lib/bitbucket_server/paginator_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe BitbucketServer::Paginator do
+  let(:last_page) { double(:page, next?: false, items: ['item_2']) }
+  let(:first_page) { double(:page, next?: true, next: last_page, items: ['item_1']) }
+  let(:connection) { instance_double(BitbucketServer::Connection) }
+
+  describe '#items' do
+    let(:paginator) { described_class.new(connection, 'http://more-data', :pull_request) }
+    let(:page_attrs) { { 'isLastPage' => false, 'nextPageStart' => 1 } }
+
+    it 'returns items and raises StopIteration in the end' do
+      allow(paginator).to receive(:fetch_next_page).and_return(first_page)
+      expect(paginator.items).to match(['item_1'])
+
+      allow(paginator).to receive(:fetch_next_page).and_return(last_page)
+      expect(paginator.items).to match(['item_2'])
+
+      allow(paginator).to receive(:fetch_next_page).and_return(nil)
+      expect { paginator.items }.to raise_error(StopIteration)
+    end
+
+    it 'calls the connection with different offsets' do
+      expect(connection).to receive(:get).with('http://more-data', start: 0, limit: BitbucketServer::Paginator::PAGE_LENGTH).and_return(page_attrs)
+
+      expect(paginator.items).to eq([])
+
+      expect(connection).to receive(:get).with('http://more-data', start: 1, limit: BitbucketServer::Paginator::PAGE_LENGTH).and_return({})
+
+      expect(paginator.items).to eq([])
+
+      expect { paginator.items }.to raise_error(StopIteration)
+    end
+  end
+end
diff --git a/spec/lib/bitbucket_server/representation/activity_spec.rb b/spec/lib/bitbucket_server/representation/activity_spec.rb
new file mode 100644
index 00000000000..15c50e40472
--- /dev/null
+++ b/spec/lib/bitbucket_server/representation/activity_spec.rb
@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe BitbucketServer::Representation::Activity do
+  let(:activities) { JSON.parse(fixture_file('importers/bitbucket_server/activities.json'))['values'] }
+  let(:inline_comment) { activities.first }
+  let(:comment) { activities[3] }
+  let(:merge_event) { activities[4] }
+
+  describe 'regular comment' do
+    subject { described_class.new(comment) }
+
+    it { expect(subject.comment?).to be_truthy }
+    it { expect(subject.inline_comment?).to be_falsey }
+    it { expect(subject.comment).to be_a(BitbucketServer::Representation::Comment) }
+    it { expect(subject.created_at).to be_a(Time) }
+  end
+
+  describe 'inline comment' do
+    subject { described_class.new(inline_comment) }
+
+    it { expect(subject.comment?).to be_truthy }
+    it { expect(subject.inline_comment?).to be_truthy }
+    it { expect(subject.comment).to be_a(BitbucketServer::Representation::PullRequestComment) }
+    it { expect(subject.created_at).to be_a(Time) }
+  end
+
+  describe 'merge event' do
+    subject { described_class.new(merge_event) }
+
+    it { expect(subject.comment?).to be_falsey }
+    it { expect(subject.inline_comment?).to be_falsey }
+    it { expect(subject.committer_user).to eq('root') }
+    it { expect(subject.committer_email).to eq('test.user@example.com') }
+    it { expect(subject.merge_timestamp).to be_a(Time) }
+    it { expect(subject.created_at).to be_a(Time) }
+    it { expect(subject.merge_commit).to eq('839fa9a2d434eb697815b8fcafaecc51accfdbbc') }
+  end
+end
diff --git a/spec/lib/bitbucket_server/representation/comment_spec.rb b/spec/lib/bitbucket_server/representation/comment_spec.rb
new file mode 100644
index 00000000000..53a20a1d80a
--- /dev/null
+++ b/spec/lib/bitbucket_server/representation/comment_spec.rb
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe BitbucketServer::Representation::Comment do
+  let(:activities) { JSON.parse(fixture_file('importers/bitbucket_server/activities.json'))['values'] }
+  let(:comment) { activities.first }
+
+  subject { described_class.new(comment) }
+
+  describe '#id' do
+    it { expect(subject.id).to eq(9) }
+  end
+
+  describe '#author_username' do
+    it { expect(subject.author_username).to eq('root' ) }
+  end
+
+  describe '#author_email' do
+    it { expect(subject.author_email).to eq('test.user@example.com' ) }
+  end
+
+  describe '#note' do
+    it { expect(subject.note).to eq('is this a new line?') }
+  end
+
+  describe '#created_at' do
+    it { expect(subject.created_at).to be_a(Time) }
+  end
+
+  describe '#updated_at' do
+    it { expect(subject.created_at).to be_a(Time) }
+  end
+
+  describe '#comments' do
+    it { expect(subject.comments.count).to eq(4) }
+    it { expect(subject.comments).to all( be_a(described_class) ) }
+    it { expect(subject.comments.map(&:note)).to match_array(["Hello world", "Ok", "hello", "hi"]) }
+
+    # The thread should look like:
+    #
+    # is this a new line? (subject)
+    #   -> Hello world (first)
+    #      -> Ok (third)
+    #      -> Hi (fourth)
+    #   -> hello (second)
+    it 'comments have the right parent' do
+      first, second, third, fourth = subject.comments[0..4]
+
+      expect(subject.parent_comment).to be_nil
+      expect(first.parent_comment).to eq(subject)
+      expect(second.parent_comment).to eq(subject)
+      expect(third.parent_comment).to eq(first)
+      expect(fourth.parent_comment).to eq(first)
+    end
+  end
+end
diff --git a/spec/lib/bitbucket_server/representation/pull_request_comment_spec.rb b/spec/lib/bitbucket_server/representation/pull_request_comment_spec.rb
new file mode 100644
index 00000000000..bd7e3597486
--- /dev/null
+++ b/spec/lib/bitbucket_server/representation/pull_request_comment_spec.rb
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe BitbucketServer::Representation::PullRequestComment do
+  let(:activities) { JSON.parse(fixture_file('importers/bitbucket_server/activities.json'))['values'] }
+  let(:comment) { activities.second }
+
+  subject { described_class.new(comment) }
+
+  describe '#id' do
+    it { expect(subject.id).to eq(7) }
+  end
+
+  describe '#from_sha' do
+    it { expect(subject.from_sha).to eq('c5f4288162e2e6218180779c7f6ac1735bb56eab') }
+  end
+
+  describe '#to_sha' do
+    it { expect(subject.to_sha).to eq('a4c2164330f2549f67c13f36a93884cf66e976be') }
+  end
+
+  describe '#to?' do
+    it { expect(subject.to?).to be_falsey }
+  end
+
+  describe '#from?' do
+    it { expect(subject.from?).to be_truthy }
+  end
+
+  describe '#added?' do
+    it { expect(subject.added?).to be_falsey }
+  end
+
+  describe '#removed?' do
+    it { expect(subject.removed?).to be_falsey }
+  end
+
+  describe '#new_pos' do
+    it { expect(subject.new_pos).to eq(11) }
+  end
+
+  describe '#old_pos' do
+    it { expect(subject.old_pos).to eq(9) }
+  end
+
+  describe '#file_path' do
+    it { expect(subject.file_path).to eq('CHANGELOG.md') }
+  end
+end
diff --git a/spec/lib/bitbucket_server/representation/pull_request_spec.rb b/spec/lib/bitbucket_server/representation/pull_request_spec.rb
new file mode 100644
index 00000000000..4b8afdb006b
--- /dev/null
+++ b/spec/lib/bitbucket_server/representation/pull_request_spec.rb
@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe BitbucketServer::Representation::PullRequest do
+  let(:sample_data) { JSON.parse(fixture_file('importers/bitbucket_server/pull_request.json')) }
+
+  subject { described_class.new(sample_data) }
+
+  describe '#author' do
+    it { expect(subject.author).to eq('root') }
+  end
+
+  describe '#author_email' do
+    it { expect(subject.author_email).to eq('joe.montana@49ers.com') }
+  end
+
+  describe '#description' do
+    it { expect(subject.description).to eq('Test') }
+  end
+
+  describe '#iid' do
+    it { expect(subject.iid).to eq(7) }
+  end
+
+  describe '#state' do
+    it { expect(subject.state).to eq('merged') }
+
+    context 'declined pull requests' do
+      before do
+        sample_data['state'] = 'DECLINED'
+      end
+
+      it 'returns closed' do
+        expect(subject.state).to eq('closed')
+      end
+    end
+
+    context 'open pull requests' do
+      before do
+        sample_data['state'] = 'OPEN'
+      end
+
+      it 'returns open' do
+        expect(subject.state).to eq('opened')
+      end
+    end
+  end
+
+  describe '#merged?' do
+    it { expect(subject.merged?).to be_truthy }
+  end
+
+  describe '#created_at' do
+    it { expect(subject.created_at.to_i).to eq(sample_data['createdDate'] / 1000) }
+  end
+
+  describe '#updated_at' do
+    it { expect(subject.updated_at.to_i).to eq(sample_data['updatedDate'] / 1000) }
+  end
+
+  describe '#title' do
+    it { expect(subject.title).to eq('Added a new line') }
+  end
+
+  describe '#source_branch_name' do
+    it { expect(subject.source_branch_name).to eq('refs/heads/root/CODE_OF_CONDUCTmd-1530600625006') }
+  end
+
+  describe '#source_branch_sha' do
+    it { expect(subject.source_branch_sha).to eq('074e2b4dddc5b99df1bf9d4a3f66cfc15481fdc8') }
+  end
+
+  describe '#target_branch_name' do
+    it { expect(subject.target_branch_name).to eq('refs/heads/master') }
+  end
+
+  describe '#target_branch_sha' do
+    it { expect(subject.target_branch_sha).to eq('839fa9a2d434eb697815b8fcafaecc51accfdbbc') }
+  end
+end
diff --git a/spec/lib/bitbucket_server/representation/repo_spec.rb b/spec/lib/bitbucket_server/representation/repo_spec.rb
new file mode 100644
index 00000000000..3ac1030fbb0
--- /dev/null
+++ b/spec/lib/bitbucket_server/representation/repo_spec.rb
@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe BitbucketServer::Representation::Repo do
+  let(:sample_data) do
+    <<~DATA
+    {
+      "slug": "rouge",
+      "id": 1,
+      "name": "rouge",
+      "scmId": "git",
+      "state": "AVAILABLE",
+      "statusMessage": "Available",
+      "forkable": true,
+      "project": {
+        "key": "TEST",
+        "id": 1,
+        "name": "test",
+        "description": "Test",
+        "public": false,
+        "type": "NORMAL",
+        "links": {
+          "self": [
+            {
+              "href": "http://localhost:7990/projects/TEST"
+            }
+          ]
+        }
+      },
+      "public": false,
+      "links": {
+        "clone": [
+          {
+            "href": "http://root@localhost:7990/scm/test/rouge.git",
+            "name": "http"
+          },
+          {
+            "href": "ssh://git@localhost:7999/test/rouge.git",
+            "name": "ssh"
+          }
+        ],
+        "self": [
+          {
+            "href": "http://localhost:7990/projects/TEST/repos/rouge/browse"
+          }
+        ]
+      }
+    }
+    DATA
+  end
+
+  subject { described_class.new(JSON.parse(sample_data)) }
+
+  describe '#project_key' do
+    it { expect(subject.project_key).to eq('TEST') }
+  end
+
+  describe '#project_name' do
+    it { expect(subject.project_name).to eq('test') }
+  end
+
+  describe '#slug' do
+    it { expect(subject.slug).to eq('rouge') }
+  end
+
+  describe '#browse_url' do
+    it { expect(subject.browse_url).to eq('http://localhost:7990/projects/TEST/repos/rouge/browse') }
+  end
+
+  describe '#clone_url' do
+    it { expect(subject.clone_url).to eq('http://root@localhost:7990/scm/test/rouge.git') }
+  end
+
+  describe '#description' do
+    it { expect(subject.description).to eq('Test') }
+  end
+
+  describe '#full_name' do
+    it { expect(subject.full_name).to eq('test/rouge') }
+  end
+end
diff --git a/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
new file mode 100644
index 00000000000..70423823b89
--- /dev/null
+++ b/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb
@@ -0,0 +1,291 @@
+require 'spec_helper'
+
+describe Gitlab::BitbucketServerImport::Importer do
+  include ImportSpecHelper
+
+  let(:project) { create(:project, :repository, import_url: 'http://my-bitbucket') }
+  let(:now) { Time.now.utc.change(usec: 0) }
+  let(:project_key) { 'TEST' }
+  let(:repo_slug) { 'rouge' }
+  let(:sample) { RepoHelpers.sample_compare }
+
+  subject { described_class.new(project, recover_missing_commits: true) }
+
+  before do
+    data = project.create_or_update_import_data(
+      data: { project_key: project_key, repo_slug: repo_slug },
+      credentials: { base_uri: 'http://my-bitbucket', user: 'bitbucket', password: 'test' }
+    )
+    data.save
+    project.save
+  end
+
+  describe '#import_repository' do
+    before do
+      expect(subject).to receive(:import_pull_requests)
+      expect(subject).to receive(:delete_temp_branches)
+    end
+
+    it 'adds a remote' do
+      expect(project.repository).to receive(:fetch_as_mirror)
+                                     .with('http://bitbucket:test@my-bitbucket',
+                                           refmap: [:heads, :tags, '+refs/pull-requests/*/to:refs/merge-requests/*/head'],
+                                           remote_name: 'bitbucket_server')
+
+      subject.execute
+    end
+  end
+
+  describe '#import_pull_requests' do
+    before do
+      allow(subject).to receive(:import_repository)
+      allow(subject).to receive(:delete_temp_branches)
+      allow(subject).to receive(:restore_branches)
+
+      pull_request = instance_double(
+        BitbucketServer::Representation::PullRequest,
+        iid: 10,
+        source_branch_sha: sample.commits.last,
+        source_branch_name: Gitlab::Git::BRANCH_REF_PREFIX + sample.source_branch,
+        target_branch_sha: sample.commits.first,
+        target_branch_name: Gitlab::Git::BRANCH_REF_PREFIX + sample.target_branch,
+        title: 'This is a title',
+        description: 'This is a test pull request',
+        state: 'merged',
+        author: 'Test Author',
+        author_email: project.owner.email,
+        created_at: Time.now,
+        updated_at: Time.now,
+        merged?: true)
+
+      allow(subject.client).to receive(:pull_requests).and_return([pull_request])
+
+      @merge_event = instance_double(
+        BitbucketServer::Representation::Activity,
+        comment?: false,
+        merge_event?: true,
+        committer_email: project.owner.email,
+        merge_timestamp: now,
+        merge_commit: '12345678'
+      )
+
+      @pr_note = instance_double(
+        BitbucketServer::Representation::Comment,
+        note: 'Hello world',
+        author_email: 'unknown@gmail.com',
+        author_username: 'The Flash',
+        comments: [],
+        created_at: now,
+        updated_at: now,
+        parent_comment: nil)
+
+      @pr_comment = instance_double(
+        BitbucketServer::Representation::Activity,
+        comment?: true,
+        inline_comment?: false,
+        merge_event?: false,
+        comment: @pr_note)
+    end
+
+    it 'imports merge event' do
+      expect(subject.client).to receive(:activities).and_return([@merge_event])
+
+      expect { subject.execute }.to change { MergeRequest.count }.by(1)
+
+      merge_request = MergeRequest.first
+      expect(merge_request.metrics.merged_by).to eq(project.owner)
+      expect(merge_request.metrics.merged_at).to eq(@merge_event.merge_timestamp)
+      expect(merge_request.merge_commit_sha).to eq('12345678')
+    end
+
+    it 'imports comments' do
+      expect(subject.client).to receive(:activities).and_return([@pr_comment])
+
+      expect { subject.execute }.to change { MergeRequest.count }.by(1)
+
+      merge_request = MergeRequest.first
+      expect(merge_request.notes.count).to eq(1)
+      note = merge_request.notes.first
+      expect(note.note).to end_with(@pr_note.note)
+      expect(note.author).to eq(project.owner)
+      expect(note.created_at).to eq(@pr_note.created_at)
+      expect(note.updated_at).to eq(@pr_note.created_at)
+    end
+
+    it 'imports threaded discussions' do
+      reply = instance_double(
+        BitbucketServer::Representation::PullRequestComment,
+        author_email: 'someuser@gitlab.com',
+        author_username: 'Batman',
+        note: 'I agree',
+        created_at: now,
+        updated_at: now)
+
+      # https://gitlab.com/gitlab-org/gitlab-test/compare/c1acaa58bbcbc3eafe538cb8274ba387047b69f8...5937ac0a7beb003549fc5fd26fc247ad
+      inline_note = instance_double(
+        BitbucketServer::Representation::PullRequestComment,
+        file_type: 'ADDED',
+        from_sha: sample.commits.first,
+        to_sha: sample.commits.last,
+        file_path: '.gitmodules',
+        old_pos: nil,
+        new_pos: 4,
+        note: 'Hello world',
+        author_email: 'unknown@gmail.com',
+        author_username: 'Superman',
+        comments: [reply],
+        created_at: now,
+        updated_at: now,
+        parent_comment: nil)
+
+      allow(reply).to receive(:parent_comment).and_return(inline_note)
+
+      inline_comment = instance_double(
+        BitbucketServer::Representation::Activity,
+        comment?: true,
+        inline_comment?: true,
+        merge_event?: false,
+        comment: inline_note)
+
+      expect(subject.client).to receive(:activities).and_return([inline_comment])
+
+      expect { subject.execute }.to change { MergeRequest.count }.by(1)
+
+      merge_request = MergeRequest.first
+      expect(merge_request.notes.count).to eq(2)
+      expect(merge_request.notes.map(&:discussion_id).uniq.count).to eq(1)
+
+      notes = merge_request.notes.order(:id).to_a
+      start_note = notes.first
+      expect(start_note.type).to eq('DiffNote')
+      expect(start_note.note).to end_with(inline_note.note)
+      expect(start_note.created_at).to eq(inline_note.created_at)
+      expect(start_note.updated_at).to eq(inline_note.updated_at)
+      expect(start_note.position.base_sha).to eq(inline_note.from_sha)
+      expect(start_note.position.start_sha).to eq(inline_note.from_sha)
+      expect(start_note.position.head_sha).to eq(inline_note.to_sha)
+      expect(start_note.position.old_line).to be_nil
+      expect(start_note.position.new_line).to eq(inline_note.new_pos)
+
+      reply_note = notes.last
+      # Make sure author and reply context is included
+      expect(reply_note.note).to start_with("*By #{reply.author_username} (#{reply.author_email})*\n\n")
+      expect(reply_note.note).to end_with("> #{inline_note.note}\n\n#{reply.note}")
+      expect(reply_note.author).to eq(project.owner)
+      expect(reply_note.created_at).to eq(reply.created_at)
+      expect(reply_note.updated_at).to eq(reply.created_at)
+      expect(reply_note.position.base_sha).to eq(inline_note.from_sha)
+      expect(reply_note.position.start_sha).to eq(inline_note.from_sha)
+      expect(reply_note.position.head_sha).to eq(inline_note.to_sha)
+      expect(reply_note.position.old_line).to be_nil
+      expect(reply_note.position.new_line).to eq(inline_note.new_pos)
+    end
+
+    it 'falls back to comments if diff comments fail to validate' do
+      reply = instance_double(
+        BitbucketServer::Representation::Comment,
+        author_email: 'someuser@gitlab.com',
+        author_username: 'Aquaman',
+        note: 'I agree',
+        created_at: now,
+        updated_at: now)
+
+      # https://gitlab.com/gitlab-org/gitlab-test/compare/c1acaa58bbcbc3eafe538cb8274ba387047b69f8...5937ac0a7beb003549fc5fd26fc247ad
+      inline_note = instance_double(
+        BitbucketServer::Representation::PullRequestComment,
+        file_type: 'REMOVED',
+        from_sha: sample.commits.first,
+        to_sha: sample.commits.last,
+        file_path: '.gitmodules',
+        old_pos: 8,
+        new_pos: 9,
+        note: 'This is a note with an invalid line position.',
+        author_email: project.owner.email,
+        author_username: 'Owner',
+        comments: [reply],
+        created_at: now,
+        updated_at: now,
+        parent_comment: nil)
+
+      inline_comment = instance_double(
+        BitbucketServer::Representation::Activity,
+        comment?: true,
+        inline_comment?: true,
+        merge_event?: false,
+        comment: inline_note)
+
+      allow(reply).to receive(:parent_comment).and_return(inline_note)
+
+      expect(subject.client).to receive(:activities).and_return([inline_comment])
+
+      expect { subject.execute }.to change { MergeRequest.count }.by(1)
+
+      merge_request = MergeRequest.first
+      expect(merge_request.notes.count).to eq(2)
+      notes = merge_request.notes
+
+      expect(notes.first.note).to start_with('*Comment on .gitmodules')
+      expect(notes.second.note).to start_with('*Comment on .gitmodules')
+    end
+  end
+
+  describe 'inaccessible branches' do
+    let(:id) { 10 }
+    let(:temp_branch_from) { "gitlab/import/pull-request/#{id}/from" }
+    let(:temp_branch_to) { "gitlab/import/pull-request/#{id}/to" }
+
+    before do
+      pull_request = instance_double(
+        BitbucketServer::Representation::PullRequest,
+        iid: id,
+        source_branch_sha: '12345678',
+        source_branch_name: Gitlab::Git::BRANCH_REF_PREFIX + sample.source_branch,
+        target_branch_sha: '98765432',
+        target_branch_name: Gitlab::Git::BRANCH_REF_PREFIX + sample.target_branch,
+        title: 'This is a title',
+        description: 'This is a test pull request',
+        state: 'merged',
+        author: 'Test Author',
+        author_email: project.owner.email,
+        created_at: Time.now,
+        updated_at: Time.now,
+        merged?: true)
+
+      expect(subject.client).to receive(:pull_requests).and_return([pull_request])
+      expect(subject.client).to receive(:activities).and_return([])
+      expect(subject).to receive(:import_repository).twice
+    end
+
+    it '#restore_branches' do
+      expect(subject).to receive(:restore_branches).and_call_original
+      expect(subject).to receive(:delete_temp_branches)
+      expect(subject.client).to receive(:create_branch)
+                                 .with(project_key, repo_slug,
+                                       temp_branch_from,
+                                       '12345678')
+      expect(subject.client).to receive(:create_branch)
+                                 .with(project_key, repo_slug,
+                                       temp_branch_to,
+                                       '98765432')
+
+      expect { subject.execute }.to change { MergeRequest.count }.by(1)
+    end
+
+    it '#delete_temp_branches' do
+      expect(subject.client).to receive(:create_branch).twice
+      expect(subject).to receive(:delete_temp_branches).and_call_original
+      expect(subject.client).to receive(:delete_branch)
+                                 .with(project_key, repo_slug,
+                                       temp_branch_from,
+                                       '12345678')
+      expect(subject.client).to receive(:delete_branch)
+                                 .with(project_key, repo_slug,
+                                       temp_branch_to,
+                                       '98765432')
+      expect(project.repository).to receive(:delete_branch).with(temp_branch_from)
+      expect(project.repository).to receive(:delete_branch).with(temp_branch_to)
+
+      expect { subject.execute }.to change { MergeRequest.count }.by(1)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_sources_spec.rb b/spec/lib/gitlab/import_sources_spec.rb
index 25827423914..94abf9679c4 100644
--- a/spec/lib/gitlab/import_sources_spec.rb
+++ b/spec/lib/gitlab/import_sources_spec.rb
@@ -5,15 +5,16 @@ describe Gitlab::ImportSources do
     it 'returns a hash' do
       expected =
         {
-          'GitHub'        => 'github',
-          'Bitbucket'     => 'bitbucket',
-          'GitLab.com'    => 'gitlab',
-          'Google Code'   => 'google_code',
-          'FogBugz'       => 'fogbugz',
-          'Repo by URL'   => 'git',
-          'GitLab export' => 'gitlab_project',
-          'Gitea'         => 'gitea',
-          'Manifest file' => 'manifest'
+          'GitHub'           => 'github',
+          'Bitbucket Cloud'  => 'bitbucket',
+          'Bitbucket Server' => 'bitbucket_server',
+          'GitLab.com'       => 'gitlab',
+          'Google Code'      => 'google_code',
+          'FogBugz'          => 'fogbugz',
+          'Repo by URL'      => 'git',
+          'GitLab export'    => 'gitlab_project',
+          'Gitea'            => 'gitea',
+          'Manifest file'    => 'manifest'
         }
 
       expect(described_class.options).to eq(expected)
@@ -26,6 +27,7 @@ describe Gitlab::ImportSources do
         %w(
           github
           bitbucket
+          bitbucket_server
           gitlab
           google_code
           fogbugz
@@ -45,6 +47,7 @@ describe Gitlab::ImportSources do
         %w(
           github
           bitbucket
+          bitbucket_server
           gitlab
           google_code
           fogbugz
@@ -60,6 +63,7 @@ describe Gitlab::ImportSources do
     import_sources = {
       'github' => Gitlab::GithubImport::ParallelImporter,
       'bitbucket' => Gitlab::BitbucketImport::Importer,
+      'bitbucket_server' => Gitlab::BitbucketServerImport::Importer,
       'gitlab' => Gitlab::GitlabImport::Importer,
       'google_code' => Gitlab::GoogleCodeImport::Importer,
       'fogbugz' => Gitlab::FogbugzImport::Importer,
@@ -79,7 +83,8 @@ describe Gitlab::ImportSources do
   describe '.title' do
     import_sources = {
       'github' => 'GitHub',
-      'bitbucket' => 'Bitbucket',
+      'bitbucket' => 'Bitbucket Cloud',
+      'bitbucket_server' => 'Bitbucket Server',
       'gitlab' => 'GitLab.com',
       'google_code' => 'Google Code',
       'fogbugz' => 'FogBugz',
@@ -97,7 +102,7 @@ describe Gitlab::ImportSources do
   end
 
   describe 'imports_repository? checker' do
-    let(:allowed_importers) { %w[github gitlab_project] }
+    let(:allowed_importers) { %w[github gitlab_project bitbucket_server] }
 
     it 'fails if any importer other than the allowed ones implements this method' do
       current_importers = described_class.values.select { |kind| described_class.importer(kind).try(:imports_repository?) }