summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-31 19:35:07 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-07-31 19:35:07 +0300
commit61f70334efa3ff4a2eda4a1d29c2ee59ecb82721 (patch)
treecd6117c491c3de7a128d2e486ad7c08b794782dd /spec
parentb238b1544c391bbc60a7d38c30d98e05be786667 (diff)
downloadgitlab-ce-61f70334efa3ff4a2eda4a1d29c2ee59ecb82721.tar.gz
Cleanup test dir before install gitlab-shell. Fix fork test scenario
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec')
-rw-r--r--spec/support/test_env.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index f46405f238b..9e8339ff71a 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -13,14 +13,14 @@ module TestEnv
# Disable mailer for spinach tests
disable_mailer if opts[:mailer] == false
- # Setup GitLab shell for test instance
- setup_gitlab_shell
-
# Clean /tmp/tests
tmp_test_path = Rails.root.join('tmp', 'tests')
FileUtils.rm_r(tmp_test_path)
FileUtils.mkdir(tmp_test_path)
+ # Setup GitLab shell for test instance
+ setup_gitlab_shell
+
# Create repository for FactoryGirl.create(:project)
setup_factory_repo
end