Fix tests

ttilley · Oct 11, 2009 · e91f76b · e91f76b
1 parent c70b656
commit e91f76b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/test/integration/adding_test.rb b/test/integration/adding_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

diff --git a/test/integration/updating_test.rb b/test/integration/updating_test.rb
@@ -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

diff --git a/test/mirror_test.rb b/test/mirror_test.rb
@@ -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