<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>test/fixtures.yml</filename>
    </added>
    <added>
      <filename>test/fixtures/.DS_Store</filename>
    </added>
    <added>
      <filename>test/fixtures/user.yml</filename>
    </added>
    <added>
      <filename>test/remote/.DS_Store</filename>
    </added>
    <added>
      <filename>test/remote/chimp_test.rb</filename>
    </added>
    <added>
      <filename>test/test_helper.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -14,10 +14,10 @@ This plugin is fairly stripped down at the moment and is directed at a fairly sp
 We add user first name, last name and email address to our MailChimp mailing list, and we've likewise assumed you'll want to do the same.  As such, we've provided a script to create a migration to add user first and last names to your users table if they're not already there.  The sign-up forms are up to you and any additional fields are up to you.  
 
 
-After running the migrations, you can just add your credentials to the mail_chimp.yml file and then add the following to your user model:
+After running the migrations, you can just add your credentials to the mail_chimp.yml file and then add the following to your user model (NOTE: mail merge variables are dependent upon what you have setup in your MailChimp mailing list):
 
 acts_as_chimp :mailing_list_id =&gt; 'your_list_id', :mail_merge =&gt; {
-      &quot;EMAIL&quot; =&gt; :email, &quot;FNAME&quot; =&gt; :first_name, &quot;LNAME&quot; =&gt; :last_name }
+       &quot;FNAME&quot; =&gt; :first_name, &quot;LNAME&quot; =&gt; :last_name }
       
 
 You can get your list id by using the ChimpHelper class.  The mail merge arguments correspond to the arguments you setup when you created your MailChimp list.       </diff>
      <filename>README</filename>
    </modified>
    <modified>
      <diff>@@ -2,14 +2,19 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-desc 'Default: run unit tests.'
-task :default =&gt; :test
+# Run the unit tests
+namespace :test do
+  Rake::TestTask.new(:units) do |t|
+    t.pattern = 'test/unit/**/chimp_test.rb'
+    t.ruby_opts &lt;&lt; '-rubygems'
+    t.verbose = true
+  end
 
-desc 'Test the acts_as_chimp plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs &lt;&lt; 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+  Rake::TestTask.new(:remote) do |t|
+    t.pattern = 'test/remote/chimp_test.rb'
+    t.ruby_opts &lt;&lt; '-rubygems'
+    t.verbose = true
+  end
 end
 
 desc 'Generate documentation for the acts_as_chimp plugin.'</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -27,7 +27,7 @@ module MandarinSoda
         end
         
          if options[:mail_merge].nil?
-            raise ChimpConfigError, 'Some mail merge arguments are required to subscribe a user.  See README.'
+            raise ChimpConfigError, 'Some mail merge arguments are required to subscribe a user.  See README and check your MailChimp config.'
         end
         
         self.options = options 
@@ -85,6 +85,7 @@ 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    </diff>
      <filename>lib/mandarin_soda/chimp.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>5ea2e70a436087ae4370b6587fe740f417d51edb</id>
    </parent>
  </parents>
  <author>
    <name>Matthew Carlson</name>
    <email>matthewjcarlson@gmail.com</email>
  </author>
  <url>http://github.com/mandarinsoda/acts_as_chimp/commit/89f57e514418986fc5b562989399ebdd9982c720</url>
  <id>89f57e514418986fc5b562989399ebdd9982c720</id>
  <committed-date>2009-05-08T15:48:06-07:00</committed-date>
  <authored-date>2009-05-08T15:48:06-07:00</authored-date>
  <message>removed mail merge doc example, started remote tests'</message>
  <tree>0ccd5b519af5fddf610ddf4b532cfbe31a58d9f9</tree>
  <committer>
    <name>Matthew Carlson</name>
    <email>matthewjcarlson@gmail.com</email>
  </committer>
</commit>
