client_side_validations 3.0.4 → 3.0.5

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/formtastic/cases/test_form_helper.rb

@@ -14,7 +14,7 @@ class ClientSideValidations::Formtastic::FormHelperTest < ActionView::TestCase
       concat f.input(:cost)
     end
 
-    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="formtastic 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><li class="string required" id="post_cost_input"><label for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validate="true" id="post_cost" name="post[cost]" type="text" /></li></form><script>var edit_post_123 = {"type":"Formtastic::SemanticFormBuilder","inline_error_class":"inline-errors","validators":{"post[cost]":{"presence":{"message":"can't be blank"}}}};</script>}
+    expected = %{<form accept-charset="UTF-8" action="/posts/123" class="formtastic 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><li class="string required" id="post_cost_input"><label for="post_cost">Cost<abbr title="required">*</abbr></label><input data-validate="true" id="post_cost" name="post[cost]" type="text" /></li></form><script>window['edit_post_123'] = {"type":"Formtastic::SemanticFormBuilder","inline_error_class":"inline-errors","validators":{"post[cost]":{"presence":{"message":"can't be blank"}}}};</script>}
     assert_equal expected, output_buffer, "\n\n *** If you're running Ruby 1.8 and this test fails is is most likely due to 1.8's lack of insertion order persistence with Hashes ***\n"
   end
 

data/test/javascript/public/test/callbacks/elementAfter.js

@@ -1,6 +1,6 @@
 module('Element Validate After Callback', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',

data/test/javascript/public/test/callbacks/elementBefore.js

@@ -1,6 +1,6 @@
 module('Element Validate Before Callback', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',

data/test/javascript/public/test/callbacks/elementFail.js

@@ -1,6 +1,6 @@
 module('Element Validate Fail Callback', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',

data/test/javascript/public/test/callbacks/elementPass.js

@@ -1,6 +1,6 @@
 module('Element Validate Pass Callback', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',

data/test/javascript/public/test/callbacks/formAfter.js

@@ -1,6 +1,6 @@
 module('Form Validate After Callback', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',

data/test/javascript/public/test/callbacks/formBefore.js

@@ -1,6 +1,6 @@
 module('Form Validate Before Callback', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',

data/test/javascript/public/test/callbacks/formFail.js

@@ -1,6 +1,6 @@
 module('Form Validate Fail Callback', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',

data/test/javascript/public/test/callbacks/formPass.js

@@ -1,6 +1,6 @@
 module('Form Validate Pass Callback', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',

data/test/javascript/public/test/form_builders/validateForm.js

@@ -1,6 +1,6 @@
 module('Validate Form', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',

data/test/javascript/public/test/form_builders/validateFormtastic.js

@@ -1,6 +1,6 @@
 module('Validate Formtastic', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'Formtastic::SemanticFormBuilder',
       inline_error_class: 'inline-errors',
       validators: {

data/test/javascript/public/test/form_builders/validateNestedForm.js

@@ -0,0 +1,66 @@
+module('Validate Form', {
+  setup: function() {
+    window['new_user'] = {
+      type: 'NestedForm::Builder',
+      input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+      label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+      validators: {'user[name]':{"presence":{"message": "must be present"}}}
+    }
+
+    $('#qunit-fixture')
+      .append($('<form />', {
+        action: '/users',
+        'data-validate': true,
+        method: 'post',
+        id: 'new_user'
+      }))
+      .find('form')
+        .append($('<input />', {
+          name: 'user[name]',
+          id: 'user_name',
+          'data-validate': 'true',
+          type: 'text'
+        }))
+        .append($('<label for="user_name">Name</label>'));
+    $('form#new_user').validate();
+  }
+});
+
+asyncTest('Validate form with invalid form', 4, function() {
+  var form = $('form#new_user'), input = form.find('input#user_name');
+  var label = $('label[for="user_name"]');
+
+  form.trigger('submit');
+  setTimeout(function() {
+    start();
+    ok(input.parent().hasClass('field_with_errors'));
+    ok(label.parent().hasClass('field_with_errors'));
+    ok(input.parent().find('label:contains("must be present")')[0]);
+    ok(!$('iframe').contents().find('p:contains("Form submitted")')[0]);
+  }, 30);
+});
+
+asyncTest('Validate form with valid form', 1, function() {
+  var form = $('form#new_user'), input = form.find('input#user_name');
+  input.val('Test');
+
+  form.trigger('submit');
+  setTimeout(function() {
+    start();
+    ok($('iframe').contents().find('p:contains("Form submitted")')[0]);
+  }, 30);
+});
+
+asyncTest('Validate form with an input changed to false', 1, function() {
+  var form = $('form#new_user'), input = form.find('input#user_name');
+  input.val('Test');
+  input.attr('changed', false);
+  input.attr('data-valid', true);
+
+  form.trigger('submit');
+  setTimeout(function() {
+    start();
+    ok($('iframe').contents().find('p:contains("Form submitted")')[0]);
+  }, 30);
+});
+

data/test/javascript/public/test/form_builders/validateSimpleForm.js

@@ -1,6 +1,6 @@
 module('Validate SimpleForm', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'SimpleForm::FormBuilder',
       error_class: 'error',
       error_tag: 'span',

data/test/javascript/public/test/validateElement.js

@@ -1,6 +1,6 @@
 module('Validate Element', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
@@ -140,5 +140,40 @@ test('Validate when error message needs to change', function() {
   input.trigger('change')
   input.trigger('focusout');
   equal(input.parent().find('label.message').text(), "is invalid");
+})
+
+test("Don't validate confirmation when not a validatable input", function() {
+  $('#qunit-fixture')
+    .append($('<form />', {
+      action: '/users',
+      'data-validate': true,
+      method: 'post',
+      id: 'new_user_2'
+    }))
+    .find('form')
+      .append($('<label for="user_2_password">Password</label>'))
+      .append($('<input />', {
+        name: 'user_2[password]',
+        id: 'user_2_password',
+        type: 'password'
+      }))
+      .append($('<label for="user_2_password_confirmation">Password Confirmation</label>'))
+      .append($('<input />', {
+        name: 'user_2[password_confirmation]',
+        id: 'user_2_password_confirmation',
+        type: 'password'
+      }))
+  new_user_2 = {
+    type: 'ActionView::Helpers::FormBuilder',
+    input_tag: '<div class="field_with_errors"><span id="input_tag" /><label for="user_name" class="message"></label></div>',
+    label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
+    validators: {
+    }
+  }
+  $('form#new_user_2').validate();
+  var form = $('form#new_user_2'), input = form.find('input#user_2_password_confirmation');
+  input.val('123');
+  input.trigger('focusout');
+  ok(!input.parent().hasClass('field_with_errors'));
 });
 

data/test/javascript/public/test/validators/length.js

@@ -27,7 +27,13 @@ test('when allowing blank and allowed length is 3', function() {
   equal(clientSideValidations.validators.local.length(element, options), undefined);
 });
 
-test('when allowing blank and allowed length is 3', function() {
+test('when allowing blank and minimum length is 3 and maximum length is 100', function() {
+  var element = $('<input type="text" />');
+  var options = { messages: { minimum: "failed minimum validation", maximum: "failed maximum validation" }, minimum: 3, maximum: 100, allow_blank: true };
+  equal(clientSideValidations.validators.local.length(element, options), undefined);
+});
+
+test('when not allowing blank and allowed length is 3', function() {
   var element = $('<input type="text" />');
   var options = { messages: { is: "failed validation" }, is: 3 };
   equal(clientSideValidations.validators.local.length(element, options), "failed validation");

data/test/javascript/public/test/validators/numericality.js

@@ -105,6 +105,13 @@ test('when only allowing values equal to 10 and value is 11', function() {
   equal(clientSideValidations.validators.local.numericality(element, options), "failed validation");
 });
 
+test('when only allowing value equal to 0 and value is 1', function() {
+  var element = $('<input type="text" />');
+  var options = { messages: { equal_to: "failed validation" }, equal_to: 0 };
+  element.val('1');
+  equal(clientSideValidations.validators.local.numericality(element, options), "failed validation");
+});
+
 test('when only allowing odd values and the value is odd', function() {
   var element = $('<input type="text" />');
   var options = { messages: { odd: "failed validation" }, odd: true };

data/test/javascript/public/test/validators/presence.js

@@ -13,3 +13,9 @@ test('when value is empty', function() {
   equal(clientSideValidations.validators.local.presence(element, options), "failed validation");
 });
 
+test('when value is null from non-selected multi-select element', function() {
+  var element = $('<select multiple="multiple />');
+  var options = { message: "failed validation" };
+  equal(clientSideValidations.validators.local.presence(element, options), "failed validation");
+});
+

data/test/javascript/public/test/validators/uniqueness.js

@@ -1,6 +1,6 @@
 module('Uniqueness options', {
   setup: function() {
-    new_user = {
+    window['new_user'] = {
       type: 'ActionView::Helpers::FormBuilder',
       input_tag: '<div class="field_with_errors"><span id="input_tag" /><label class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag" /></div>',
@@ -87,3 +87,10 @@ test('when validating by scope and mixed focus order', function() {
   equal($('.message[for="user_email"]').text(), 'must be unique');
 });
 
+test('when matching uniqueness on a resource with a defined class name', function() {
+  var element = $('<input type="text" name="user2[email]"/>');
+  var options = { 'message': "failed validation", 'class': "active_record_test_module/user2" };
+  element.val('nottaken@test.com');
+  equal(clientSideValidations.validators.remote.uniqueness(element, options), 'failed validation');
+});
+

data/test/javascript/server.rb

@@ -46,7 +46,13 @@ end
 get '/validators/uniqueness.json' do
   content_type 'application/json'
 
-  if scope = params[:scope]
+  if user = params[:user2]
+    status 500
+    'error'
+  elsif user = params['active_record_test_module/user2']
+    status 200
+    'false'
+  elsif scope = params[:scope]
     if scope[:name] == 'test name' || scope[:name] == 'taken name'
       status 200
       'false'

data/test/javascript/views/index.erb

@@ -7,7 +7,7 @@
 <h1 id="qunit-header"><%= @title %></h1>
 <div id="jquery-version">
   jQuery version:
-  <% %w{1.4.1 1.4.2 1.4.3 1.4.4 1.5 1.5.1}.each do |version| %>
+  <% %w{1.4.1 1.4.2 1.4.3 1.4.4 1.5 1.5.1 1.6}.each do |version| %>
     <%= jquery_link version %> •
   <% end %>
   <%= jquery_link 'edge' if File.exist?(settings.root + '/public/vendor/jquery.js') %>

data/test/mongo_mapper/cases/helper.rb

@@ -0,0 +1,9 @@
+require 'base_helper'
+require 'mongo_mapper'
+require 'client_side_validations/mongo_mapper'
+
+MongoMapper.database = "client_side_validations_development"
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
+
+require 'mongo_mapper/models/magazine'
+

data/test/mongo_mapper/cases/test_base.rb

@@ -0,0 +1,15 @@
+require 'mongo_mapper/cases/helper'
+
+class ClientSideValidations::MongoMapperTestBase < Test::Unit::TestCase
+  include MongoMapper::Plugins::Validations
+
+  def setup
+    @magazine = Magazine.new
+  end
+
+  def test_uniqueness_client_side_hash
+    expected_hash = { :message => "has already been taken", :case_sensitive => true}
+    assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name]).client_side_hash(@magazine, :age)
+  end
+end
+

data/test/mongo_mapper/cases/test_middleware.rb

@@ -0,0 +1,77 @@
+require 'middleware/cases/helper'
+require 'mongo_mapper/cases/helper'
+
+class ClientSideValidationsMongoMapperMiddlewareTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def setup
+    # I've been burned enough times with not having the db clear
+    # I should probably use a db cleaner instead of this
+    Magazine.delete_all
+  end
+
+  def teardown
+    Magazine.delete_all
+  end
+
+  def app
+    app = Proc.new { |env| [200, {}, ['success']] }
+    ClientSideValidations::Middleware::Validators.new(app)
+  end
+
+  def test_uniqueness_when_resource_exists
+    Magazine.create(:author_email => 'magazine@test.com')
+    get '/validators/uniqueness.json', { 'magazine[author_email]' => 'magazine@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', { 'magazine[author_email]' => 'magazine@test.com' }
+
+    assert_equal 'true', last_response.body
+    assert last_response.not_found?
+  end
+
+  def test_uniqueness_when_id_is_given
+    magazine = Magazine.create(:author_email => 'magazine@test.com')
+    get '/validators/uniqueness.json', { 'magazine[author_email]' => 'magazine@test.com', 'id' => magazine.id }
+
+    assert_equal 'true', last_response.body
+    assert last_response.not_found?
+  end
+
+  def test_uniqueness_when_scope_is_given
+    Magazine.create(:author_email => 'magazine@test.com', :age => 25)
+    get '/validators/uniqueness.json', { 'magazine[author_email]' => 'magazine@test.com', 'scope' => { 'age' => 30 } }
+
+    assert_equal 'true', last_response.body
+    assert last_response.not_found?
+  end
+
+  def test_uniqueness_when_multiple_scopes_are_given
+    Magazine.create(:author_email => 'magazine@test.com', :age => 30, :author_name => 'Brian')
+    get '/validators/uniqueness.json', { 'magazine[author_email]' => 'magazine@test.com', 'scope' => { 'age' => 30, 'author_name' => 'Robert' } }
+
+    assert_equal 'true', last_response.body
+    assert last_response.not_found?
+  end
+
+  def test_uniqueness_when_case_insensitive
+    Magazine.create(:author_name => 'Brian')
+    get '/validators/uniqueness.json', { 'magazine[author_name]' => 'BRIAN', 'case_sensitive' => false }
+
+    assert_equal 'false', last_response.body
+    assert last_response.ok?
+  end
+
+  def test_uniqueness_when_resource_exists
+    MongoMapperTestModule::Magazine2.create(:author_email => 'magazine@test.com')
+    get '/validators/uniqueness.json', { 'mongo_mapper_test_module/magazine2[author_email]' => 'magazine@test.com' }
+
+    assert_equal 'false', last_response.body
+    assert last_response.ok?
+  end
+end
+

data/test/mongo_mapper/cases/test_uniqueness_validator.rb

@@ -0,0 +1,50 @@
+require 'mongo_mapper/cases/test_base'
+
+class MongoMapper::UniqunessValidatorTest < ClientSideValidations::MongoMapperTestBase
+
+  def test_uniqueness_client_side_hash
+    expected_hash = { :message => "has already been taken" }
+    assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name]).client_side_hash(@magazine, :age)
+  end
+
+  def test_uniqueness_client_side_hash_with_custom_message
+    expected_hash = { :message => "is not available" ,  :case_sensitive => true  }
+    assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name], :message => "is not available").client_side_hash(@magazine, :age)
+  end
+
+  def test_uniqueness_client_side_hash
+    @magazine.stubs(:new_record?).returns(false)
+    @magazine.stubs(:id).returns(1)
+    expected_hash = { :message => "has already been taken", :case_sensitive => true , :id => 1 }
+    assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name]).client_side_hash(@magazine, :age)
+  end
+
+  def test_uniqueness_client_side_hash_with_single_scope_item
+    @magazine.stubs(:author_email).returns("test@test.com")
+    expected_hash = { :message => "has already been taken",  :case_sensitive => true , :scope => {:author_email => "test@test.com"} }
+    result_hash = UniquenessValidator.new(:attributes => [:author_name], :scope => :author_email).client_side_hash(@magazine, :author_name)
+    assert_equal expected_hash, result_hash
+  end
+
+  def test_uniqueness_client_side_hash_with_multiple_scope_items
+    @magazine.stubs(:age).returns(30)
+    @magazine.stubs(:author_email).returns("test@test.com")
+    expected_hash = { :message => "has already been taken",  :case_sensitive => true , :scope => {:age => 30, :author_email => "test@test.com"} }
+    result_hash = UniquenessValidator.new(:attributes => [:author_name], :scope => [:age, :author_email]).client_side_hash(@magazine, :author_name)
+    assert_equal expected_hash, result_hash
+  end
+
+  def test_uniqueness_client_side_hash_with_empty_scope_array
+    expected_hash = { :message => "has already been taken"  , :case_sensitive => true }
+    result_hash = UniquenessValidator.new(:attributes => [:author_name], :scope => []).client_side_hash(@magazine, :author_name)
+    assert_equal expected_hash, result_hash
+  end
+
+  def test_uniqueness_client_side_hash_when_nested_module
+    @magazine = MongoMapperTestModule::Magazine2.new
+    expected_hash = { :message => "has already been taken", :case_sensitive => true, :class => 'mongo_mapper_test_module/magazine2' }
+    assert_equal expected_hash, UniquenessValidator.new(:attributes => [:name]).client_side_hash(@magazine, :age)
+  end
+
+end
+