test/unit/test_commit_hook.rb in git-commit-notifier-0.2.0 vs test/unit/test_commit_hook.rb in git-commit-notifier-0.3.0

@@ -5,18 +5,28 @@
 require File.dirname(__FILE__) + '/../../lib/commit_hook'
 require File.dirname(__FILE__) + '/../../lib/git'
 
 class CommitHookTest < Test::Unit::TestCase
 
-  def test_hook
+  def test_hook_ignore_merge
+    run_with_config('test/fixtures/git-notifier-ignore-merge.yml', 4) # 4 commit, one email for each of them, without merge
+  end
+
+  def test_hook_with_merge
+    run_with_config('test/fixtures/git-notifier-with-merge.yml', 5) # 5 commit, one email for each of them, with merge mail
+  end
+
+  def run_with_config(config, times)
     path = File.dirname(__FILE__) + '/../fixtures/'
     Git.expects(:log).with(REVISIONS.first, REVISIONS.last).returns(read_file(path + 'git_log'))
     Git.expects(:mailing_list_address).returns('[e-mail]')
     REVISIONS.each do |rev|
       Git.expects(:show).with(rev).returns(read_file(path + "git_show_#{rev}"))
     end
     emailer = mock('Emailer')
-    Emailer.expects(:new).times(4).returns(emailer) # 4 commit, one email for each of them
-    emailer.expects(:send).times(4)
-    CommitHook.run 'config/email.yml.sample', REVISIONS.first, REVISIONS.last, 'refs/heads/master'
+    Emailer.expects(:new).times(times).returns(emailer) # 4 commit, one email for each of them
+    emailer.expects(:send).times(times)
+    CommitHook.run config, REVISIONS.first, REVISIONS.last, 'refs/heads/master'
   end
+
+
 end