<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>test/remote/chimp_helper_test.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -85,7 +85,6 @@ module MandarinSoda
            chimp_api ||= XMLRPC::Client.new2(CHIMP_URL)
            chimp_api.call(&quot;listSubscribe&quot;, auth, mailing_list_id, email, merge_vars, email_content_type, double_optin, update_existing,replace_interests)
          rescue XMLRPC::FaultException =&gt; e
-           puts 'FAULTTTT'
            puts e.faultCode
            puts e.faultString
          end    
@@ -114,6 +113,7 @@ module MandarinSoda
               merge_args[key] = self.send(value) 
           end
         end
+        merge_args
       end
     end 
   end </diff>
      <filename>lib/mandarin_soda/chimp.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,7 +4,6 @@ class ChimpTest &lt; Test::Unit::TestCase
   
   
   def setup
-   
     @chimp = ChimpHelper.new
     credentials = fixtures(:mailchimp)
     @auth = @chimp.login(credentials[:username], credentials[:password])</diff>
      <filename>test/remote/chimp_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,6 +4,7 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/chimp_helper'
+require File.dirname(__FILE__) + '/../lib/mandarin_soda/chimp'
 require 'ruby-debug'
 require 'activesupport'
 </diff>
      <filename>test/test_helper.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>89f57e514418986fc5b562989399ebdd9982c720</id>
    </parent>
  </parents>
  <author>
    <name>Matthew Carlson</name>
    <email>matthewjcarlson@gmail.com</email>
  </author>
  <url>http://github.com/mandarinsoda/acts_as_chimp/commit/2d6587dc15ec11b3ab98b94e8558a760270ceec3</url>
  <id>2d6587dc15ec11b3ab98b94e8558a760270ceec3</id>
  <committed-date>2009-05-10T07:22:23-07:00</committed-date>
  <authored-date>2009-05-10T07:22:23-07:00</authored-date>
  <message>removed mail merge doc example, started remote tests'</message>
  <tree>ecf76878ec712c95b5494a81e064592f9b1134c2</tree>
  <committer>
    <name>Matthew Carlson</name>
    <email>matthewjcarlson@gmail.com</email>
  </committer>
</commit>
