gov_uk_date_fields 3.0.0 → 3.2.0

data/test/dummy/test/models/director_test.rb

@@ -34,7 +34,7 @@ class DirectorTest < ActiveSupport::TestCase
 
   def test_creating_a_new_director_with_invalid_dates_is_valid_when_validation_disabled
     e = Director.new(name: 'Stephen', dob_dd: '13', dob_mm: 'XXX', dob_yyyy: '1963')
-    assert_equal nil, e.dob
+    assert_nil e.dob
     assert_true e.valid?
   end
 

data/test/dummy/test/models/employee_test.rb

@@ -53,7 +53,7 @@ class EmployeeTest < ActiveSupport::TestCase
 
   def test_that_nil_can_be_assigned_to_a_date_field
     @employee.dob = nil
-    assert_equal nil, @employee.dob
+    assert_nil @employee.dob
     assert_equal '', @employee.dob_dd
     assert_equal '', @employee.dob_mm
     assert_equal '', @employee.dob_yyyy
@@ -118,7 +118,7 @@ class EmployeeTest < ActiveSupport::TestCase
 
   def test_creating_a_new_employee_with_invalid_dates_is_invalid
     e = Employee.new(name: 'Stephen', dob_dd: '13', dob_mm: 'XXX', dob_yyyy: '1963')
-    assert_equal nil, e.dob
+    assert_nil e.dob
     assert_false e.valid?
   end
 

data/test/dummy/test/models/form_date_test.rb

@@ -81,7 +81,7 @@ module GovUkDateFields
       assert_equal '', fd.dd
       assert_equal '', fd.mm
       assert_equal '', fd.yyyy
-      assert_equal  nil, fd.date
+      assert_nil fd.date
       assert_true fd.valid?, "fd.valid?"
     end
 

data/test/dummy/test/models/form_fields_test.rb

@@ -53,6 +53,11 @@ class GovUkDateFieldsTest < ActiveSupport::TestCase
     assert_html_equal(date_fields.raw_output, expected_fieldset_output_with_id)
   end
 
+  test 'fieldset without explicit `id` passed in the options (will be autogenerated)' do
+    date_fields = GovUkDateFields::FormFields.new(@form_builder, :employee, :joined, {legend_text: 'Joining date'})
+    assert_html_equal(date_fields.raw_output, expected_fieldset_output_without_id)
+  end
+
   test 'fieldset output with today button with no css class specified' do
     date_fields = GovUkDateFields::FormFields.new(@form_builder, :employee, :joined, {legend_text: 'Joining date', id: 'employee_date_joined', today_button: true})
     assert_html_equal(date_fields.raw_output, expected_fieldset_output_with_unstyled_today_button)
@@ -64,15 +69,21 @@ class GovUkDateFieldsTest < ActiveSupport::TestCase
   end
 
   test 'fieldset with error_class and message' do
-    @employee.errors[:joined] <<  "Invalid joining date"
-    @employee.errors[:joined] <<  "Joining date must be in the past"
+    @employee.errors.add(:joined, "Invalid joining date")
+    @employee.errors.add(:joined, "Joining date must be in the past")
     date_fields = GovUkDateFields::FormFields.new(@form_builder, :employee, :joined, {legend_text: 'Joining date', id: 'employee_date_joined'})
     assert_html_equal(date_fields.raw_output, expected_fieldset_output_with_error_class_and_message)
   end
 
+  test 'fieldset with error_class and message, with autogenerated `id`' do
+    @employee.errors.add(:joined, "Invalid joining date")
+    date_fields = GovUkDateFields::FormFields.new(@form_builder, :employee, :joined, {legend_text: 'Joining date'})
+    assert_html_equal(date_fields.raw_output, expected_fieldset_output_with_error_class_and_message_without_id)
+  end
+
   test 'fieldset with error_class and supplied error messages' do
-    @employee.errors[:joined] <<  "invalid"
-    @employee.errors[:joined] <<  "must_be_in_past"
+    @employee.errors.add(:joined, "invalid")
+    @employee.errors.add(:joined, "must_be_in_past")
     date_fields = GovUkDateFields::FormFields.new(@form_builder, :employee, :joined, {legend_text: 'Joining date', id: 'employee_date_joined', error_messages: ['Invalid joining date', 'Joining date must be in the past']})
     assert_html_equal(date_fields.raw_output, expected_fieldset_output_with_error_class_and_message)
   end
@@ -134,6 +145,38 @@ class GovUkDateFieldsTest < ActiveSupport::TestCase
     }
   end
 
+  def expected_fieldset_output_with_error_class_and_message_without_id
+    %Q{
+      <div class="form-group gov_uk_date form-group-error" id="error_employee_joined">
+        <fieldset>
+          <legend>
+            <span class="form-label-bold">Joining date</span>
+            <span class="form-hint" id="employee_joined-hint">
+              For example, 31 3 1980
+            </span>
+            <ul>
+              <li><span class="error-message">Invalid joining date</span></li>
+            </ul>
+          </legend>
+          <div class="form-date">
+            <div class="form-group form-group-day">
+              <label for="employee_joined_dd">Day</label>
+              <input class="form-control form-control-error" id="employee_joined_dd" name="employee[joined_dd]" type="number" min="0" max="31" aria-describedby="employee_joined-hint" value="1">
+            </div>
+            <div class="form-group form-group-month">
+              <label for="employee_joined_mm">Month</label>
+              <input class="form-control form-control-error" id="employee_joined_mm" name="employee[joined_mm]" type="number" min="0" max="12" value="4">
+            </div>
+            <div class="form-group form-group-year">
+              <label for="employee_joined_yyyy">Year</label>
+              <input class="form-control form-control-error" id="employee_joined_yyyy" name="employee[joined_yyyy]" type="number" min="0" max="2100" value="2015">
+            </div>
+          </div>
+        </fieldset>
+      </div>
+    }
+  end
+
   def expected_fieldset_output_with_id
     %Q{
       <div class="form-group gov_uk_date" id="employee_date_joined">
@@ -161,18 +204,45 @@ class GovUkDateFieldsTest < ActiveSupport::TestCase
     }
   end
 
+  def expected_fieldset_output_without_id
+    %Q{
+      <div class="form-group gov_uk_date" id="employee_joined">
+        <fieldset>
+          <legend>
+            <span class="form-label-bold">Joining date</span>
+            <span class="form-hint" id="employee_joined-hint">For example, 31 3 1980</span>
+          </legend>
+          <div class="form-date">
+            <div class="form-group form-group-day">
+              <label for="employee_joined_dd">Day</label>
+              <input class="form-control" id="employee_joined_dd" name="employee[joined_dd]" type="number" min="0" max="31" aria-describedby="employee_joined-hint" value="1">
+            </div>
+            <div class="form-group form-group-month">
+              <label for="employee_joined_mm">Month</label>
+              <input class="form-control" id="employee_joined_mm" name="employee[joined_mm]" type="number" min="0" max="12" value="4">
+            </div>
+            <div class="form-group form-group-year">
+              <label for="employee_joined_yyyy">Year</label>
+              <input class="form-control" id="employee_joined_yyyy" name="employee[joined_yyyy]" type="number" min="0" max="2100" value="2015">
+            </div>
+          </div>
+        </fieldset>
+      </div>
+    }
+  end
+
   def expected_fieldset_output_with_form_hint
     %Q{
-      <div class="form-group gov_uk_date">
+      <div class="form-group gov_uk_date" id="employee_dob">
         <fieldset>
           <legend class="govuk_legend_class">
             <span class="form-label-bold">Date of birth</span>
-            <span class="form-hint" id="dob-hint">In the form: dd mm yyyy</span>
+            <span class="form-hint" id="employee_dob-hint">In the form: dd mm yyyy</span>
           </legend>
           <div class="form-date">
             <div class="form-group form-group-day">
               <label for="employee_dob_dd">Day</label>
-              <input class="form-control" id="employee_dob_dd" name="employee[dob_dd]" type="number" min="0" max="31" aria-describedby="dob-hint" value="7">
+              <input class="form-control" id="employee_dob_dd" name="employee[dob_dd]" type="number" min="0" max="31" aria-describedby="employee_dob-hint" value="7">
             </div>
             <div class="form-group form-group-month">
               <label for="employee_dob_mm">Month</label>
@@ -190,16 +260,16 @@ class GovUkDateFieldsTest < ActiveSupport::TestCase
 
   def expected_fieldset_output_with_legend_class
     %Q{
-      <div class="form-group gov_uk_date">
+      <div class="form-group gov_uk_date" id="employee_joined">
         <fieldset>
           <legend class="date-legend-class">
             <span class="form-label-bold">Joining date</span>
-            <span class="form-hint" id="joined-hint">For example, 31 3 1980</span>
+            <span class="form-hint" id="employee_joined-hint">For example, 31 3 1980</span>
           </legend>
           <div class="form-date">
             <div class="form-group form-group-day">
               <label for="employee_joined_dd">Day</label>
-              <input class="form-control" id="employee_joined_dd" name="employee[joined_dd]" type="number" min="0" max="31" aria-describedby="joined-hint" value="1">
+              <input class="form-control" id="employee_joined_dd" name="employee[joined_dd]" type="number" min="0" max="31" aria-describedby="employee_joined-hint" value="1">
             </div>
             <div class="form-group form-group-month">
               <label for="employee_joined_mm">Month</label>

data/test/dummy/tmp/cache/assets/sprockets/v3.0/0C/0C2zg6Fz4ZDKb2SJoMeKCyuiEkK3VLTLoXTk6XtsYnk.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=13f7e12b511387ac8f5befba2d6597db73007093ecafeeac076e3c8fd4d8b08c:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/1q/1qTKTELCNcaTGecih6WmU5XbelY0-n9ECxNFb7B3NDY.cache

@@ -0,0 +1 @@
+I"}app/assets/stylesheets/application.css?type=text/css&id=5c4c268ec9fef25f81cd7afb988458c8c1f9a65f3d17627a663585dcf18a6bf9:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/2v/2vYH0-57Ot7PCLWkuyRiVWFoDqDAisPuU54eB1XCuZs.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/employees.js?type=application/javascript&pipeline=self&id=6c12be45a6893afb730dec72568dcf84f144fd794959b46b4f3a8c63204207c2:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/6q/6qN0wbOkRQNgPkTlDcpknhkOthof-6RiGp49001MFl8.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=a58452775c456f562de98235ca73cb2dd6b7856f2ad855e2e485485f5d2107b2:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/Cf/CfeJbgkSxTK0XPCiwgQgWyrRiyrF6cN7hFf-r_6I01U.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/scaffold.css?type=text/css&pipeline=self&id=49f8083f302eecfb2211f3b7faef3e10214b17f4a6935273b3afd427c042bd8d:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/Eu/EuA76ODujuCnlBhSte6qr-SmyKhVkUxSuclVqgApzE4.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=75823ef8b2eea23597b3f091b2f69067ac4bfad07cd821718653b162bb47b184:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/Gr/GrEOyJqOi5t6YEVvLLjKeGeh011ho1EsAt40oQPwCig.cache

@@ -0,0 +1 @@
+I"}app/assets/stylesheets/application.css?type=text/css&id=9e75fcc1c5be62dac68d9eb47121a3455a47e04e6901143d4fc5f8745e497e97:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/HI/HIDJJczke7ZLFWGLXu83cK3amyy_NL9S9QIHGU0Mo2k.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/employees.css?type=text/css&pipeline=self&id=223d3b4f4dfac1b09b2f4c12ab5b6ae57f109141721c75cef019bfd8c672677d:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/Pt/Pt3EirvAHSujxeOX1Lj29qw0MpynJZ6DBFZjFfuEsik.cache

@@ -0,0 +1 @@
+I"}app/assets/stylesheets/application.css?type=text/css&id=33dd8c3deb90cd2d719f5c42d3bbe81ecc65ca28d567393a3f277bf27fa6a284:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/cB/cBujZqjQkDn9qy_o8TBwBmxz4MdHTRohOR4u2dApFMI.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/employees.css?type=text/css&pipeline=self&id=b085a30d35aa2cf875c47ab13eae3c4bc288b203a18e0dc6b4611b156808f7ed:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/cS/cSydv5hX7yDiR067i_nXkPN_k2Z-c5fV-Qcd3uBIiEw.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/scaffold.css?type=text/css&pipeline=self&id=361fc173677c8fea0d5bab429b16da0267749bcee5ba2a3a569d63d6b2d01ed8:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/dj/dj1XrYy5f-virD2Zxdwb3IGvTmPt6OolJhNuRLyyiYE.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/employees.js?type=application/javascript&pipeline=self&id=2bd73325e933ee7615c18a7657cf4493523b6830ddbb7c329115b4d1565fe510:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/gK/gK1XyCNNJN2snmep1wX9X6imlJWEM0zbgBefUO__N-4.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/employees.js?type=application/javascript&pipeline=self&id=b98d6e08e3df503c3d845a15a2319bbeb820e54394084e6b7ba6e8da5e92dada:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/h8/h8KQnVqXMBM04d4llsrbfN7Eij0y78tMo6c5i8wH8bY.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&id=19161d4d962f8d5cdc2a63331f1c624a41654a2c164bedf833da1ac2e1b923c4:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/kB/kBO5u1GYzp_3At4KdTa7gu6M-8iJYzXwK7awXVhfdqQ.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/application.css?type=text/css&pipeline=self&id=d26de567097cbccfa4cfcf17e91ff59b6224301aa6cb66212b0affde13cb6907:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/kX/kXHzil5_zI2pGnuGyZDJXFY_rhdpZjAbOhADTVcnOG4.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&id=4a3253fd9ecd49ed3cbbf00387e98f64f353854cec1d5249e27a52dae1559b7a:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/mA/mA18PsmXNFA3Y035kDJ_LZaf5PvfUZJrjX1BNstNcM8.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/application.css?type=text/css&pipeline=self&id=d804d181515edf34ab5d0cb6e8677829bf662aacd84cdae05672e87ca0a4c5ef:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/oR/oREyRPrhTN2nImWV9UIIivSk5CeZ7vpcmwFg6CMNoGQ.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&id=c89104099325d6175974f4907f95b00db0cb93d4a7d8a4a1adce7fcb9a537e6f:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/qK/qKwRM7szJUtdx-IcB_777nsCap0rkqBzoVO9zNTaLsY.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/employees.css?type=text/css&pipeline=self&id=f78d19eef4918742e63c0293ac5678a07ec61c096531c86ed9676276dc46d89f:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/tZ/tZXykf9r0-2TBfW8kYENSOSCiGgumN-qg_iTonTBlmQ.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/application.css?type=text/css&pipeline=self&id=37472fcd8c56a52e621f697098a8ba843ec9fea795d00194d2e3faf63c6437d9:ET

data/test/dummy/tmp/cache/assets/sprockets/v3.0/xo/xo0vwho1GEXuJPGLrvAxM5Ag7xiZme4jPtTrZL2wSGY.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/scaffold.css?type=text/css&pipeline=self&id=81404d1ca2d733a98f150b4a62b1458684bd0c69710a57874bfa6e28c2998b92:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/0F/0FBvTP5GR23sqfKQqc3ndsfMXyIceqNSEMDGdeKx-iw.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=d37514afef7e5c482da4d1b8e64dad1764a3ecb3a6041619bdc2c2aa83072984:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/0H/0H-x3YNdtFXB94YeI8x7aR8S_ip-ncjUMtQcHWrxmYU.cache

@@ -0,0 +1 @@
+I"zapp/assets/stylesheets/scaffold.css?type=text/css&id=a9334d75b18e91b672f28d991b8189a18a62fa68e20ce2a5485d969a5f9a250a:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/0I/0I0SJYh6xyz2kJ-P0dZ1c8kq_lc0wkRDY1ZEeAombQo.cache

@@ -0,0 +1 @@
+I"
}app/assets/config/manifest.js?type=application/javascript&id=e82337f64d3413f516cde2c96da0808040d15bd35a18b494f755d08987680515:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/0o/0oInIs02FOPPbxkc52rj0mlKSxvUWiQroHIAdK1-thg.cache

@@ -0,0 +1,2 @@
+"%����͹mm�
+a�l�|a56���v�6}��(&5

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/11/11ovRdbo434VRd2K0Sat3eZTuQn6hLBSz69i01_fDZ8.cache

@@ -0,0 +1 @@
+"%���]d����U�H�5�t�iG{�˲ 8���

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/1L/1LKKfhEshJn3Vkh_w-e1-kWlTcLxCX9Ko-A5bHs8IJk.cache

@@ -0,0 +1 @@
+"%���]d����U�H�5�t�iG{�˲ 8���

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/1q/1qj0QOwYJDQe1Z013CtPeEPNXG1OMChaEtHpXydsNLU.cache

@@ -0,0 +1 @@
+I"}app/assets/stylesheets/application.css?type=text/css&id=244392da6758d49c5716ae4e383e7db7b6287574d17818e43693d37d0663d649:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/2Y/2Y_bnBFrkUg5jfWaE8JqdFpTlpaph3M9TnbVbheAnVE.cache

@@ -0,0 +1 @@
+I"
�app/assets/config/manifest.js?type=application/javascript&pipeline=self&id=8eafafa904c0136c823eab12056833a4ed2c3665d9f1ba0956a4c7e22ad91f8d:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/4e/4egQqgxJf8J649hF2A1Bnp_GKg9LM-RknYoLKE-UZ2A.cache

@@ -0,0 +1,2 @@
+"%�h��w\�
+Y��s9q[^j�sA�~���u

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/5y/5y-aQ4cIum-_A2jTKUwbHTzo6AL99_jhiXTAcxlc5Ss.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/scaffold.css?type=text/css&pipeline=self&id=0cfd48be39cb323fca77b3613bcbc8d240dcc5f1d675ac0c9bb47bb3044d6bbd:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/7_/7_AwiCYgfhRrM7cCMv0hHNDLbBHjBAefE6DGXZMmR_Y.cache

@@ -0,0 +1 @@
+I"
}app/assets/config/manifest.js?type=application/javascript&id=ed0461037682d64cb10ae9b3d3c7433af13a3a2b891671955afd5763fef87e7f:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/7y/7y6I3anJ9tl14HZnadomQ7cELiD8gCH-7ZzTu_1EdHE.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=dcdcf1326b6939eab9455ca2b403db8e78cf7795f64fabfee5befd2a6cdf9644:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/92/92DncEpOSowpziX2RSXmGIKXaJo7h2rr9Hh6wyVOsRM.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/employees.js?type=application/javascript&pipeline=self&id=15c6e07b1f783ec82681c38ab05d26a415eb46c8ff3b51bd097c6bf4856d9a3d:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/CM/CMeCT2T7Nd7PUPEtbK1YCarmzltllbcbsHI892df9Uo.cache

@@ -0,0 +1 @@
+I"
�app/assets/javascripts/application.js?type=application/javascript&id=a2fa3617df5e60ad706a81c95dcc1c23a95410dd81870a8e1584d4311172020b:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/Cy/Cy7ukAcjEzA3MRcdnk_b2Er6WEcQp6H-JgHK_Ynp_f0.cache

@@ -0,0 +1 @@
+I"
�app/assets/stylesheets/application.css?type=text/css&pipeline=self&id=97445734d05e73f36827bf936b03a3eb739f2e4b408c492616659807ae90e1a2:ET