Permalink
Browse files

Fix tests

  • Loading branch information...
1 parent c70b656 commit e91f76b90ec1cd18d021f5a30680f1488791d67e @norbert norbert committed Oct 11, 2009
Showing with 5 additions and 5 deletions.
  1. +2 −2 test/integration/adding_test.rb
  2. +2 −2 test/integration/updating_test.rb
  3. +1 −1 test/mirror_test.rb
@@ -24,7 +24,7 @@
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 @@
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
@@ -41,7 +41,7 @@
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 @@
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
View
@@ -61,7 +61,7 @@ def set_hashes(remote_hash, local_hash)
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

0 comments on commit e91f76b

Please sign in to comment.