Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiro Santilli <ciro.santilli@gmail.com>2014-09-22 21:46:57 +0400
committerCiro Santilli <ciro.santilli@gmail.com>2014-09-22 23:37:52 +0400
commit065ab3e5f302434a189038aa46a475154c79a91d (patch)
tree7c0c19326be64bb3b6b6e1f4353cdad44fa3e251 /spec/support/test_env.rb
parentb43e918a73c88a8d922c5c5d79e2aa2bf42a9d29 (diff)
Only clone GitLab Shell on tests if necessary.
Diffstat (limited to 'spec/support/test_env.rb')
-rw-r--r--spec/support/test_env.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index e67c29a6783..4b0a3856f89 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -17,7 +17,11 @@ module TestEnv
tmp_test_path = Rails.root.join('tmp', 'tests')
if File.directory?(tmp_test_path)
- FileUtils.rm_r(tmp_test_path)
+ Dir.entries(tmp_test_path).each do |entry|
+ unless ['.', '..', 'gitlab-shell'].include?(entry)
+ FileUtils.rm_r(File.join(tmp_test_path, entry))
+ end
+ end
end
FileUtils.mkdir_p(tmp_test_path)
@@ -38,9 +42,7 @@ module TestEnv
end
def setup_gitlab_shell
- unless File.directory?(Gitlab.config.gitlab_shell.path)
- %x[rake gitlab:shell:install]
- end
+ `rake gitlab:shell:install`
end
def setup_factory_repo