<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>test/lib/shoulda.rb</filename>
    </added>
    <added>
      <filename>test/lib/shoulda/active_record_helpers.rb</filename>
    </added>
    <added>
      <filename>test/lib/shoulda/color.rb</filename>
    </added>
    <added>
      <filename>test/lib/shoulda/controller_tests/controller_tests.rb</filename>
    </added>
    <added>
      <filename>test/lib/shoulda/controller_tests/formats/html.rb</filename>
    </added>
    <added>
      <filename>test/lib/shoulda/controller_tests/formats/xml.rb</filename>
    </added>
    <added>
      <filename>test/lib/shoulda/gem/proc_extensions.rb</filename>
    </added>
    <added>
      <filename>test/lib/shoulda/gem/shoulda.rb</filename>
    </added>
    <added>
      <filename>test/lib/shoulda/general.rb</filename>
    </added>
    <added>
      <filename>test/lib/shoulda/private_helpers.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,4 +1,3 @@
 .DS_Store
 test/debug.log
-test/lib/shoulda*
 autotest</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -10,7 +10,7 @@ end
 
 
 desc 'Default: run unit tests.'
-task :default =&gt; :test
+task :default =&gt; :test_rails
 
 desc 'Test the NamedScope plugin.'
 Rake::TestTask.new(:test) do |t|</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -0,0 +1,7 @@
+unless defined? ActiveRecord::NamedScope
+  require &quot;named_scope/core_ext&quot;
+  require &quot;named_scope/named_scope&quot;
+  require &quot;named_scope/named_scope_patch_#{ActiveRecord::Base.respond_to?(:find_first) ? '1.2' : '2.0'}&quot;
+  ActiveRecord::Base.send :include, ActiveRecord::NamedScope
+end
+</diff>
      <filename>lib/named_scope.rb</filename>
    </modified>
    <modified>
      <diff>@@ -7,13 +7,10 @@ require 'factory_girl'
 require 'lib/test_case'
 require 'named_scope'
 
-class GroupedScope::TestCase
+class NamedScope::TestCase
   
   def setup_environment
     setup_database
-    Department.create! :name =&gt; 'IT'
-    Department.create! :name =&gt; 'Human Resources'
-    Department.create! :name =&gt; 'Finance'
   end
   
   protected
@@ -30,14 +27,6 @@ class GroupedScope::TestCase
           t.column :body,         :string
           t.column :employee_id,  :integer
         end
-        connection.create_table :departments, :force =&gt; true do |t|
-          t.column :name,         :string
-        end
-        connection.create_table :department_memberships, :force =&gt; true do |t|
-          t.column :employee_id,    :integer
-          t.column :department_id,  :integer
-          t.column :meta_info,      :string
-        end
       end
     end
   end
@@ -45,11 +34,11 @@ class GroupedScope::TestCase
 end
 
 class Employee &lt; ActiveRecord::Base
-  has_many :reports do ; def urgent ; find(:all,:conditions =&gt; {:title =&gt; 'URGENT'}) ; end ; end
-  has_many :taxonomies, :as =&gt; :classable
-  has_many :department_memberships
-  has_many :departments, :through =&gt; :department_memberships
-  grouped_scope :reports, :departments
+  has_many :reports do
+    def urgent
+      find :all, :conditions =&gt; {:title =&gt; 'URGENT'}
+    end
+  end
 end
 
 class Report &lt; ActiveRecord::Base
@@ -60,15 +49,5 @@ class Report &lt; ActiveRecord::Base
   def urgent_body? ; self[:body] =~ /URGENT/ ; end
 end
 
-class Department &lt; ActiveRecord::Base
-  named_scope :it, :conditions =&gt; {:name =&gt; 'IT'}
-  named_scope :hr, :conditions =&gt; {:name =&gt; 'Human Resources'}
-  named_scope :finance, :conditions =&gt; {:name =&gt; 'Finance'}
-  has_many :department_memberships
-  has_many :employees, :through =&gt; :department_memberships
-end
 
-class DepartmentMembership &lt; ActiveRecord::Base
-  belongs_to :employee
-  belongs_to :department
-end
+</diff>
      <filename>test/helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,15 +2,14 @@ require 'rubygems'
 
 plugin_root     = File.expand_path(File.join(File.dirname(__FILE__),'..'))
 framework_root  = [&quot;#{plugin_root}/rails&quot;, &quot;#{plugin_root}/../../rails&quot;].detect { |p| File.directory? p }
-rails_version   = ENV['RAILS_VERSION']
-rails_version   = '2.0.4' if rails_version &amp;&amp; rails_version == ''
+rails_version   = ENV['RAILS_VERSION'] || '2.0.4'
 
 ['.','lib','test'].each do |plugin_lib|
   load_path = File.expand_path(&quot;#{plugin_root}/#{plugin_lib}&quot;)
   $LOAD_PATH.unshift(load_path) unless $LOAD_PATH.include?(load_path)
 end
 
-if rails_version.nil? &amp;&amp; framework_root
+if framework_root
   puts &quot;Found framework root: #{framework_root}&quot;
   $:.unshift &quot;#{framework_root}/activesupport/lib&quot;, &quot;#{framework_root}/activerecord/lib&quot;
 else</diff>
      <filename>test/lib/boot.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../helper'
+require File.dirname(__FILE__) + '/helper'
 
 class NamedScopeTest &lt; NamedScope::TestCase
   </diff>
      <filename>test/named_scope_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>f3e30fe7f68df9584d1b0adedbeef14a6306f6b4</id>
    </parent>
  </parents>
  <author>
    <name>Ken Collins</name>
    <email>ken@metaskills.net</email>
  </author>
  <url>http://github.com/metaskills/named_scope/commit/2ebebc6da5e7d43c000e600248be4cb9abe4e2a4</url>
  <id>2ebebc6da5e7d43c000e600248be4cb9abe4e2a4</id>
  <committed-date>2008-10-03T07:24:26-07:00</committed-date>
  <authored-date>2008-10-03T07:24:26-07:00</authored-date>
  <message>Test is go!</message>
  <tree>16967d76826812d17bd61741b523a3dfc68b7ffb</tree>
  <committer>
    <name>Ken Collins</name>
    <email>ken@metaskills.net</email>
  </committer>
</commit>
