@@ -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 =~ /Braid: Added mirror 'skit1' at '[0-9a-f]{7}'/
+ output[0].should =~ /Braid: Add 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 =~ /Braid: Added mirror 'skit1' at r1/
+ output[0].should =~ /Braid: Add 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 =~ /Braid: Updated mirror 'skit1' to '[0-9a-f]{7}'/
+ output[0].should =~ /Braid: Update 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 =~ /Braid: Updated mirror 'skit1' to r3/
+ output[0].should =~ /Braid: Update mirror 'skit1' to r3/
end
end
test/integration/updating_test.rb
@@ -61,7 +61,7 @@ describe "Braid::Mirror#diff" do
it "should generate a diff when the hashes do not match" do
set_hashes('b' * 40, 'c' * 40)
diff = "diff --git a/path b/path\n"
- git.expects(:diff_tree).with('b' * 40, 'c' * 40, @mirror.path).returns(diff)
+ git.expects(:diff_tree).with('b' * 40, 'c' * 40).returns(diff)
@mirror.diff.should == diff
end
end
test/mirror_test.rb
c70b656b70d269f37decb1d639af4505e5dfe1da
Norbert Crombach
norbert.crombach@primetheory.org
http://github.com/norbert/braid/commit/e91f76b90ec1cd18d021f5a30680f1488791d67e
e91f76b90ec1cd18d021f5a30680f1488791d67e
2009-10-11T06:35:40-07:00
2009-10-11T06:26:32-07:00
Fix tests
9400b19e34084e67077cbb8205d4e7c64517edc0
Norbert Crombach
norbert.crombach@primetheory.org