From 4b88b4ffd5f49ea4cef189776783b58f7c6c141f Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 9 Mar 2016 10:35:38 +0100
Subject: [PATCH] fix wiki path issues and spec

---
 app/services/projects/import_export/repo_bundler.rb           | 2 +-
 app/services/projects/import_export/wiki_repo_bundler.rb      | 4 ++++
 .../services/projects/import_export/wiki_repo_bundler_spec.rb | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/services/projects/import_export/repo_bundler.rb b/app/services/projects/import_export/repo_bundler.rb
index b0b2df1c14c..d43fb4ea09e 100644
--- a/app/services/projects/import_export/repo_bundler.rb
+++ b/app/services/projects/import_export/repo_bundler.rb
@@ -27,7 +27,7 @@ module Projects
       end
 
       def project_filename
-        "#{@project.namespace}#{@project.name}.bundle"
+        "#{@project.name}.bundle"
       end
 
       def path_to_repo
diff --git a/app/services/projects/import_export/wiki_repo_bundler.rb b/app/services/projects/import_export/wiki_repo_bundler.rb
index 793c8efd142..bf69936503d 100644
--- a/app/services/projects/import_export/wiki_repo_bundler.rb
+++ b/app/services/projects/import_export/wiki_repo_bundler.rb
@@ -18,6 +18,10 @@ module Projects
 
       private
 
+      def project_filename
+        "#{@project.name}.wiki.bundle"
+      end
+
       def path_to_repo
         @wiki.repository.path_to_repo
       end
diff --git a/spec/services/projects/import_export/wiki_repo_bundler_spec.rb b/spec/services/projects/import_export/wiki_repo_bundler_spec.rb
index 351419d0619..a589f81c5f9 100644
--- a/spec/services/projects/import_export/wiki_repo_bundler_spec.rb
+++ b/spec/services/projects/import_export/wiki_repo_bundler_spec.rb
@@ -8,10 +8,13 @@ describe Projects::ImportExport::WikiRepoBundler, services: true do
     let(:export_path) { "#{Dir::tmpdir}/project_tree_saver_spec" }
     let(:shared) { Projects::ImportExport::Shared.new(relative_path: project.path_with_namespace) }
     let(:wiki_bundler) { Projects::ImportExport::WikiRepoBundler.new(project: project, shared: shared) }
+    let!(:project_wiki) { ProjectWiki.new(project, user) }
 
     before(:each) do
       project.team << [user, :master]
       allow_any_instance_of(Projects::ImportExport).to receive(:storage_path).and_return(export_path)
+      project_wiki.wiki
+      project_wiki.create_page("index", "test content")
     end
 
     after(:each) do
-- 
GitLab