3 files changed, 60 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/importer.rb b/lib/gitlab/import_export/importer.rb
index c14646b0611..938a7f963af 100644
--- a/lib/gitlab/import_export/importer.rb
+++ b/lib/gitlab/import_export/importer.rb
@@ -50,7 +50,7 @@ module Gitlab
       end
 
       def wiki_restorer
-        Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path,
+        Gitlab::ImportExport::WikiRestorer.new(path_to_bundle: wiki_repo_path,
                                                shared: @shared,
                                                project: ProjectWiki.new(project_tree.restored_project))
       end
diff --git a/lib/gitlab/import_export/wiki_restorer.rb b/lib/gitlab/import_export/wiki_restorer.rb
new file mode 100644
index 00000000000..263ff187c8a
--- /dev/null
+++ b/lib/gitlab/import_export/wiki_restorer.rb
@@ -0,0 +1,14 @@
+module Gitlab
+  module ImportExport
+    class WikiRestorer < RepoRestorer
+      def restore
+        unless File.exist?(@path_to_bundle)
+          # Creates an empty wiki if it does not exist in the bundle
+          @project.wiki
+        end
+
+        super
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/wiki_restorer_spec.rb b/spec/lib/gitlab/import_export/wiki_restorer_spec.rb
new file mode 100644
index 00000000000..a7a32f13e32
--- /dev/null
+++ b/spec/lib/gitlab/import_export/wiki_restorer_spec.rb
@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Gitlab::ImportExport::WikiRestorer do
+  describe 'restore a wiki Git repo' do
+    let(:user) { create(:user) }
+    let!(:project_with_wiki) { create(:project, :wiki_repo) }
+    let!(:project_without_wiki) { create(:project) }
+    let!(:project) { create(:project) }
+    let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
+    let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
+    let(:bundler) { Gitlab::ImportExport::WikiRepoSaver.new(project: project_with_wiki, shared: shared) }
+    let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename) }
+    let(:restorer) do
+      described_class.new(path_to_bundle: bundle_path,
+                          shared: shared,
+                          project: project.wiki)
+    end
+
+    before do
+      allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+
+      bundler.save
+    end
+
+    after do
+      FileUtils.rm_rf(export_path)
+      FileUtils.rm_rf(project_with_wiki.wiki.repository.path_to_repo)
+      FileUtils.rm_rf(project.wiki.repository.path_to_repo)
+    end
+
+    it 'restores the wiki repo successfully' do
+      expect(restorer.restore).to be true
+    end
+
+    describe "no wiki in the bundle" do
+      let(:bundler) { Gitlab::ImportExport::WikiRepoSaver.new(project: project_without_wiki, shared: shared) }
+
+      it 'creates an empty wiki' do
+        expect(restorer.restore).to be true
+
+        expect(project.wiki_repository_exists?).to be true
+      end
+    end
+  end
+end