@@ -83,7 +83,8 @@ module Lighthouse::GitHooks diffs = [] commit.diffs.each { |d| diffs << d.diff unless d.diff.empty? } message << "\n\n<i>commit #{commit.id} on #{@ref}</i>\n" - message << "@@@\n#{diffs.join("\n")}\n@@@" unless diffs.empty? + message << "@@@\n#{diffs.join("\n")}\n@@@" if Configuration[:include_diffs] && !diffs.empty? + message end def parse_ticket(commit, number, params) lib/lighthouse/git_hooks/ticket_updater.rb @@ -2,6 +2,33 @@ require File.dirname(__FILE__) + '/spec_helper.rb' describe TicketUpdate do + describe "build_message method" do + + before(:each) do + Grit::Commit.stub!(:find_all).and_return([]) + Grit::Repo.stub!(:new).and_return(nil) + Configuration.load(File.dirname(__FILE__) + '/config_test') + @ticket_updater = Lighthouse::GitHooks::TicketUpdate.new(1,2) + @diff = stub("diff", :diff=>"My lovely diff") + @commit = stub("commit", :diffs=>[@diff], :message=>"My commit message", :id=>1) + end + + it "should include diffs when Configuration[:include_diffs] is true" do + @ticket_updater.send(:build_message, @commit).should =~ /My lovely diff/ + end + + it "should not include diffs when Configuration[:include_diffs] is false" do + Configuration.stub!(:[]).with(:include_diffs).and_return(false) + @ticket_updater.send(:build_message, @commit).should_not =~ /My lovely diff/ + end + + it "should not include diffs when diffs are empty" do + @commit.stub!(:diffs).and_return([]) + @ticket_updater.send(:build_message, @commit).should_not =~ /@@@\n.*?\n@@@/ + end + + end + it "should have spec" end \ No newline at end of file spec/ticket_updater_spec.rb 1e46fcd04341160446aeb5c64338cf08fd0fce1c Neer Friedman neer@neer-laptop.(none) http://github.com/gwik/lighthouse-git-hooks/commit/7cbc3d9f5eadcec5cf9fd83a12ad0a97edab09de 7cbc3d9f5eadcec5cf9fd83a12ad0a97edab09de 2008-10-28T12:17:16-07:00 2008-10-28T12:17:16-07:00 method build_message will not return diffs if Configuration[:include_diffs] is set to false 78fc6dc3ae7c9469a621601e6ae82a8cdd6824f6 Neer Friedman neer@neer-laptop.(none)