@@ -24,7 +24,7 @@ describe "Adding a mirror in a clean repository" do output = `git log --pretty=oneline`.split("\n") output.length.should == 2 - output[0].should =~ "Add mirror 'skit1/'" + output[0].should =~ /Braid: Added mirror 'skit1' at '[0-9a-f]{7}'/ end it "should create .braids and add the mirror to it" do @@ -59,7 +59,7 @@ describe "Adding a mirror in a clean repository" do output = `git log --pretty=oneline`.split("\n") output.length.should == 2 - output[0].should =~ "Add mirror 'skit1/'" + output[0].should =~ /Braid: Added mirror 'skit1' at r1/ end it "should create .braids and add the mirror to it" do test/integration/adding_test.rb @@ -41,7 +41,7 @@ describe "Updating a mirror without conflicts" do output = `git log --pretty=oneline`.split("\n") output.length.should == 3 - output[0].should =~ /Update mirror 'skit1\/' to '[0-9a-f]{7}'/ + output[0].should =~ /Braid: Updated mirror 'skit1' to '[0-9a-f]{7}'/ end end @@ -79,7 +79,7 @@ describe "Updating a mirror without conflicts" do output = `git log --pretty=oneline`.split("\n") output.length.should == 3 - output[0].should =~ "Update mirror 'skit1/' to r3" + output[0].should =~ /Braid: Updated mirror 'skit1' to r3/ end end test/integration/updating_test.rb @@ -9,6 +9,7 @@ require 'pathname' TMP_PATH = File.join(Dir.tmpdir, "braid_integration") BRAID_PATH = Pathname.new(File.dirname(__FILE__)).parent.realpath FIXTURE_PATH = File.join(BRAID_PATH, "test", "fixtures") +FileUtils.rm_rf(TMP_PATH) FileUtils.mkdir_p(TMP_PATH) BRAID_BIN = File.join(BRAID_PATH, "bin", "braid") test/integration_helper.rb fa94dbce7bc28d8c0e9cb6028500af4a945606d4 Cristi Balan evil@che.lu http://github.com/evilchelu/braid/commit/12670e97994ad031a22c55b048862df7654182a9 12670e97994ad031a22c55b048862df7654182a9 2008-10-29T06:40:15-07:00 2008-10-29T06:40:15-07:00 fix integration tests ecefa975fe022109853000ab2e785e27b7df79f4 Cristi Balan evil@che.lu