Merge pull request #7873 from cirosantilli/testme-to-gitlabtest

Replace testme with gitlab-test.

1 files changed, 14 insertions, 5 deletions

diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 4b0a3856f89..5f55871dc4a 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -46,17 +46,16 @@ module TestEnv
   end
 
   def setup_factory_repo
-    repo_path = repos_path + "/root/testme.git"
-    clone_url = 'https://gitlab.com/gitlab-org/gitlab-test.git'
+    clone_url = "https://gitlab.com/gitlab-org/#{factory_repo_name}.git"
 
-    unless File.directory?(repo_path)
-      git_cmd = %W(git clone --bare #{clone_url} #{repo_path})
+    unless File.directory?(factory_repo_path)
+      git_cmd = %W(git clone --bare #{clone_url} #{factory_repo_path})
       system(*git_cmd)
     end
   end
 
   def copy_repo(project)
-    base_repo_path = File.expand_path(repos_path + "/root/testme.git")
+    base_repo_path = File.expand_path(factory_repo_path)
     target_repo_path = File.expand_path(repos_path + "/#{project.namespace.path}/#{project.path}.git")
     FileUtils.mkdir_p(target_repo_path)
     FileUtils.cp_r("#{base_repo_path}/.", target_repo_path)
@@ -66,4 +65,14 @@ module TestEnv
   def repos_path
     Gitlab.config.gitlab_shell.repos_path
   end
+
+  private
+
+  def factory_repo_path
+    @factory_repo_path ||= repos_path + "/root/#{factory_repo_name}.git"
+  end
+
+  def factory_repo_name
+    'gitlab-test'
+  end
 end