Commit 4b88b4ff authored by James Lopez's avatar James Lopez

fix wiki path issues and spec

parent f9c6168c
...@@ -27,7 +27,7 @@ module Projects ...@@ -27,7 +27,7 @@ module Projects
end end
def project_filename def project_filename
"#{@project.namespace}#{@project.name}.bundle" "#{@project.name}.bundle"
end end
def path_to_repo def path_to_repo
......
...@@ -18,6 +18,10 @@ module Projects ...@@ -18,6 +18,10 @@ module Projects
private private
def project_filename
"#{@project.name}.wiki.bundle"
end
def path_to_repo def path_to_repo
@wiki.repository.path_to_repo @wiki.repository.path_to_repo
end end
......
...@@ -8,10 +8,13 @@ describe Projects::ImportExport::WikiRepoBundler, services: true do ...@@ -8,10 +8,13 @@ describe Projects::ImportExport::WikiRepoBundler, services: true do
let(:export_path) { "#{Dir::tmpdir}/project_tree_saver_spec" } let(:export_path) { "#{Dir::tmpdir}/project_tree_saver_spec" }
let(:shared) { Projects::ImportExport::Shared.new(relative_path: project.path_with_namespace) } let(:shared) { Projects::ImportExport::Shared.new(relative_path: project.path_with_namespace) }
let(:wiki_bundler) { Projects::ImportExport::WikiRepoBundler.new(project: project, shared: shared) } let(:wiki_bundler) { Projects::ImportExport::WikiRepoBundler.new(project: project, shared: shared) }
let!(:project_wiki) { ProjectWiki.new(project, user) }
before(:each) do before(:each) do
project.team << [user, :master] project.team << [user, :master]
allow_any_instance_of(Projects::ImportExport).to receive(:storage_path).and_return(export_path) 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 end
after(:each) do after(:each) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment