diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-12 18:14:44 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-12 18:14:44 +0000 |
| commit | bd2ca33d5827401a5ef380ddf323cff86ab38439 (patch) | |
| tree | 76ce846e657d721e6de108be59ca8e4ebfebf433 /spec | |
| parent | 99334d4b57b6f07e002eaa5145f529d6b63fdce2 (diff) | |
| parent | 4e9284a023f26e3dfd56a0130b8e2a38c884f0e6 (diff) | |
| download | gitlab-ce-bd2ca33d5827401a5ef380ddf323cff86ab38439.tar.gz | |
Merge branch 'relative' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/factories.rb | 1 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/spec/factories.rb b/spec/factories.rb index 624cb0f7654..3b0e305460d 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -66,6 +66,7 @@ FactoryGirl.define do after :create do |project| TestEnv.clear_repo_dir(project.namespace, project.path) + TestEnv.reset_satellite_dir TestEnv.create_repo(project.namespace, project.path) end end diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 5dbdffe4102..87dffe197d6 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -97,6 +97,15 @@ module TestEnv FileUtils.rm_rf File.join(testing_path(), "#{name}.wiki.git") end + def reset_satellite_dir + setup_stubs + FileUtils.cd(seed_satellite_path) do + `git reset --hard --quiet` + `git clean -fx` + `git checkout --quiet origin/master` + end + end + # Create a repo and it's satellite def create_repo(namespace, name) setup_stubs |