From bd12750df95c8fe7bb35f9bf7013a9d11c32ddf4 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Wed, 30 Nov 2011 12:30:11 -0800
Subject: [PATCH] Cleanup validation_helpers spec

---
 spec/extensions/validation_helpers_spec.rb | 51 +++++++---------------
 1 file changed, 16 insertions(+), 35 deletions(-)

diff --git a/spec/extensions/validation_helpers_spec.rb b/spec/extensions/validation_helpers_spec.rb
index 5b8526b936..78ab1c203c 100644
--- a/spec/extensions/validation_helpers_spec.rb
+++ b/spec/extensions/validation_helpers_spec.rb
@@ -317,18 +317,14 @@ def validate
     @c.columns(:id, :username, :password)
     @c.set_dataset MODEL_DB[:items]
     @c.set_validations{validates_unique(:username)}
-    @c.dataset.extend(Module.new {
-      def fetch_rows(sql)
-        @db << sql
-        
-        case sql
-        when /COUNT.*username = '0records'/
-          yield({:v => 0})
-        when /COUNT.*username = '1record'/
-          yield({:v => 1})
-        end
+    @c.dataset._fetch = proc do |sql|
+      case sql
+      when /COUNT.*username = '0records'/
+        {:v => 0}
+      when /COUNT.*username = '1record'/
+        {:v => 1}
       end
-    })
+    end
     
     @user = @c.new(:username => "0records", :password => "anothertest")
     @user.should be_valid
@@ -359,18 +355,14 @@ def fetch_rows(sql)
     @c.columns(:id, :username, :password)
     @c.set_dataset MODEL_DB[:items]
     @c.set_validations{validates_unique([:username, :password])}
-    @c.dataset.extend(Module.new {
-      def fetch_rows(sql)
-        @db << sql
-        
-        case sql
-        when /COUNT.*username = '0records'/
-          yield({:v => 0})
-        when /COUNT.*username = '1record'/
-          yield({:v => 1})
-        end
+    @c.dataset._fetch = proc do |sql|
+      case sql
+      when /COUNT.*username = '0records'/
+        {:v => 0}
+      when /COUNT.*username = '1record'/
+        {:v => 1}
       end
-    })
+    end
     
     @user = @c.new(:username => "0records", :password => "anothertest")
     @user.should be_valid
@@ -401,12 +393,7 @@ def fetch_rows(sql)
     @c.columns(:id, :username, :password)
     @c.set_dataset MODEL_DB[:items]
     @c.set_validations{validates_unique(:username){|ds| ds.filter(:active)}}
-    @c.dataset.extend(Module.new {
-      def fetch_rows (sql)
-        @db << sql
-        yield({:v => 0})
-      end
-    })
+    @c.dataset._fetch = {:v=>0}
     
     MODEL_DB.reset
     @c.new(:username => "0records", :password => "anothertest").should be_valid
@@ -419,13 +406,7 @@ def fetch_rows (sql)
     @c.columns(:id, :username, :password)
     @c.set_dataset MODEL_DB[:items]
     @c.set_validations{validates_unique([:username, :password], :only_if_modified=>true)}
-    
-    @c.dataset.extend(Module.new {
-      def fetch_rows (sql)
-        @db << sql
-        yield({:v => 0})
-      end
-    })
+    @c.dataset._fetch = {:v=>0}
     
     MODEL_DB.reset
     @c.new(:username => "0records", :password => "anothertest").should be_valid