Merge pull request #305 from rwfowler/goForGreen

Fix the test_normalizes_commit_hash on Travis-CI
2012-05-01 16:04:39 -07:00
parent b061e0f859 b9dad32707
commit f540ef2e06
1 changed files with 2 additions and 2 deletions
@@ -8,8 +8,8 @@ context "Wiki" do

  test "normalizes commit hash" do
    commit = {:message => 'abc'}
-    name  = @wiki.repo.config['user.name']
-    email = @wiki.repo.config['user.email']
+    name  = @wiki.repo.config['user.name']  || @wiki.default_committer_name
+    email = @wiki.repo.config['user.email'] ||  @wiki.default_committer_email
    committer = Gollum::Committer.new(@wiki, commit)
    assert_equal name,  committer.actor.name
    assert_equal email, committer.actor.email