From 0c76a52c472546083a199f685f96170031b36fdd Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Wed, 2 May 2012 23:57:52 +0100
Subject: clean up implementation of dynamic methods. use method compilation
 etc.

---
 .../test/cases/dynamic_finder_match_test.rb        | 106 ---------------------
 activerecord/test/cases/named_scope_test.rb        |   5 +-
 2 files changed, 2 insertions(+), 109 deletions(-)
 delete mode 100644 activerecord/test/cases/dynamic_finder_match_test.rb

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/dynamic_finder_match_test.rb b/activerecord/test/cases/dynamic_finder_match_test.rb
deleted file mode 100644
index db619faa83..0000000000
--- a/activerecord/test/cases/dynamic_finder_match_test.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-require "cases/helper"
-
-module ActiveRecord
-  class DynamicFinderMatchTest < ActiveRecord::TestCase
-    def test_find_or_create_by
-      match = DynamicFinderMatch.match("find_or_create_by_age_and_sex_and_location")
-      assert_not_nil match
-      assert !match.finder?
-      assert match.instantiator?
-      assert_equal :first, match.finder
-      assert_equal :create, match.instantiator
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_or_initialize_by
-      match = DynamicFinderMatch.match("find_or_initialize_by_age_and_sex_and_location")
-      assert_not_nil match
-      assert !match.finder?
-      assert match.instantiator?
-      assert_equal :first, match.finder
-      assert_equal :new, match.instantiator
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_no_match
-      assert_nil DynamicFinderMatch.match("not_a_finder")
-    end
-
-    def find_by_bang
-      match = DynamicFinderMatch.match("find_by_age_and_sex_and_location!")
-      assert_not_nil match
-      assert match.finder?
-      assert match.bang?
-      assert_equal :first, match.finder
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_by
-      match = DynamicFinderMatch.match("find_by_age_and_sex_and_location")
-      assert_not_nil match
-      assert match.finder?
-      assert_equal :first, match.finder
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_by_with_symbol
-      m = DynamicFinderMatch.match(:find_by_foo)
-      assert_equal :first, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-    end
-
-    def test_find_all_by_with_symbol
-      m = DynamicFinderMatch.match(:find_all_by_foo)
-      assert_equal :all, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-    end
-
-    def test_find_all_by
-      match = DynamicFinderMatch.match("find_all_by_age_and_sex_and_location")
-      assert_not_nil match
-      assert match.finder?
-      assert_equal :all, match.finder
-      assert_equal %w(age sex location), match.attribute_names
-    end
-
-    def test_find_last_by
-      m = DynamicFinderMatch.match(:find_last_by_foo)
-      assert_equal :last, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-    end
-
-    def test_find_by!
-      m = DynamicFinderMatch.match(:find_by_foo!)
-      assert_equal :first, m.finder
-      assert m.bang?, 'should be banging'
-      assert_equal %w{ foo }, m.attribute_names
-    end
-
-    def test_find_or_create
-      m = DynamicFinderMatch.match(:find_or_create_by_foo)
-      assert_equal :first, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-      assert_equal :create, m.instantiator
-    end
-
-    def test_find_or_create!
-      m = DynamicFinderMatch.match(:find_or_create_by_foo!)
-      assert_equal :first, m.finder
-      assert m.bang?, 'should be banging'
-      assert_equal %w{ foo }, m.attribute_names
-      assert_equal :create, m.instantiator
-    end
-
-    def test_find_or_initialize
-      m = DynamicFinderMatch.match(:find_or_initialize_by_foo)
-      assert_equal :first, m.finder
-      assert_equal %w{ foo }, m.attribute_names
-      assert_equal :new, m.instantiator
-    end
-
-    def test_garbage
-      assert !DynamicFinderMatch.match(:fooo), 'should be false'
-      assert !DynamicFinderMatch.match(:find_by), 'should be false'
-    end
-  end
-end
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index f8557259fb..479b375360 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -442,13 +442,12 @@ end
 
 class DynamicScopeMatchTest < ActiveRecord::TestCase
   def test_scoped_by_no_match
-    assert_nil ActiveRecord::DynamicScopeMatch.match("not_scoped_at_all")
+    assert_nil ActiveRecord::DynamicMatchers::ScopedBy.match("not_scoped_at_all")
   end
 
   def test_scoped_by
-    match = ActiveRecord::DynamicScopeMatch.match("scoped_by_age_and_sex_and_location")
+    match = ActiveRecord::DynamicMatchers::ScopedBy.match("scoped_by_age_and_sex_and_location")
     assert_not_nil match
-    assert match.scope?
     assert_equal %w(age sex location), match.attribute_names
   end
 end
-- 
cgit v1.2.3