Commit d8e061d7 authored by Angus MacArthur's avatar Angus MacArthur

improve tests for forking from namespaces

Change-Id: I0c343c03ee3f033641f9958030ac57d92296547d
parent 2b54f057
...@@ -78,13 +78,13 @@ describe GitlabProjects do ...@@ -78,13 +78,13 @@ describe GitlabProjects do
end end
describe :fork_project do describe :fork_project do
let(:gl_project_import) { build_gitlab_projects('import-project', repo_name, 'https://github.com/randx/six.git') } let(:source_repo_name) { File.join('source-namespace', repo_name) }
let(:gl_projects_fork) { build_gitlab_projects('fork-project', repo_name, 'forked-to-namespace')}
let(:dest_repo) { File.join(tmp_repos_path, 'forked-to-namespace', repo_name) } let(:dest_repo) { File.join(tmp_repos_path, 'forked-to-namespace', repo_name) }
let(:gl_projects_fork) { build_gitlab_projects('fork-project', source_repo_name, 'forked-to-namespace') }
let(:gl_projects_import) { build_gitlab_projects('import-project', source_repo_name, 'https://github.com/randx/six.git') }
before do before do
FileUtils.mkdir_p(tmp_repo_path) gl_projects_import.exec
gl_project_import.exec
end end
it "should not fork into a namespace that doesn't exist" do it "should not fork into a namespace that doesn't exist" do
...@@ -118,7 +118,7 @@ describe GitlabProjects do ...@@ -118,7 +118,7 @@ describe GitlabProjects do
argv(*args) argv(*args)
gl_projects = GitlabProjects.new gl_projects = GitlabProjects.new
gl_projects.stub(repos_path: tmp_repos_path) gl_projects.stub(repos_path: tmp_repos_path)
gl_projects.stub(full_path: tmp_repo_path) gl_projects.stub(full_path: File.join(tmp_repos_path, gl_projects.project_name))
gl_projects gl_projects
end end
......
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