@@ -116,7 +116,7 @@ module CapGun end def deployed_to(capistrano) - returning(s = "deployed") { s += " to #{capistrano[:rails_env]}" if capistrano[:rails_env] } + returning(deploy_msg = "deployed") { |msg| msg << " to #{capistrano[:rails_env]}" if capistrano[:rails_env] } end # Create the body of the message using a bunch of values from Capistrano lib/cap_gun.rb @@ -115,14 +115,15 @@ describe "CapGun" do describe "creating body" do it "has a friendly summary line" do CapGun::Mailer.any_instance.stubs(:current_user).returns("jdoe") - capistrano = { :application => "my app", :rails_env => "staging", :current_release => "/data/foo/releases/20080227120000", :cap_gun_email_envelope => { :from => "booyakka!@example.com", :recipients => ["foo@here.com", "bar@here.com"] } } + capistrano = { :application => "my app", :rails_env => "staging", :current_release => "/data/foo/releases/20080227120000", :cap_gun_email_envelope => {} } mail = CapGun::Mailer.create_deployment_notification capistrano + mail.subject.should == "[DEPLOY] my app deployed to staging" mail.body.split("\n").first.should == "my app was deployed to staging by jdoe at February 27th, 2008 8:00 AM EDT." end - it "does not include rails env in summary if not defined" do + it "does not include rails env if not defined" do CapGun::Mailer.any_instance.stubs(:current_user).returns("jdoe") - capistrano = { :application => "my app", :current_release => "/data/foo/releases/20080227120000", :cap_gun_email_envelope => { :from => "booyakka!@example.com", :recipients => ["foo@here.com", "bar@here.com"] } } + capistrano = { :application => "my app", :current_release => "/data/foo/releases/20080227120000", :cap_gun_email_envelope => {}} mail = CapGun::Mailer.create_deployment_notification capistrano mail.subject.should == "[DEPLOY] my app deployed" mail.body.split("\n").first.should == "my app was deployed by jdoe at February 27th, 2008 8:00 AM EDT." spec/cap_gun_spec.rb 783cb94b0e632cdc10d2fd6e6966b30aaa3b18a4 Rob Sanheim rsanheim@gmail.com http://github.com/relevance/cap_gun/commit/cdda99db3002b0c743c783cfb0a2e3c14790de18 cdda99db3002b0c743c783cfb0a2e3c14790de18 2008-07-17T00:50:05-07:00 2008-07-17T00:50:05-07:00 fix bug with subject line and showing the rails env its going to 43fa84d88ff4ffe31d409163e216068ad463f3dd Rob Sanheim rsanheim@gmail.com