diff options
author | Valery Sizov <valery@gitlab.com> | 2018-02-19 17:56:33 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-02-19 17:56:33 +0000 |
commit | 69b750aee9f51f1206495531e14c1f9b6d421600 (patch) | |
tree | a201fdad620d835b3e7aaf9cdd77c819d1873fc9 /spec | |
parent | 7511e47f8583d6b5ce2b86c64a70a1616f607e1e (diff) | |
download | gitlab-ce-69b750aee9f51f1206495531e14c1f9b6d421600.tar.gz |
[GH Import] Create an empty wiki if wiki import failed
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/github_import/importer/repository_importer_spec.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb b/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb index 46a57e08963..5bedfc79dd3 100644 --- a/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb @@ -11,7 +11,8 @@ describe Gitlab::GithubImport::Importer::RepositoryImporter do import_source: 'foo/bar', repository_storage_path: 'foo', disk_path: 'foo', - repository: repository + repository: repository, + create_wiki: true ) end @@ -192,7 +193,7 @@ describe Gitlab::GithubImport::Importer::RepositoryImporter do expect(importer.import_wiki_repository).to eq(true) end - it 'marks the import as failed if an error was raised' do + it 'marks the import as failed and creates an empty repo if an error was raised' do expect(importer.gitlab_shell) .to receive(:import_repository) .and_raise(Gitlab::Shell::Error) @@ -201,6 +202,9 @@ describe Gitlab::GithubImport::Importer::RepositoryImporter do .to receive(:fail_import) .and_return(false) + expect(project) + .to receive(:create_wiki) + expect(importer.import_wiki_repository).to eq(false) end end |