test/unit/git_test.rb in vigetlabs-provisional-2.1.2 vs test/unit/git_test.rb in vigetlabs-provisional-2.1.3

@@ -2,16 +2,11 @@
 require File.dirname(__FILE__) + '/../../lib/provisional/scm/git'
 
 class GitTest < Test::Unit::TestCase
 
   def setup
-    @scm = Provisional::SCM::Git.new(
-    {
-      'name' => 'name',
-      'template_path' => 'template_path'
-    }
-    )
+    @scm = new_scm(Provisional::SCM::Git)
   end
 
   def test_gitignore
     assert_equal Provisional::IGNORE_FILES.join("\n"), @scm.gitignore
   end
@@ -29,33 +24,22 @@
       @scm.init
     end
   end
 
   def test_generate_rails
-    Dir.expects(:chdir)
-    Rails::Generator::Base.expects(:use_application_sources!)
-    generator_stub = stub()
-    generator_stub.expects(:run).with(%w(. -m template_path), :generator => 'app')
-    Rails::Generator::Scripts::Generate.expects(:new).returns(generator_stub)
+    Provisional::RailsApplication.expects(:new)
     @scm.generate_rails
   end
 
   def test_generate_rails_should_raise_RuntimeError_if_any_step_raises_any_exception
-    Dir.expects(:chdir).raises(Errno::ENOENT)
+    Provisional::RailsApplication.expects(:new).raises(RuntimeError)
     assert_raise RuntimeError do
       @scm.generate_rails
     end
   end
 
   def test_checkin
-    repo_stub = stub()
-    repo_stub.expects(:add).with('.')
-    repo_stub.expects(:commit).with('Initial commit by Provisional')
-    Git.expects(:open).returns(repo_stub)
-    Dir.expects(:chdir)
-    gitignore_file = stub()
-    gitignore_file.expects(:puts).with(@scm.gitignore)
-    File.expects(:open).with('.gitignore', 'w').yields(gitignore_file)
+    stub_git_checkin
     @scm.checkin
   end
 
   def test_checkin_should_raise_RuntimeError_if_any_step_raises_any_exception
     Git.expects(:open).raises(ArgumentError)