summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorIzaak Alpert <ialpert@blackberry.com>2013-07-15 15:10:49 -0400
committerIzaak Alpert <ialpert@blackberry.com>2013-07-17 22:46:38 -0400
commit128f2845770b7a6d553ee764cdbbe63da5ba9e84 (patch)
treefd0bced6c63c0b55df3beb78361325a0996a3ead /spec/support
parent0ef055a4aef76d20668a40717fb33bfe41599cfb (diff)
downloadgitlab-ce-128f2845770b7a6d553ee764cdbbe63da5ba9e84.tar.gz
Rebased on 6.0
-Had to do some minor test clean up as well Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/test_env.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 6b83aad0182..a0528d98d57 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -159,7 +159,9 @@ module TestEnv
# Create a testing satellite, and clone the source repo into it
def create_satellite(source_repo, namespace, satellite_name)
satellite_repo = satellite(namespace, satellite_name)
- # Symlink tmp/satellite/gitlabhq to tmp/test-git-base-path/satellite/gitlabhq
+ # Symlink tmp/satellite/gitlabhq to tmp/test-git-base-path/satellite/gitlabhq, create the directory if it doesn't exist already
+ satellite_dir = File.dirname(satellite_repo)
+ FileUtils.mkdir_p satellite_dir unless File.exists?(satellite_dir)
system("ln -s -f #{seed_satellite_path()} #{satellite_repo}")
end