Clear state in test satellite dir.

diff --git a/spec/factories.rb b/spec/factories.rb
index 624cb0f..3b0e305 100644 (file)
--- 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 5dbdffe..87dffe1 100644 (file)
--- 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