Merge branch 'master' into feature/company-delete

Author: ClaytonPassmore

lib/intercom/service/conversation.rb

@@ -58,7 +58,7 @@ def assign(reply_data)
 
       def run_assignment_rules(id)
         collection_name = Utils.resource_class_to_collection_name(collection_class)
-        response = @client.post("/#{collection_name}/#{id}/run_assignment_rules")
+        response = @client.post("/#{collection_name}/#{id}/run_assignment_rules", {})
         collection_class.new.from_response(response)
       end
     end

spec/unit/intercom/conversation_spec.rb

@@ -54,7 +54,7 @@
   end
 
   it 'runs assignment rules on a conversation' do
-    client.expects(:post).with('/conversations/147/run_assignment_rules').returns(test_conversation)
+    client.expects(:post).with('/conversations/147/run_assignment_rules', {}).returns(test_conversation)
     client.conversations.run_assignment_rules('147')
   end