From 99ddd1dcbed35b642d7bd8a52cc6e5e5453b9f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 15 Dec 2016 17:36:53 +0100
Subject: Modify GithubImport to support Gitea
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The reason is that Gitea plan to be GitHub-compatible so it makes sense
to just modify GitHubImport a bit for now, and hopefully we can change
it to GitHubishImport once Gitea is 100%-compatible.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 spec/controllers/import/gitea_controller_spec.rb   |   2 +-
 spec/lib/gitlab/github_import/client_spec.rb       |  46 ++-
 spec/lib/gitlab/github_import/importer_spec.rb     | 370 +++++++++++++--------
 .../github_import/issuable_formatter_spec.rb       |  21 ++
 .../gitlab/github_import/issue_formatter_spec.rb   |  38 ++-
 .../github_import/milestone_formatter_spec.rb      |  27 +-
 .../github_import/pull_request_formatter_spec.rb   |  34 +-
 spec/routing/import_routing_spec.rb                |   1 -
 .../githubish_import_controller_shared_context.rb  |  10 +
 .../githubish_import_controller_shared_examples.rb | 228 +++++++++++++
 .../githubish_import_controller_shared_context.rb  |  10 -
 .../githubish_import_controller_shared_examples.rb | 228 -------------
 12 files changed, 595 insertions(+), 420 deletions(-)
 create mode 100644 spec/lib/gitlab/github_import/issuable_formatter_spec.rb
 create mode 100644 spec/support/controllers/githubish_import_controller_shared_context.rb
 create mode 100644 spec/support/controllers/githubish_import_controller_shared_examples.rb
 delete mode 100644 spec/support/githubish_import_controller_shared_context.rb
 delete mode 100644 spec/support/githubish_import_controller_shared_examples.rb

(limited to 'spec')

diff --git a/spec/controllers/import/gitea_controller_spec.rb b/spec/controllers/import/gitea_controller_spec.rb
index 3064d1dd58a..3643386ffbc 100644
--- a/spec/controllers/import/gitea_controller_spec.rb
+++ b/spec/controllers/import/gitea_controller_spec.rb
@@ -29,7 +29,7 @@ describe Import::GiteaController do
       before do
         assign_host_url
       end
-      let(:extra_assign_expectations) { { gitea_root_url: host_url } }
+      let(:extra_assign_expectations) { { gitea_host_url: host_url } }
     end
   end
 
diff --git a/spec/lib/gitlab/github_import/client_spec.rb b/spec/lib/gitlab/github_import/client_spec.rb
index e829b936343..21f2a9e225b 100644
--- a/spec/lib/gitlab/github_import/client_spec.rb
+++ b/spec/lib/gitlab/github_import/client_spec.rb
@@ -45,20 +45,46 @@ describe Gitlab::GithubImport::Client, lib: true do
     end
   end
 
-  context 'when provider does not specity an API endpoint' do
-    it 'uses GitHub root API endpoint' do
-      expect(client.api.api_endpoint).to eq 'https://api.github.com/'
+  describe '#api_endpoint' do
+    context 'when provider does not specity an API endpoint' do
+      it 'uses GitHub root API endpoint' do
+        expect(client.api.api_endpoint).to eq 'https://api.github.com/'
+      end
     end
-  end
 
-  context 'when provider specify a custom API endpoint' do
-    before do
-      github_provider['args']['client_options']['site'] = 'https://github.company.com/'
+    context 'when provider specify a custom API endpoint' do
+      before do
+        github_provider['args']['client_options']['site'] = 'https://github.company.com/'
+      end
+
+      it 'uses the custom API endpoint' do
+        expect(OmniAuth::Strategies::GitHub).not_to receive(:default_options)
+        expect(client.api.api_endpoint).to eq 'https://github.company.com/'
+      end
+    end
+
+    context 'when given a host' do
+      subject(:client) { described_class.new(token, host: 'https://try.gitea.io/') }
+
+      it 'builds a endpoint with the given host and the default API version' do
+        expect(client.api.api_endpoint).to eq 'https://try.gitea.io/api/v3/'
+      end
     end
 
-    it 'uses the custom API endpoint' do
-      expect(OmniAuth::Strategies::GitHub).not_to receive(:default_options)
-      expect(client.api.api_endpoint).to eq 'https://github.company.com/'
+    context 'when given an API version' do
+      subject(:client) { described_class.new(token, api_version: 'v3') }
+
+      it 'does not use the API version without a host' do
+        expect(client.api.api_endpoint).to eq 'https://api.github.com/'
+      end
+    end
+
+    context 'when given a host and version' do
+      subject(:client) { described_class.new(token, host: 'https://try.gitea.io/', api_version: 'v3') }
+
+      it 'builds a endpoint with the given options' do
+        expect(client.api.api_endpoint).to eq 'https://try.gitea.io/api/v3/'
+      end
     end
   end
 
diff --git a/spec/lib/gitlab/github_import/importer_spec.rb b/spec/lib/gitlab/github_import/importer_spec.rb
index 9e027839f59..0a03b7353f6 100644
--- a/spec/lib/gitlab/github_import/importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer_spec.rb
@@ -1,169 +1,251 @@
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Importer, lib: true do
-  describe '#execute' do
+  shared_examples 'Gitlab::GithubImport::Importer#execute' do
+    let(:expected_not_called) { [] }
+
     before do
-      allow(Rails).to receive(:cache).and_return(ActiveSupport::Cache::MemoryStore.new)
+      allow(project).to receive(:import_data).and_return(double.as_null_object)
     end
 
-    context 'when an error occurs' do
-      let(:project) { create(:project, import_url: 'https://github.com/octocat/Hello-World.git', wiki_access_level: ProjectFeature::DISABLED) }
-      let(:octocat) { double(id: 123456, login: 'octocat') }
-      let(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') }
-      let(:updated_at) { DateTime.strptime('2011-01-27T19:01:12Z') }
-      let(:repository) { double(id: 1, fork: false) }
-      let(:source_sha) { create(:commit, project: project).id }
-      let(:source_branch) { double(ref: 'feature', repo: repository, sha: source_sha) }
-      let(:target_sha) { create(:commit, project: project, git_commit: RepoHelpers.another_sample_commit).id }
-      let(:target_branch) { double(ref: 'master', repo: repository, sha: target_sha) }
-
-      let(:label1) do
-        double(
-          name: 'Bug',
-          color: 'ff0000',
-          url: 'https://api.github.com/repos/octocat/Hello-World/labels/bug'
-        )
-      end
+    it 'calls import methods' do
+      importer = described_class.new(project)
 
-      let(:label2) do
-        double(
-          name: nil,
-          color: 'ff0000',
-          url: 'https://api.github.com/repos/octocat/Hello-World/labels/bug'
-        )
-      end
+      expected_called = [
+        :import_labels, :import_milestones, :import_pull_requests, :import_issues,
+        :import_wiki, :import_releases, :handle_errors
+      ]
 
-      let(:milestone) do
-        double(
-          number: 1347,
-          state: 'open',
-          title: '1.0',
-          description: 'Version 1.0',
-          due_on: nil,
-          created_at: created_at,
-          updated_at: updated_at,
-          closed_at: nil,
-          url: 'https://api.github.com/repos/octocat/Hello-World/milestones/1'
-        )
-      end
+      expected_called -= expected_not_called
 
-      let(:issue1) do
-        double(
-          number: 1347,
-          milestone: nil,
-          state: 'open',
-          title: 'Found a bug',
-          body: "I'm having a problem with this.",
-          assignee: nil,
-          user: octocat,
-          comments: 0,
-          pull_request: nil,
-          created_at: created_at,
-          updated_at: updated_at,
-          closed_at: nil,
-          url: 'https://api.github.com/repos/octocat/Hello-World/issues/1347',
-          labels: [double(name: 'Label #1')],
-        )
-      end
+      aggregate_failures do
+        expected_called.each do |method_name|
+          expect(importer).to receive(method_name)
+        end
 
-      let(:issue2) do
-        double(
-          number: 1348,
-          milestone: nil,
-          state: 'open',
-          title: nil,
-          body: "I'm having a problem with this.",
-          assignee: nil,
-          user: octocat,
-          comments: 0,
-          pull_request: nil,
-          created_at: created_at,
-          updated_at: updated_at,
-          closed_at: nil,
-          url: 'https://api.github.com/repos/octocat/Hello-World/issues/1348',
-          labels: [double(name: 'Label #2')],
-        )
-      end
+        expect(importer).to receive(:import_comments).with(:issues)
+        expect(importer).to receive(:import_comments).with(:pull_requests)
 
-      let(:pull_request) do
-        double(
-          number: 1347,
-          milestone: nil,
-          state: 'open',
-          title: 'New feature',
-          body: 'Please pull these awesome changes',
-          head: source_branch,
-          base: target_branch,
-          assignee: nil,
-          user: octocat,
-          created_at: created_at,
-          updated_at: updated_at,
-          closed_at: nil,
-          merged_at: nil,
-          url: 'https://api.github.com/repos/octocat/Hello-World/pulls/1347',
-        )
+        expected_not_called.each do |method_name|
+          expect(importer).not_to receive(method_name)
+        end
       end
 
-      let(:release1) do
-        double(
-          tag_name: 'v1.0.0',
-          name: 'First release',
-          body: 'Release v1.0.0',
-          draft: false,
-          created_at: created_at,
-          updated_at: updated_at,
-          url: 'https://api.github.com/repos/octocat/Hello-World/releases/1'
-        )
-      end
+      importer.execute
+    end
+  end
 
-      let(:release2) do
-        double(
-          tag_name: 'v2.0.0',
-          name: 'Second release',
-          body: nil,
-          draft: false,
-          created_at: created_at,
-          updated_at: updated_at,
-          url: 'https://api.github.com/repos/octocat/Hello-World/releases/2'
-        )
-      end
+  shared_examples 'Gitlab::GithubImport::Importer#execute an error occurs' do
+    before do
+      allow(project).to receive(:import_data).and_return(double.as_null_object)
 
-      before do
-        allow(project).to receive(:import_data).and_return(double.as_null_object)
-        allow_any_instance_of(Octokit::Client).to receive(:rate_limit!).and_raise(Octokit::NotFound)
-        allow_any_instance_of(Octokit::Client).to receive(:labels).and_return([label1, label2])
-        allow_any_instance_of(Octokit::Client).to receive(:milestones).and_return([milestone, milestone])
-        allow_any_instance_of(Octokit::Client).to receive(:issues).and_return([issue1, issue2])
-        allow_any_instance_of(Octokit::Client).to receive(:pull_requests).and_return([pull_request, pull_request])
-        allow_any_instance_of(Octokit::Client).to receive(:issues_comments).and_return([])
-        allow_any_instance_of(Octokit::Client).to receive(:pull_requests_comments).and_return([])
-        allow_any_instance_of(Octokit::Client).to receive(:last_response).and_return(double(rels: { next: nil }))
-        allow_any_instance_of(Octokit::Client).to receive(:releases).and_return([release1, release2])
-        allow_any_instance_of(Gitlab::Shell).to receive(:import_repository).and_raise(Gitlab::Shell::Error)
-      end
+      allow(Rails).to receive(:cache).and_return(ActiveSupport::Cache::MemoryStore.new)
+
+      allow_any_instance_of(Octokit::Client).to receive(:rate_limit!).and_raise(Octokit::NotFound)
+      allow_any_instance_of(Gitlab::Shell).to receive(:import_repository).and_raise(Gitlab::Shell::Error)
+
+      allow_any_instance_of(Octokit::Client).to receive(:labels).and_return([label1, label2])
+      allow_any_instance_of(Octokit::Client).to receive(:milestones).and_return([milestone, milestone])
+      allow_any_instance_of(Octokit::Client).to receive(:issues).and_return([issue1, issue2])
+      allow_any_instance_of(Octokit::Client).to receive(:pull_requests).and_return([pull_request, pull_request])
+      allow_any_instance_of(Octokit::Client).to receive(:issues_comments).and_return([])
+      allow_any_instance_of(Octokit::Client).to receive(:pull_requests_comments).and_return([])
+      allow_any_instance_of(Octokit::Client).to receive(:last_response).and_return(double(rels: { next: nil }))
+      allow_any_instance_of(Octokit::Client).to receive(:releases).and_return([release1, release2])
+    end
+    let(:octocat) { double(id: 123456, login: 'octocat') }
+    let(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') }
+    let(:updated_at) { DateTime.strptime('2011-01-27T19:01:12Z') }
+    let(:label1) do
+      double(
+        name: 'Bug',
+        color: 'ff0000',
+        url: "#{api_root}/repos/octocat/Hello-World/labels/bug"
+      )
+    end
+
+    let(:label2) do
+      double(
+        name: nil,
+        color: 'ff0000',
+        url: "#{api_root}/repos/octocat/Hello-World/labels/bug"
+      )
+    end
+
+    let(:milestone) do
+      double(
+        id: 1347, # For Gitea
+        number: 1347,
+        state: 'open',
+        title: '1.0',
+        description: 'Version 1.0',
+        due_on: nil,
+        created_at: created_at,
+        updated_at: updated_at,
+        closed_at: nil,
+        url: "#{api_root}/repos/octocat/Hello-World/milestones/1"
+      )
+    end
 
-      it 'returns true' do
-        expect(described_class.new(project).execute).to eq true
+    let(:issue1) do
+      double(
+        number: 1347,
+        milestone: nil,
+        state: 'open',
+        title: 'Found a bug',
+        body: "I'm having a problem with this.",
+        assignee: nil,
+        user: octocat,
+        comments: 0,
+        pull_request: nil,
+        created_at: created_at,
+        updated_at: updated_at,
+        closed_at: nil,
+        url: "#{api_root}/repos/octocat/Hello-World/issues/1347",
+        labels: [double(name: 'Label #1')]
+      )
+    end
+
+    let(:issue2) do
+      double(
+        number: 1348,
+        milestone: nil,
+        state: 'open',
+        title: nil,
+        body: "I'm having a problem with this.",
+        assignee: nil,
+        user: octocat,
+        comments: 0,
+        pull_request: nil,
+        created_at: created_at,
+        updated_at: updated_at,
+        closed_at: nil,
+        url: "#{api_root}/repos/octocat/Hello-World/issues/1348",
+        labels: [double(name: 'Label #2')]
+      )
+    end
+
+    let(:repository) { double(id: 1, fork: false) }
+    let(:source_sha) { create(:commit, project: project).id }
+    let(:source_branch) { double(ref: 'feature', repo: repository, sha: source_sha) }
+    let(:target_sha) { create(:commit, project: project, git_commit: RepoHelpers.another_sample_commit).id }
+    let(:target_branch) { double(ref: 'master', repo: repository, sha: target_sha) }
+    let(:pull_request) do
+      double(
+        number: 1347,
+        milestone: nil,
+        state: 'open',
+        title: 'New feature',
+        body: 'Please pull these awesome changes',
+        head: source_branch,
+        base: target_branch,
+        assignee: nil,
+        user: octocat,
+        created_at: created_at,
+        updated_at: updated_at,
+        closed_at: nil,
+        merged_at: nil,
+        url: "#{api_root}/repos/octocat/Hello-World/pulls/1347",
+        labels: [double(name: 'Label #2')]
+      )
+    end
+
+    let(:release1) do
+      double(
+        tag_name: 'v1.0.0',
+        name: 'First release',
+        body: 'Release v1.0.0',
+        draft: false,
+        created_at: created_at,
+        updated_at: updated_at,
+        url: "#{api_root}/repos/octocat/Hello-World/releases/1"
+      )
+    end
+
+    let(:release2) do
+      double(
+        tag_name: 'v2.0.0',
+        name: 'Second release',
+        body: nil,
+        draft: false,
+        created_at: created_at,
+        updated_at: updated_at,
+        url: "#{api_root}/repos/octocat/Hello-World/releases/2"
+      )
+    end
+
+    it 'returns true' do
+      expect(described_class.new(project).execute).to eq true
+    end
+
+    it 'does not raise an error' do
+      expect { described_class.new(project).execute }.not_to raise_error
+    end
+
+    it 'stores error messages' do
+      error = {
+        message: 'The remote data could not be fully imported.',
+        errors: [
+          { type: :label, url: "#{api_root}/repos/octocat/Hello-World/labels/bug", errors: "Validation failed: Title can't be blank, Title is invalid" },
+          { type: :issue, url: "#{api_root}/repos/octocat/Hello-World/issues/1348", errors: "Validation failed: Title can't be blank" },
+          { type: :wiki, errors: "Gitlab::Shell::Error" }
+        ]
+      }
+
+      unless project.import_type == 'gitea'
+        error[:errors] << { type: :release, url: "#{api_root}/repos/octocat/Hello-World/releases/2", errors: "Validation failed: Description can't be blank" }
       end
 
-      it 'does not raise an error' do
-        expect { described_class.new(project).execute }.not_to raise_error
+      described_class.new(project).execute
+
+      expect(project.import_error).to eq error.to_json
+    end
+  end
+
+  let(:project) { create(:project, import_url: "#{repo_root}/octocat/Hello-World.git", wiki_access_level: ProjectFeature::DISABLED) }
+  let(:credentials) { { user: 'joe' } }
+
+  context 'when importing a GitHub project' do
+    let(:api_root) { 'https://api.github.com' }
+    let(:repo_root) { 'https://github.com' }
+
+    it_behaves_like 'Gitlab::GithubImport::Importer#execute'
+    it_behaves_like 'Gitlab::GithubImport::Importer#execute an error occurs'
+
+    describe '#client' do
+      it 'instantiates a Client' do
+        allow(project).to receive(:import_data).and_return(double(credentials: credentials))
+        expect(Gitlab::GithubImport::Client).to receive(:new).with(
+          credentials[:user],
+          {}
+        )
+
+        described_class.new(project).client
       end
+    end
+  end
 
-      it 'stores error messages' do
-        error = {
-          message: 'The remote data could not be fully imported.',
-          errors: [
-            { type: :label, url: "https://api.github.com/repos/octocat/Hello-World/labels/bug", errors: "Validation failed: Title can't be blank, Title is invalid" },
-            { type: :issue, url: "https://api.github.com/repos/octocat/Hello-World/issues/1348", errors: "Validation failed: Title can't be blank" },
-            { type: :wiki, errors: "Gitlab::Shell::Error" },
-            { type: :release, url: 'https://api.github.com/repos/octocat/Hello-World/releases/2', errors: "Validation failed: Description can't be blank" }
-          ]
-        }
+  context 'when importing a Gitea project' do
+    let(:api_root) { 'https://try.gitea.io/api/v1' }
+    let(:repo_root) { 'https://try.gitea.io' }
+    before do
+      project.update(import_type: 'gitea', import_url: "#{repo_root}/foo/group/project.git")
+    end
 
-        described_class.new(project).execute
+    it_behaves_like 'Gitlab::GithubImport::Importer#execute' do
+      let(:expected_not_called) { [:import_releases] }
+    end
+    it_behaves_like 'Gitlab::GithubImport::Importer#execute an error occurs'
+
+    describe '#client' do
+      it 'instantiates a Client' do
+        allow(project).to receive(:import_data).and_return(double(credentials: credentials))
+        expect(Gitlab::GithubImport::Client).to receive(:new).with(
+          credentials[:user],
+          { host: "#{repo_root}:443/foo", api_version: 'v1' }
+        )
 
-        expect(project.import_error).to eq error.to_json
+        described_class.new(project).client
       end
     end
   end
diff --git a/spec/lib/gitlab/github_import/issuable_formatter_spec.rb b/spec/lib/gitlab/github_import/issuable_formatter_spec.rb
new file mode 100644
index 00000000000..6bc5f98ed2c
--- /dev/null
+++ b/spec/lib/gitlab/github_import/issuable_formatter_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::IssuableFormatter, lib: true do
+  let(:raw_data) do
+    double(number: 42)
+  end
+  let(:project) { double(import_type: 'github') }
+  let(:issuable_formatter) { described_class.new(project, raw_data) }
+
+  describe '#project_association' do
+    it { expect { issuable_formatter.project_association }.to raise_error(NotImplementedError) }
+  end
+
+  describe '#number' do
+    it { expect(issuable_formatter.number).to eq(42) }
+  end
+
+  describe '#find_condition' do
+    it { expect(issuable_formatter.find_condition).to eq({ iid: 42 }) }
+  end
+end
diff --git a/spec/lib/gitlab/github_import/issue_formatter_spec.rb b/spec/lib/gitlab/github_import/issue_formatter_spec.rb
index 95339e2f128..e31ed9c1fa0 100644
--- a/spec/lib/gitlab/github_import/issue_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/issue_formatter_spec.rb
@@ -23,9 +23,9 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
     }
   end
 
-  subject(:issue) { described_class.new(project, raw_data)}
+  subject(:issue) { described_class.new(project, raw_data) }
 
-  describe '#attributes' do
+  shared_examples 'Gitlab::GithubImport::IssueFormatter#attributes' do
     context 'when issue is open' do
       let(:raw_data) { double(base_data.merge(state: 'open')) }
 
@@ -83,7 +83,7 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
     end
 
     context 'when it has a milestone' do
-      let(:milestone) { double(number: 45) }
+      let(:milestone) { double(id: 42, number: 42) }
       let(:raw_data) { double(base_data.merge(milestone: milestone)) }
 
       it 'returns nil when milestone does not exist' do
@@ -91,7 +91,7 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
       end
 
       it 'returns milestone when it exists' do
-        milestone = create(:milestone, project: project, iid: 45)
+        milestone = create(:milestone, project: project, iid: 42)
 
         expect(issue.attributes.fetch(:milestone)).to eq milestone
       end
@@ -118,6 +118,28 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
     end
   end
 
+  shared_examples 'Gitlab::GithubImport::IssueFormatter#number' do
+    let(:raw_data) { double(base_data.merge(number: 1347)) }
+
+    it 'returns issue number' do
+      expect(issue.number).to eq 1347
+    end
+  end
+
+  context 'when importing a GitHub project' do
+    it_behaves_like 'Gitlab::GithubImport::IssueFormatter#attributes'
+    it_behaves_like 'Gitlab::GithubImport::IssueFormatter#number'
+  end
+
+  context 'when importing a Gitea project' do
+    before do
+      project.update(import_type: 'gitea')
+    end
+
+    it_behaves_like 'Gitlab::GithubImport::IssueFormatter#attributes'
+    it_behaves_like 'Gitlab::GithubImport::IssueFormatter#number'
+  end
+
   describe '#has_comments?' do
     context 'when number of comments is greater than zero' do
       let(:raw_data) { double(base_data.merge(comments: 1)) }
@@ -136,14 +158,6 @@ describe Gitlab::GithubImport::IssueFormatter, lib: true do
     end
   end
 
-  describe '#number' do
-    let(:raw_data) { double(base_data.merge(number: 1347)) }
-
-    it 'returns pull request number' do
-      expect(issue.number).to eq 1347
-    end
-  end
-
   describe '#pull_request?' do
     context 'when mention a pull request' do
       let(:raw_data) { double(base_data.merge(pull_request: double)) }
diff --git a/spec/lib/gitlab/github_import/milestone_formatter_spec.rb b/spec/lib/gitlab/github_import/milestone_formatter_spec.rb
index 09337c99a07..6d38041c468 100644
--- a/spec/lib/gitlab/github_import/milestone_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/milestone_formatter_spec.rb
@@ -6,7 +6,6 @@ describe Gitlab::GithubImport::MilestoneFormatter, lib: true do
   let(:updated_at) { DateTime.strptime('2011-01-27T19:01:12Z') }
   let(:base_data) do
     {
-      number: 1347,
       state: 'open',
       title: '1.0',
       description: 'Version 1.0',
@@ -16,12 +15,15 @@ describe Gitlab::GithubImport::MilestoneFormatter, lib: true do
       closed_at: nil
     }
   end
+  let(:iid_attr) { :number }
 
-  subject(:formatter) { described_class.new(project, raw_data)}
+  subject(:formatter) { described_class.new(project, raw_data) }
+
+  shared_examples 'Gitlab::GithubImport::MilestoneFormatter#attributes' do
+    let(:data) { base_data.merge(iid_attr => 1347) }
 
-  describe '#attributes' do
     context 'when milestone is open' do
-      let(:raw_data) { double(base_data.merge(state: 'open')) }
+      let(:raw_data) { double(data.merge(state: 'open')) }
 
       it 'returns formatted attributes' do
         expected = {
@@ -40,7 +42,7 @@ describe Gitlab::GithubImport::MilestoneFormatter, lib: true do
     end
 
     context 'when milestone is closed' do
-      let(:raw_data) { double(base_data.merge(state: 'closed')) }
+      let(:raw_data) { double(data.merge(state: 'closed')) }
 
       it 'returns formatted attributes' do
         expected = {
@@ -60,7 +62,7 @@ describe Gitlab::GithubImport::MilestoneFormatter, lib: true do
 
     context 'when milestone has a due date' do
       let(:due_date) { DateTime.strptime('2011-01-28T19:01:12Z') }
-      let(:raw_data) { double(base_data.merge(due_on: due_date)) }
+      let(:raw_data) { double(data.merge(due_on: due_date)) }
 
       it 'returns formatted attributes' do
         expected = {
@@ -78,4 +80,17 @@ describe Gitlab::GithubImport::MilestoneFormatter, lib: true do
       end
     end
   end
+
+  context 'when importing a GitHub project' do
+    it_behaves_like 'Gitlab::GithubImport::MilestoneFormatter#attributes'
+  end
+
+  context 'when importing a Gitea project' do
+    let(:iid_attr) { :id }
+    before do
+      project.update(import_type: 'gitea')
+    end
+
+    it_behaves_like 'Gitlab::GithubImport::MilestoneFormatter#attributes'
+  end
 end
diff --git a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
index 302f0fc0623..2b3256edcb2 100644
--- a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
@@ -32,9 +32,9 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
     }
   end
 
-  subject(:pull_request) { described_class.new(project, raw_data)}
+  subject(:pull_request) { described_class.new(project, raw_data) }
 
-  describe '#attributes' do
+  shared_examples 'Gitlab::GithubImport::PullRequestFormatter#attributes' do
     context 'when pull request is open' do
       let(:raw_data) { double(base_data.merge(state: 'open')) }
 
@@ -149,7 +149,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
     end
 
     context 'when it has a milestone' do
-      let(:milestone) { double(number: 45) }
+      let(:milestone) { double(id: 42, number: 42) }
       let(:raw_data) { double(base_data.merge(milestone: milestone)) }
 
       it 'returns nil when milestone does not exist' do
@@ -157,22 +157,22 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
       end
 
       it 'returns milestone when it exists' do
-        milestone = create(:milestone, project: project, iid: 45)
+        milestone = create(:milestone, project: project, iid: 42)
 
         expect(pull_request.attributes.fetch(:milestone)).to eq milestone
       end
     end
   end
 
-  describe '#number' do
-    let(:raw_data) { double(base_data.merge(number: 1347)) }
+  shared_examples 'Gitlab::GithubImport::PullRequestFormatter#number' do
+    let(:raw_data) { double(base_data) }
 
     it 'returns pull request number' do
       expect(pull_request.number).to eq 1347
     end
   end
 
-  describe '#source_branch_name' do
+  shared_examples 'Gitlab::GithubImport::PullRequestFormatter#source_branch_name' do
     context 'when source branch exists' do
       let(:raw_data) { double(base_data) }
 
@@ -190,7 +190,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
     end
   end
 
-  describe '#target_branch_name' do
+  shared_examples 'Gitlab::GithubImport::PullRequestFormatter#target_branch_name' do
     context 'when source branch exists' do
       let(:raw_data) { double(base_data) }
 
@@ -208,6 +208,24 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
     end
   end
 
+  context 'when importing a GitHub project' do
+    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#attributes'
+    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#number'
+    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#source_branch_name'
+    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#target_branch_name'
+  end
+
+  context 'when importing a Gitea project' do
+    before do
+      project.update(import_type: 'gitea')
+    end
+
+    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#attributes'
+    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#number'
+    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#source_branch_name'
+    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#target_branch_name'
+  end
+
   describe '#valid?' do
     context 'when source, and target repos are not a fork' do
       let(:raw_data) { double(base_data) }
diff --git a/spec/routing/import_routing_spec.rb b/spec/routing/import_routing_spec.rb
index f1234ff470b..78ff9c6e6fd 100644
--- a/spec/routing/import_routing_spec.rb
+++ b/spec/routing/import_routing_spec.rb
@@ -75,7 +75,6 @@ describe Import::GiteaController, 'routing' do
   it 'to #personal_access_token' do
     expect(post('/import/gitea/personal_access_token')).to route_to('import/gitea#personal_access_token')
   end
-
 end
 
 #   status_import_gitlab GET      /import/gitlab/status(.:format)                                                               import/gitlab#status
diff --git a/spec/support/controllers/githubish_import_controller_shared_context.rb b/spec/support/controllers/githubish_import_controller_shared_context.rb
new file mode 100644
index 00000000000..e71994edec6
--- /dev/null
+++ b/spec/support/controllers/githubish_import_controller_shared_context.rb
@@ -0,0 +1,10 @@
+shared_context 'a GitHub-ish import controller' do
+  let(:user) { create(:user) }
+  let(:token) { "asdasd12345" }
+  let(:access_params) { { github_access_token: token } }
+
+  before do
+    sign_in(user)
+    allow(controller).to receive(:"#{provider}_import_enabled?").and_return(true)
+  end
+end
diff --git a/spec/support/controllers/githubish_import_controller_shared_examples.rb b/spec/support/controllers/githubish_import_controller_shared_examples.rb
new file mode 100644
index 00000000000..e11ab802095
--- /dev/null
+++ b/spec/support/controllers/githubish_import_controller_shared_examples.rb
@@ -0,0 +1,228 @@
+# Specifications for behavior common to all objects with an email attribute.
+# Takes a list of email-format attributes and requires:
+# - subject { "the object with a attribute= setter"  }
+#   Note: You have access to `email_value` which is the email address value
+#         being currently tested).
+
+shared_examples 'a GitHub-ish import controller: POST personal_access_token' do
+  let(:status_import_url) { public_send("status_import_#{provider}_url") }
+
+  it "updates access token" do
+    token = 'asdfasdf9876'
+
+    allow_any_instance_of(Gitlab::GithubImport::Client).
+      to receive(:user).and_return(true)
+
+    post :personal_access_token, personal_access_token: token
+
+    expect(session[:access_token]).to eq(token)
+    expect(controller).to redirect_to(status_import_url)
+  end
+end
+
+shared_examples 'a GitHub-ish import controller: GET new' do
+  let(:status_import_url) { public_send("status_import_#{provider}_url") }
+
+  it "redirects to status if we already have a token" do
+    assign_session_token
+    allow(controller).to receive(:logged_in_with_provider?).and_return(false)
+
+    get :new
+
+    expect(controller).to redirect_to(status_import_url)
+  end
+
+  it "renders the :new page if no token is present in session" do
+    get :new
+
+    expect(response).to render_template(:new)
+  end
+end
+
+shared_examples 'a GitHub-ish import controller: GET status' do
+  let(:new_import_url) { public_send("new_import_#{provider}_url") }
+  let(:user) { create(:user) }
+  let(:repo) { OpenStruct.new(login: 'vim', full_name: 'asd/vim') }
+  let(:org) { OpenStruct.new(login: 'company') }
+  let(:org_repo) { OpenStruct.new(login: 'company', full_name: 'company/repo') }
+  let(:extra_assign_expectations) { {} }
+
+  before do
+    assign_session_token
+  end
+
+  it "assigns variables" do
+    project = create(:empty_project, import_type: provider, creator_id: user.id)
+    stub_client(repos: [repo, org_repo], orgs: [org], org_repos: [org_repo])
+
+    get :status
+
+    expect(assigns(:already_added_projects)).to eq([project])
+    expect(assigns(:repos)).to eq([repo, org_repo])
+    extra_assign_expectations.each do |key, value|
+      expect(assigns(key)).to eq(value)
+    end
+  end
+
+  it "does not show already added project" do
+    project = create(:empty_project, import_type: provider, creator_id: user.id, import_source: 'asd/vim')
+    stub_client(repos: [repo], orgs: [])
+
+    get :status
+
+    expect(assigns(:already_added_projects)).to eq([project])
+    expect(assigns(:repos)).to eq([])
+  end
+
+  it "handles an invalid access token" do
+    allow_any_instance_of(Gitlab::GithubImport::Client).
+      to receive(:repos).and_raise(Octokit::Unauthorized)
+
+    get :status
+
+    expect(session[:access_token]).to eq(nil)
+    expect(controller).to redirect_to(new_import_url)
+    expect(flash[:alert]).to eq("Access denied to your #{Gitlab::ImportSources.title(provider.to_s)} account.")
+  end
+end
+
+shared_examples 'a GitHub-ish import controller: POST create' do
+  let(:user) { create(:user) }
+  let(:provider_username) { user.username }
+  let(:provider_user) { OpenStruct.new(login: provider_username) }
+  let(:provider_repo) do
+    OpenStruct.new(
+      name: 'vim',
+      full_name: "#{provider_username}/vim",
+      owner: OpenStruct.new(login: provider_username)
+    )
+  end
+
+  before do
+    stub_client(user: provider_user, repo: provider_repo)
+    assign_session_token
+  end
+
+  context "when the repository owner is the Gitea user" do
+    context "when the Gitea user and GitLab user's usernames match" do
+      it "takes the current user's namespace" do
+        expect(Gitlab::GithubImport::ProjectCreator).
+          to receive(:new).with(provider_repo, provider_repo.name, user.namespace, user, access_params, type: provider).
+            and_return(double(execute: true))
+
+        post :create, format: :js
+      end
+    end
+
+    context "when the Gitea user and GitLab user's usernames don't match" do
+      let(:provider_username) { "someone_else" }
+
+      it "takes the current user's namespace" do
+        expect(Gitlab::GithubImport::ProjectCreator).
+          to receive(:new).with(provider_repo, provider_repo.name, user.namespace, user, access_params, type: provider).
+            and_return(double(execute: true))
+
+        post :create, format: :js
+      end
+    end
+  end
+
+  context "when the repository owner is not the Gitea user" do
+    let(:other_username) { "someone_else" }
+
+    before do
+      provider_repo.owner = OpenStruct.new(login: other_username)
+      assign_session_token
+    end
+
+    context "when a namespace with the Gitea user's username already exists" do
+      let!(:existing_namespace) { create(:namespace, name: other_username, owner: user) }
+
+      context "when the namespace is owned by the GitLab user" do
+        it "takes the existing namespace" do
+          expect(Gitlab::GithubImport::ProjectCreator).
+            to receive(:new).with(provider_repo, provider_repo.name, existing_namespace, user, access_params, type: provider).
+              and_return(double(execute: true))
+
+          post :create, format: :js
+        end
+      end
+
+      context "when the namespace is not owned by the GitLab user" do
+        before do
+          existing_namespace.owner = create(:user)
+          existing_namespace.save
+        end
+
+        it "creates a project using user's namespace" do
+          expect(Gitlab::GithubImport::ProjectCreator).
+            to receive(:new).with(provider_repo, provider_repo.name, user.namespace, user, access_params, type: provider).
+              and_return(double(execute: true))
+
+          post :create, format: :js
+        end
+      end
+    end
+
+    context "when a namespace with the Gitea user's username doesn't exist" do
+      context "when current user can create namespaces" do
+        it "creates the namespace" do
+          expect(Gitlab::GithubImport::ProjectCreator).
+            to receive(:new).and_return(double(execute: true))
+
+          expect { post :create, target_namespace: provider_repo.name, format: :js }.to change(Namespace, :count).by(1)
+        end
+
+        it "takes the new namespace" do
+          expect(Gitlab::GithubImport::ProjectCreator).
+            to receive(:new).with(provider_repo, provider_repo.name, an_instance_of(Group), user, access_params, type: provider).
+            and_return(double(execute: true))
+
+          post :create, target_namespace: provider_repo.name, format: :js
+        end
+      end
+
+      context "when current user can't create namespaces" do
+        before do
+          user.update_attribute(:can_create_group, false)
+        end
+
+        it "doesn't create the namespace" do
+          expect(Gitlab::GithubImport::ProjectCreator).
+            to receive(:new).and_return(double(execute: true))
+
+          expect { post :create, format: :js }.not_to change(Namespace, :count)
+        end
+
+        it "takes the current user's namespace" do
+          expect(Gitlab::GithubImport::ProjectCreator).
+            to receive(:new).with(provider_repo, provider_repo.name, user.namespace, user, access_params, type: provider).
+            and_return(double(execute: true))
+
+          post :create, format: :js
+        end
+      end
+    end
+
+    context 'user has chosen a namespace and name for the project' do
+      let(:test_namespace) { create(:namespace, name: 'test_namespace', owner: user) }
+      let(:test_name) { 'test_name' }
+
+      it 'takes the selected namespace and name' do
+        expect(Gitlab::GithubImport::ProjectCreator).
+          to receive(:new).with(provider_repo, test_name, test_namespace, user, access_params, type: provider).
+            and_return(double(execute: true))
+
+        post :create, { target_namespace: test_namespace.name, new_name: test_name, format: :js }
+      end
+
+      it 'takes the selected name and default namespace' do
+        expect(Gitlab::GithubImport::ProjectCreator).
+          to receive(:new).with(provider_repo, test_name, user.namespace, user, access_params, type: provider).
+            and_return(double(execute: true))
+
+        post :create, { new_name: test_name, format: :js }
+      end
+    end
+  end
+end
diff --git a/spec/support/githubish_import_controller_shared_context.rb b/spec/support/githubish_import_controller_shared_context.rb
deleted file mode 100644
index e71994edec6..00000000000
--- a/spec/support/githubish_import_controller_shared_context.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-shared_context 'a GitHub-ish import controller' do
-  let(:user) { create(:user) }
-  let(:token) { "asdasd12345" }
-  let(:access_params) { { github_access_token: token } }
-
-  before do
-    sign_in(user)
-    allow(controller).to receive(:"#{provider}_import_enabled?").and_return(true)
-  end
-end
diff --git a/spec/support/githubish_import_controller_shared_examples.rb b/spec/support/githubish_import_controller_shared_examples.rb
deleted file mode 100644
index aa2d8aed0bd..00000000000
--- a/spec/support/githubish_import_controller_shared_examples.rb
+++ /dev/null
@@ -1,228 +0,0 @@
-# Specifications for behavior common to all objects with an email attribute.
-# Takes a list of email-format attributes and requires:
-# - subject { "the object with a attribute= setter"  }
-#   Note: You have access to `email_value` which is the email address value
-#         being currently tested).
-
-shared_examples 'a GitHub-ish import controller: POST personal_access_token' do
-  let(:status_import_url) { public_send("status_import_#{provider}_url") }
-
-  it "updates access token" do
-    token = 'asdfasdf9876'
-
-    allow_any_instance_of(Gitlab::GithubImport::Client).
-      to receive(:user).and_return(true)
-
-    post :personal_access_token, personal_access_token: token
-
-    expect(session[:access_token]).to eq(token)
-    expect(controller).to redirect_to(status_import_url)
-  end
-end
-
-shared_examples 'a GitHub-ish import controller: GET new' do
-  let(:status_import_url) { public_send("status_import_#{provider}_url") }
-
-  it "redirects to status if we already have a token" do
-    assign_session_token
-    allow(controller).to receive(:logged_in_with_provider?).and_return(false)
-
-    get :new
-
-    expect(controller).to redirect_to(status_import_url)
-  end
-
-  it "renders the :new page if no token is present in session" do
-    get :new
-
-    expect(response).to render_template(:new)
-  end
-end
-
-shared_examples 'a GitHub-ish import controller: GET status' do
-  let(:new_import_url) { public_send("new_import_#{provider}_url") }
-  let(:user) { create(:user) }
-  let(:repo) { OpenStruct.new(login: 'vim', full_name: 'asd/vim') }
-  let(:org) { OpenStruct.new(login: 'company') }
-  let(:org_repo) { OpenStruct.new(login: 'company', full_name: 'company/repo') }
-  let(:extra_assign_expectations) { {} }
-
-  before do
-    assign_session_token
-  end
-
-  it "assigns variables" do
-    project = create(:empty_project, import_type: provider, creator_id: user.id)
-    stub_client(repos: [repo, org_repo], orgs: [org], org_repos: [org_repo])
-
-    get :status
-
-    expect(assigns(:already_added_projects)).to eq([project])
-    expect(assigns(:repos)).to eq([repo, org_repo])
-    extra_assign_expectations.each do |key, value|
-      expect(assigns(key)).to eq(value)
-    end
-  end
-
-  it "does not show already added project" do
-    project = create(:empty_project, import_type: provider, creator_id: user.id, import_source: 'asd/vim')
-    stub_client(repos: [repo], orgs: [])
-
-    get :status
-
-    expect(assigns(:already_added_projects)).to eq([project])
-    expect(assigns(:repos)).to eq([])
-  end
-
-  it "handles an invalid access token" do
-    allow_any_instance_of(Gitlab::GithubImport::Client).
-      to receive(:repos).and_raise(Octokit::Unauthorized)
-
-    get :status
-
-    expect(session[:access_token]).to eq(nil)
-    expect(controller).to redirect_to(new_import_url)
-    expect(flash[:alert]).to eq("Access denied to your #{Gitlab::ImportSources.options.key(provider.to_s)} account.")
-  end
-end
-
-shared_examples 'a GitHub-ish import controller: POST create' do
-  let(:user) { create(:user) }
-  let(:provider_username) { user.username }
-  let(:provider_user) { OpenStruct.new(login: provider_username) }
-  let(:provider_repo) do
-    OpenStruct.new(
-      name: 'vim',
-      full_name: "#{provider_username}/vim",
-      owner: OpenStruct.new(login: provider_username)
-    )
-  end
-
-  before do
-    stub_client(user: provider_user, repo: provider_repo)
-    assign_session_token
-  end
-
-  context "when the repository owner is the Gitea user" do
-    context "when the Gitea user and GitLab user's usernames match" do
-      it "takes the current user's namespace" do
-        expect(Gitlab::GithubImport::ProjectCreator).
-          to receive(:new).with(provider_repo, provider_repo.name, user.namespace, user, access_params, type: provider).
-            and_return(double(execute: true))
-
-        post :create, format: :js
-      end
-    end
-
-    context "when the Gitea user and GitLab user's usernames don't match" do
-      let(:provider_username) { "someone_else" }
-
-      it "takes the current user's namespace" do
-        expect(Gitlab::GithubImport::ProjectCreator).
-          to receive(:new).with(provider_repo, provider_repo.name, user.namespace, user, access_params, type: provider).
-            and_return(double(execute: true))
-
-        post :create, format: :js
-      end
-    end
-  end
-
-  context "when the repository owner is not the Gitea user" do
-    let(:other_username) { "someone_else" }
-
-    before do
-      provider_repo.owner = OpenStruct.new(login: other_username)
-      assign_session_token
-    end
-
-    context "when a namespace with the Gitea user's username already exists" do
-      let!(:existing_namespace) { create(:namespace, name: other_username, owner: user) }
-
-      context "when the namespace is owned by the GitLab user" do
-        it "takes the existing namespace" do
-          expect(Gitlab::GithubImport::ProjectCreator).
-            to receive(:new).with(provider_repo, provider_repo.name, existing_namespace, user, access_params, type: provider).
-              and_return(double(execute: true))
-
-          post :create, format: :js
-        end
-      end
-
-      context "when the namespace is not owned by the GitLab user" do
-        before do
-          existing_namespace.owner = create(:user)
-          existing_namespace.save
-        end
-
-        it "creates a project using user's namespace" do
-          expect(Gitlab::GithubImport::ProjectCreator).
-            to receive(:new).with(provider_repo, provider_repo.name, user.namespace, user, access_params, type: provider).
-              and_return(double(execute: true))
-
-          post :create, format: :js
-        end
-      end
-    end
-
-    context "when a namespace with the Gitea user's username doesn't exist" do
-      context "when current user can create namespaces" do
-        it "creates the namespace" do
-          expect(Gitlab::GithubImport::ProjectCreator).
-            to receive(:new).and_return(double(execute: true))
-
-          expect { post :create, target_namespace: provider_repo.name, format: :js }.to change(Namespace, :count).by(1)
-        end
-
-        it "takes the new namespace" do
-          expect(Gitlab::GithubImport::ProjectCreator).
-            to receive(:new).with(provider_repo, provider_repo.name, an_instance_of(Group), user, access_params, type: provider).
-            and_return(double(execute: true))
-
-          post :create, target_namespace: provider_repo.name, format: :js
-        end
-      end
-
-      context "when current user can't create namespaces" do
-        before do
-          user.update_attribute(:can_create_group, false)
-        end
-
-        it "doesn't create the namespace" do
-          expect(Gitlab::GithubImport::ProjectCreator).
-            to receive(:new).and_return(double(execute: true))
-
-          expect { post :create, format: :js }.not_to change(Namespace, :count)
-        end
-
-        it "takes the current user's namespace" do
-          expect(Gitlab::GithubImport::ProjectCreator).
-            to receive(:new).with(provider_repo, provider_repo.name, user.namespace, user, access_params, type: provider).
-            and_return(double(execute: true))
-
-          post :create, format: :js
-        end
-      end
-    end
-
-    context 'user has chosen a namespace and name for the project' do
-      let(:test_namespace) { create(:namespace, name: 'test_namespace', owner: user) }
-      let(:test_name) { 'test_name' }
-
-      it 'takes the selected namespace and name' do
-        expect(Gitlab::GithubImport::ProjectCreator).
-          to receive(:new).with(provider_repo, test_name, test_namespace, user, access_params, type: provider).
-            and_return(double(execute: true))
-
-        post :create, { target_namespace: test_namespace.name, new_name: test_name, format: :js }
-      end
-
-      it 'takes the selected name and default namespace' do
-        expect(Gitlab::GithubImport::ProjectCreator).
-          to receive(:new).with(provider_repo, test_name, user.namespace, user, access_params, type: provider).
-            and_return(double(execute: true))
-
-        post :create, { new_name: test_name, format: :js }
-      end
-    end
-  end
-end
-- 
cgit v1.2.1