client_side_validations 3.0.4 → 3.1.0

data/test/action_view/cases/helper.rb

@@ -1,8 +1,14 @@
 require 'base_helper'
 require 'action_view'
-require 'client_side_validations/action_view'
-require 'action_view/template/handlers/erb'
+require 'action_view/template'
 require 'action_view/models'
+require 'client_side_validations/action_view'
+
+module ActionController
+  class Base
+    include ActionDispatch::Routing::RouteSet.new.url_helpers
+  end
+end
 
 module ActionViewTestSetup
   include ::ClientSideValidations::ActionView::Helpers::FormHelper
@@ -12,6 +18,19 @@ module ActionViewTestSetup
     @output_buffer = super
   end
 
+  Routes = ActionDispatch::Routing::RouteSet.new
+  Routes.draw do
+    resources :posts do
+      resources :comments
+    end
+  end
+
+  def _routes
+    Routes
+  end
+
+  include Routes.url_helpers
+
   def setup
     super
 
@@ -67,14 +86,11 @@ module ActionViewTestSetup
     @post.body        = "Back to the hill and over it again!"
     @post.secret      = 1
     @post.written_on  = Date.new(2004, 6, 15)
-  end
 
-  def url_for(object)
-    @url_for_options = object
-    if object.is_a?(Hash)
-      "http://www.example.com"
+    if defined?(ActionView::OutputFlow)
+      @view_flow        = ActionView::OutputFlow.new
     else
-      super
+      @_content_for     = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
     end
   end
 
@@ -85,11 +101,12 @@ module ActionViewTestSetup
     txt << %{</div>}
   end
 
-  def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil, validators = nil)
+  def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil, validators = nil, file = nil)
     txt =  %{<form accept-charset="UTF-8" action="#{action}"}
     txt << %{ data-remote="true"} if remote
     txt << %{ class="#{html_class}"} if html_class
     txt << %{ data-validate="true"} if validators
+    txt << %{ enctype="multipart/form-data"} if file
     txt << %{ id="#{id}"} if id
     txt << %{ method="post"}
     txt << %{ novalidate="novalidate"} if validators
@@ -100,20 +117,24 @@ module ActionViewTestSetup
     contents = block_given? ? yield : ""
 
     if options.is_a?(Hash)
-      method, remote, validators = options.values_at(:method, :remote, :validators)
+      method, remote, validators, file = options.values_at(:method, :remote, :validators, :file)
     else
       method = options
     end
 
-    html = form_text(action, id, html_class, remote, validators) + snowman(method) + (contents || "") + "</form>"
+    html = form_text(action, id, html_class, remote, validators, file) + snowman(method) + (contents || "") + "</form>"
 
     if options.is_a?(Hash) && options[:validators]
-      html + %Q{<script>var #{id} = #{client_side_form_settings_helper.merge(:validators => validators).to_json};</script>}
+      build_script_tag(html, id, options[:validators])
     else
       html
     end
   end
 
+  def build_script_tag(html, id, validators)
+    (html || "") + %Q{<script>window['#{id}'] = #{client_side_form_settings_helper.merge(:validators => validators).to_json};</script>}
+  end
+
   protected
     def comments_path(post)
       "/posts/#{post.id}/comments"
@@ -152,3 +173,4 @@ module ActionViewTestSetup
     end
 
 end
+

data/test/action_view/cases/test_helpers.rb

@@ -44,7 +44,7 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     end
 
     validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators, :file => true) do
       %{<input data-validate="true" id="post_cost" name="post[cost]" type="file" />}
     end
     assert_equal expected, output_buffer
@@ -296,6 +296,18 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
+  def test_select_multiple
+    form_for(@post, :validate => true) do |f|
+      concat f.select(:cost, [], {}, :multiple => true)
+    end
+
+    validators = {'post[cost][]' => {:presence => {:message => "can't be blank"}}}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<select data-validate="true" id="post_cost" multiple="multiple" name="post[cost][]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
+
   def test_collection_select
     form_for(@post, :validate => true) do |f|
       concat f.collection_select(:cost, [], :id, :name)
@@ -333,5 +345,256 @@ class ClientSideValidations::ActionViewHelpersTest < ActionView::TestCase
     end
     assert_equal expected, output_buffer
   end
+
+  def test_conditional_validator_filters
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost)
+      concat f.text_field(:title)
+    end
+
+    validators = {}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input id="post_cost" name="post[cost]" size="30" type="text" />} +
+      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validators_should_be_filtered
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost)
+      concat f.text_field(:title)
+    end
+
+    validators = {}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input id="post_cost" name="post[cost]" size="30" type="text" />} +
+      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
+    end
+
+    validators = {
+      'post[cost]'  => {:presence => {:message => "can't be blank"}},
+      'post[title]' => {:presence => {:message => "can't be blank"}}
+    }
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" />} +
+      %{<input data-validate="true" id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced_and_not_meeting_condition
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(true)
+    @post.stubs(:can_validate?).returns(false)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
+    end
+
+    validators = {}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input id="post_cost" name="post[cost]" size="30" type="text" />} +
+      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced_individually
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => { :presence => true })
+      concat f.text_field(:title, :validate => { :presence => true })
+    end
+
+    validators = {
+      'post[cost]'  => {:presence => {:message => "can't be blank"}},
+      'post[title]' => {:presence => {:message => "can't be blank"}}
+    }
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" />} +
+      %{<input data-validate="true" id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced_and_not_meeting_condition_individually
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(true)
+    @post.stubs(:can_validate?).returns(false)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => { :presence => true })
+      concat f.text_field(:title, :validate => { :presence => true })
+    end
+
+    validators = {}
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input id="post_cost" name="post[cost]" size="30" type="text" />} +
+      %{<input id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_conditional_validator_filters_being_forced_with_procs
+    hash = {
+      :cost => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => Proc.new { |post| post.cannot_validate? }
+        }
+      },
+      :title => {
+        :presence => {
+          :message => "can't be blank",
+          :if => Proc.new { |post| post.can_validate? }
+        }
+      }
+    }
+
+    @post.title = nil
+    @post.stubs(:cannot_validate?).returns(false)
+    @post.stubs(:can_validate?).returns(true)
+    @post.stubs(:client_side_validation_hash).returns(hash)
+    form_for(@post, :validate => true) do |f|
+      concat f.text_field(:cost, :validate => true)
+      concat f.text_field(:title, :validate => true)
+    end
+
+    validators = {
+      'post[cost]'  => {:presence => {:message => "can't be blank"}},
+      'post[title]' => {:presence => {:message => "can't be blank"}}
+    }
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => "put", :validators => validators) do
+      %{<input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" />} +
+      %{<input data-validate="true" id="post_title" name="post[title]" size="30" type="text" />}
+    end
+    assert_equal expected, output_buffer
+  end
+
+  def test_pushing_script_to_content_for
+    form_for(@post, :validate => :post) do |f|
+      concat f.text_field(:cost)
+    end
+
+    validators = {'post[cost]' => {:presence => {:message => "can't be blank"}}}
+    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="edit_post" data-validate="true" id="edit_post_123" method="post" novalidate="novalidate"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="put" /></div><input data-validate="true" id="post_cost" name="post[cost]" size="30" type="text" /></form>}
+    assert_equal expected, output_buffer
+    assert_equal build_script_tag(nil, "edit_post_123", validators), content_for(:post)
+  end
 end
 

data/test/action_view/cases/test_legacy_helpers.rb

@@ -30,7 +30,7 @@ class ClientSideValidations::LegacyActionViewHelpersTest < ActionView::TestCase
       concat f.file_field(:cost)
     end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put") do
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", :method => :put, :file => true) do
       %{<input id="post_cost" name="post[cost]" type="file" />}
     end
     assert_equal expected, output_buffer
@@ -168,6 +168,17 @@ class ClientSideValidations::LegacyActionViewHelpersTest < ActionView::TestCase
     assert_equal expected, output_buffer
   end
 
+  def test_select_multiple
+    form_for(@post) do |f|
+      concat f.select(:cost, [], {}, :multiple => true)
+    end
+
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put") do
+      %{<select id="post_cost" multiple="multiple" name="post[cost][]"></select>}
+    end
+    assert_equal expected, output_buffer
+  end
+
   def test_collection_select
     form_for(@post) do |f|
       concat f.collection_select(:cost, [], :id, :name)

data/test/active_model/cases/test_validations.rb

@@ -138,24 +138,37 @@ class ActiveModel::ValidationsTest < ClientSideValidations::ActiveModelTestBase
     assert_equal expected_hash, person.client_side_validation_hash
   end
 
-  def test_validators_with_if_or_unless_are_ignored
+  def test_generic_block_validators_should_be_ignored
     person = new_person do |p|
-      p.validates_presence_of :first_name, :if     => Proc.new { |p| true }
-      p.validates_presence_of :last_name,  :unless => Proc.new { |p| true }
+      p.validates_each(:first_name) do |record, attr, value|
+        record.errors.add(:first_name, "failed")
+      end
     end
 
     expected_hash = {}
     assert_equal expected_hash, person.client_side_validation_hash
   end
 
-  def test_generic_block_validators_should_be_ignored
+  def test_conditionals_persist_on_validator
     person = new_person do |p|
-      p.validates_each(:first_name) do |record, attr, value|
-        record.errors.add(:first_name, "failed")
-      end
+      p.validates :first_name, :presence => { :if => :can_validate? }
+      p.validates :last_name, :presence => { :unless => :cannot_validate? }
     end
 
-    expected_hash = {}
+    expected_hash = {
+      :first_name => {
+        :presence => {
+          :message => "can't be blank",
+          :if => :can_validate?
+        }
+      },
+      :last_name => {
+        :presence => {
+          :message => "can't be blank",
+          :unless => :cannot_validate?
+        }
+      }
+    }
     assert_equal expected_hash, person.client_side_validation_hash
   end
 end

data/test/active_record/cases/test_middleware.rb

@@ -30,7 +30,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_resource_exists
     User.create(:email => 'user@test.com')
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'case_sensitive' => true }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -38,14 +38,14 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_resource_exists_and_param_order_is_backwards
     User.create(:email => 'user@test.com')
-    get '/validators/uniqueness.json', { 'case_sensitive' => true, 'user[email]' => 'user@test.com' }
+    get '/validators/uniqueness', { 'case_sensitive' => true, 'user[email]' => 'user@test.com' }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
 
   def test_uniqueness_when_resource_does_not_exist
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'case_sensitive' => true }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -53,15 +53,33 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_id_is_given
     user = User.create(:email => 'user@test.com')
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'id' => user.id, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'id' => user.id, 'case_sensitive' => true }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
   end
 
+  def test_mysql_adapter_uniqueness_when_id_is_given
+    user = User.create(:email => 'user@test.com')
+    ActiveRecord::ConnectionAdapters::SQLite3Adapter.
+                                        any_instance.expects(:instance_variable_get).
+                                        with("@config").
+                                        returns({:adapter => "mysql"})
+
+    sql_without_binary = "#{User.arel_table["email"].eq(user.email).to_sql} AND #{User.arel_table.primary_key.not_eq(user.id).to_sql}"
+    relation = Arel::Nodes::SqlLiteral.new("BINARY #{sql_without_binary}")
+
+    #NOTE: Stubs User#where because SQLite3 don't know BINARY
+    result = User.where(sql_without_binary)
+    User.expects(:where).with(relation).returns(result)
+
+    get '/validators/uniqueness', { 'user[email]' => user.email, 'case_sensitive' => true, 'id' => user.id}
+    assert_equal 'true', last_response.body
+  end
+
   def test_uniqueness_when_scope_is_given
     User.create(:email => 'user@test.com', :age => 25)
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'scope' => { 'age' => 30 }, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'scope' => { 'age' => 30 }, 'case_sensitive' => true }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -69,7 +87,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_multiple_scopes_are_given
     User.create(:email => 'user@test.com', :age => 30, :name => 'Brian')
-    get '/validators/uniqueness.json', { 'user[email]' => 'user@test.com', 'scope' => { 'age' => 30, 'name' => 'Robert' }, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[email]' => 'user@test.com', 'scope' => { 'age' => 30, 'name' => 'Robert' }, 'case_sensitive' => true }
 
     assert_equal 'true', last_response.body
     assert last_response.not_found?
@@ -77,7 +95,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_case_insensitive
     User.create(:name => 'Brian')
-    get '/validators/uniqueness.json', { 'user[name]' => 'BRIAN', 'case_sensitive' => false }
+    get '/validators/uniqueness', { 'user[name]' => 'BRIAN', 'case_sensitive' => false }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -85,7 +103,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_attribute_passes_as_an_integer
     User.create(:name => 123)
-    get '/validators/uniqueness.json', { 'user[name]' => 123, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[name]' => 123, 'case_sensitive' => true }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -93,7 +111,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
 
   def test_uniqueness_when_attribute_passes_as_an_integer
     User.create(:name => 123)
-    get '/validators/uniqueness.json', { 'user[name]' => 123, 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[name]' => 123, 'case_sensitive' => true }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -102,14 +120,14 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
   def test_uniqueness_with_columns_which_are_sql_keywords
     Guid.validates_uniqueness_of :key
     assert_nothing_raised do
-      get '/validators/uniqueness.json', { 'guid[key]' => 'test', 'case_sensitive' => true }
+      get '/validators/uniqueness', { 'guid[key]' => 'test', 'case_sensitive' => true }
     end
   end
 
   def test_uniqueness_with_limit
     # User.title is limited to 5 characters
     User.create(:title => "abcde")
-    get '/validators/uniqueness.json', { 'user[title]' => 'abcdefgh', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'user[title]' => 'abcdefgh', 'case_sensitive' => true }
 
     assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -119,7 +137,7 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
     with_kcode('UTF8') do
       # User.title is limited to 5 characters
       User.create(:title => "一二三四五")
-      get '/validators/uniqueness.json', { 'user[title]' => '一二三四五六七八', 'case_sensitive' => true }
+      get '/validators/uniqueness', { 'user[title]' => '一二三四五六七八', 'case_sensitive' => true }
 
       assert_equal 'false', last_response.body
     assert last_response.ok?
@@ -127,24 +145,31 @@ class ClientSideValidationsActiveRecordMiddlewareTest < Test::Unit::TestCase
   end
 
   def test_validate_straight_inheritance_uniqueness
-    get '/validators/uniqueness.json', { 'inept_wizard[name]' => 'Rincewind', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'inept_wizard[name]' => 'Rincewind', 'case_sensitive' => true }
     assert_equal 'true', last_response.body
     assert last_response.not_found?
 
     IneptWizard.create(:name => 'Rincewind')
-    get '/validators/uniqueness.json', { 'inept_wizard[name]' => 'Rincewind', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'inept_wizard[name]' => 'Rincewind', 'case_sensitive' => true }
     assert_equal 'false', last_response.body
     assert last_response.ok?
 
-    get '/validators/uniqueness.json', { 'conjurer[name]' => 'Rincewind', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'conjurer[name]' => 'Rincewind', 'case_sensitive' => true }
     assert_equal 'false', last_response.body
     assert last_response.ok?
 
     Conjurer.create(:name => 'The Amazing Bonko')
-    get '/validators/uniqueness.json', { 'thaumaturgist[name]' => 'The Amazing Bonko', 'case_sensitive' => true }
+    get '/validators/uniqueness', { 'thaumaturgist[name]' => 'The Amazing Bonko', 'case_sensitive' => true }
     assert_equal 'false', last_response.body
     assert last_response.ok?
   end
 
+  def test_uniqueness_when_resource_is_a_nested_module
+    ActiveRecordTestModule::User2.create(:email => 'user@test.com')
+    get '/validators/uniqueness', { 'active_record_test_module/user2[email]' => 'user@test.com', 'case_sensitive' => true }
+
+    assert_equal 'false', last_response.body
+    assert last_response.ok?
+  end
 end
 

data/test/active_record/cases/test_uniqueness_validator.rb

@@ -41,5 +41,10 @@ class ActiveRecord::UniquenessValidatorTest < ClientSideValidations::ActiveRecor
     assert_equal expected_hash, result_hash
   end
 
+  def test_uniqueness_client_side_hash_when_nested_module
+    @user = ActiveRecordTestModule::User2.new
+    expected_hash = { :message => "has already been taken", :case_sensitive => true, :class => 'active_record_test_module/user2' }
+    assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name]).client_side_hash(@user, :name)
+  end
 end
 

data/test/active_record/models/user.rb

@@ -8,3 +8,7 @@ end
 class IneptWizard < User; end
 class Conjurer < IneptWizard; end
 class Thaumaturgist < Conjurer; end
+
+module ActiveRecordTestModule
+  class User2 < User; end
+end

data/test/base_helper.rb

@@ -1,4 +1,6 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup
 require 'ruby-debug'
 require 'test/unit'
 require 'mocha'

data/test/core_ext/cases/test_core_ext.rb

@@ -1,3 +1,4 @@
+require 'base_helper'
 require 'client_side_validations/core_ext'
 
 class CoreExtTest < Test::Unit::TestCase

data/test/formtastic/cases/helper.rb

@@ -1,2 +1,7 @@
+# encoding: utf-8
+require 'active_support'
+require 'formtastic/railtie' if defined?(::Rails)
+require 'formtastic/engine' if defined?(::Rails)
 require 'formtastic'
 require 'client_side_validations/formtastic'
+