diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 15:07:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 15:07:33 +0300 |
commit | 784fae4b9d7e92350075df2a43d06893080ed1e6 (patch) | |
tree | c7a6fd444acd6897622b233b250a34fd176f01da /spec/lib/gitlab/legacy_github_import | |
parent | fc53ce8e6ca67bf217470179a1ea6cf139bcffad (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/legacy_github_import')
-rw-r--r-- | spec/lib/gitlab/legacy_github_import/importer_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/legacy_github_import/milestone_formatter_spec.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/spec/lib/gitlab/legacy_github_import/importer_spec.rb b/spec/lib/gitlab/legacy_github_import/importer_spec.rb index b54f30947aa..c6ee0a3c094 100644 --- a/spec/lib/gitlab/legacy_github_import/importer_spec.rb +++ b/spec/lib/gitlab/legacy_github_import/importer_spec.rb @@ -265,6 +265,7 @@ describe Gitlab::LegacyGithubImport::Importer do context 'when importing a GitHub project' do let(:api_root) { 'https://api.github.com' } let(:repo_root) { 'https://github.com' } + subject { described_class.new(project) } it_behaves_like 'Gitlab::LegacyGithubImport::Importer#execute' @@ -287,6 +288,7 @@ describe Gitlab::LegacyGithubImport::Importer do context 'when importing a Gitea project' do let(:api_root) { 'https://try.gitea.io/api/v1' } let(:repo_root) { 'https://try.gitea.io' } + subject { described_class.new(project) } before do diff --git a/spec/lib/gitlab/legacy_github_import/milestone_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/milestone_formatter_spec.rb index 9fa72b3cd90..f5d71888ac9 100644 --- a/spec/lib/gitlab/legacy_github_import/milestone_formatter_spec.rb +++ b/spec/lib/gitlab/legacy_github_import/milestone_formatter_spec.rb @@ -89,6 +89,7 @@ describe Gitlab::LegacyGithubImport::MilestoneFormatter do context 'when importing a Gitea project' do let(:iid_attr) { :id } + before do project.update(import_type: 'gitea') end |