to_json all the things

zencoder · Mar 3, 2015 · 152e883 · 152e883
1 parent a5e41bb
commit 152e883
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/messenger/slack.rb b/lib/messenger/slack.rb
@@ -38,13 +38,13 @@ def self.obfuscate(url)
   def self.build_message(channel, display_name, body)
     msg = { channel: channel, username: display_name }
 
-    return msg.merge({ text: body }) if body.is_a?(String)
+    if body.is_a?(String)
+      msg.merge!({ text: body })
 
-    if body.is_a?(Array)
+    elsif body.is_a?(Array)
       msg['attachments'] = body
-    end
 
-    if body.is_a?(Hash)
+    elsif body.is_a?(Hash)
       msg['attachments'] = []
       msg['attachments'].push(body)
     end

diff --git a/test/messenger/slack_test.rb b/test/messenger/slack_test.rb
@@ -9,7 +9,7 @@ class Messenger::SlackTest < Test::Unit::TestCase
     end
 
     should "post a successful message as a string" do
-      HTTParty.expects(:post).with("https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX", :body => { channel: '#room', username: 'displayname', text: 'hello world!' }, :headers => { "Content-Type" => "application/json"}).returns(@success_response)
+      HTTParty.expects(:post).with("https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX", :body => { channel: '#room', username: 'displayname', text: 'hello world!' }.to_json, :headers => { "Content-Type" => "application/json"}).returns(@success_response)
       result = Messenger::Slack.deliver("slack://displayname@hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX/#room", 'hello world!')
       assert result.success?
       assert_equal @success_response, result.response
@@ -30,7 +30,7 @@ class Messenger::SlackTest < Test::Unit::TestCase
     end
 
     should "post a failed message" do
-      HTTParty.expects(:post).with("https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX", :body => { channel: '#room', username: 'displayname', text: 'hello world!' }, :headers => { "Content-Type" => "application/json"}).returns(@failure_response)
+      HTTParty.expects(:post).with("https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX", :body => { channel: '#room', username: 'displayname', text: 'hello world!' }.to_json, :headers => { "Content-Type" => "application/json"}).returns(@failure_response)
       result = Messenger::Slack.deliver("slack://displayname@hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX/#room", 'hello world!')
       assert_equal false, result.success?
       assert_equal @failure_response, result.response