<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -26,11 +26,11 @@ config.action_mailer.delivery_method = :test
 # This is necessary if your schema can't be completely dumped by the schema dumper,
 # like if you have constraints or database-specific column types
 # config.active_record.schema_format = :sql
-config.gem 'mocha'
 config.gem 'nokogiri', :lib =&gt; false
 config.gem 'webrat'
 config.gem 'fakeweb'
 config.gem 'thoughtbot-factory_girl', :lib =&gt; 'factory_girl', :source =&gt; 'http://gems.github.com'
 config.gem 'thoughtbot-shoulda', :lib =&gt; 'shoulda', :source =&gt; 'http://gems.github.com'
+config.gem 'mocha'
 
 HOST = 'localhost'</diff>
      <filename>gold/config/environments/test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -67,12 +67,14 @@ gem 'mislav-will_paginate',          :lib =&gt; 'will_paginate',       :source =&gt; '
 gem 'ambethia-smtp-tls',             :lib =&gt; 'smtp-tls',            :source =&gt; 'http://gems.github.com', :version =&gt; '&gt;= 1.1.2'
 
 # Test gems
-gem 'mocha',    :env =&gt; &quot;test&quot;
 gem 'nokogiri', :env =&gt; &quot;test&quot;, :lib =&gt; false
 gem 'webrat',   :env =&gt; &quot;test&quot;               
 gem 'fakeweb',  :env =&gt; &quot;test&quot;               
 gem 'thoughtbot-factory_girl', :lib =&gt; &quot;factory_girl&quot;, :source =&gt; &quot;http://gems.github.com&quot;, :env =&gt; &quot;test&quot;
 gem 'thoughtbot-shoulda',      :lib =&gt; &quot;shoulda&quot;,      :source =&gt; &quot;http://gems.github.com&quot;, :env =&gt; &quot;test&quot;
+# Mocha *must* come after shoulda.  
+# See http://mediumexposure.com/2009/08/02/getting-rails-233-and-mocha-096-play-nice-testunit-and-shoulda
+gem 'mocha',    :env =&gt; &quot;test&quot;
 
 generate 'blue_ridge'
 generate 'formtastic_stylesheets'</diff>
      <filename>template.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>4fd681b6163080fb417f8a9c3ed2cce5af987cd7</id>
    </parent>
  </parents>
  <author>
    <name>Tammer Saleh</name>
    <email>tsaleh@gmail.com</email>
  </author>
  <url>http://github.com/tsaleh/bushido/commit/5e137744ba18bba2b0a8cadaf6a54480305b336a</url>
  <id>5e137744ba18bba2b0a8cadaf6a54480305b336a</id>
  <committed-date>2009-10-29T10:18:42-07:00</committed-date>
  <authored-date>2009-10-28T11:34:43-07:00</authored-date>
  <message>Fixed mocha/shoulda load order bug</message>
  <tree>2fa7e31c926f6c07e72cb4b35040aa62bded5b88</tree>
  <committer>
    <name>Tammer Saleh</name>
    <email>tsaleh@gmail.com</email>
  </committer>
</commit>
