gov_uk_date_fields 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e6c04db32bfffd44fa2c9422b5a754574a355a6
-  data.tar.gz: 6d448753893db93d05cd2ada043ddc544e5d0146
+  metadata.gz: afc5da57c66f778875841732da87380f87ec678e
+  data.tar.gz: 6792f22278522a86820c02e5eeb44b36bf9fd96b
 SHA512:
-  metadata.gz: f91dceba4ef129e4386c066b0ebdf4034f817b51599e5daa51e25165dbaf3deb8a928a2240ed454689715ef25905171f768fe0d2cfd550f355f6bba4f2b9b327
-  data.tar.gz: 4c8da4674ae23e89fbaf809df6d7c345a74766a8cd5316dd00a6e84baafd8691348e7249b5b31082099fb1b5e6d77d911aa081e0b148b665c0448d13f0e2aea2
+  metadata.gz: b85d73e9bb5cbd97c31f165baa9b7d2933741b538a2b138f8f1ecb389adfe3fdcbe4d08a99d33eddd298fca9a04a103c15c00d1c032df753b2e94b11009d5574
+  data.tar.gz: b5f829f8aab24d51cb81fce92d06672a474d28c657955a4ea190a2a490c95e862b0d5708a7c80b3be79e2c52127715f684acbe3e23e89c3dfc47ba578c69bdca

data/lib/gov_uk_date_fields/form_fields.rb

@@ -66,25 +66,30 @@ module GovUkDateFields
     def generate_start_fieldset
       %Q|
         #{generate_fieldset_tag}
-          #{generate_legend_tag}#{@options[:legend_text]}</legend>
-          <div class="form-date">
+          #{generate_legend_tag}
+            <span class="form-label-bold">#{@options[:legend_text]}</span>
+            <span class="form-hint" id="#{@hint_id}">#{@form_hint_text}</span>
             #{generate_error_message}
-            <p class="form-hint" id="#{@hint_id}">#{@form_hint_text}</p>
+          </legend>
+          <div class="form-date">
       |
     end
 
     def generate_fieldset_tag
-      result = "<fieldset"
+      css_class = "form-group gov_uk_date"
+      css_class += " form-group-error" if error_for_attr?
+
+      result = %Q|
+                <div class="#{css_class}"|
       result += %Q| id="#{@fieldset_id}"| unless  @fieldset_id.nil?
-      css_class = "gov_uk_date"
-      css_class += " error" if error_for_attr?
-      result += %Q| class="#{css_class}"|
+      result += ">"
+      result += %Q| <fieldset|
       result += ">"
       result
     end
 
     def generate_end_fieldset
-      "</div></fieldset>"
+      "</div></fieldset></div>"
     end
 
     def generate_legend_tag
@@ -139,28 +144,37 @@ module GovUkDateFields
     end
 
     def generate_day_input_field(day_value)
-      %Q|
+      css_class = "form-control"
+      css_class += " form-control-error" if error_for_attr?
+
+      result = %Q|
           <div class="form-group form-group-day">
             <label for="#{html_id(:day)}">Day</label>
-            <input class="form-control" id="#{html_id(:day)}" name="#{html_name(:day)}" type="number" min="0" max="31" aria-describedby="#{@hint_id}" value="#{day_value}">
+            <input class="#{css_class}" id="#{html_id(:day)}" name="#{html_name(:day)}" type="number" min="0" max="31" aria-describedby="#{@hint_id}" value="#{day_value}">
           </div>
       |
     end
 
     def generate_month_input_field(month_value)
-      %Q|
+      css_class = "form-control"
+      css_class += " form-control-error" if error_for_attr?
+
+      result = %Q|
         <div class="form-group form-group-month">
           <label for="#{html_id(:month)}">Month</label>
-          <input class="form-control" id="#{html_id(:month)}" name="#{html_name(:month)}" type="number" min="0" max="12" value="#{month_value}">
+          <input class="#{css_class}" id="#{html_id(:month)}" name="#{html_name(:month)}" type="number" min="0" max="12" value="#{month_value}">
         </div>
       |
     end
 
     def generate_year_input_field(year_value)
-      %Q|
+      css_class = "form-control"
+      css_class += " form-control-error" if error_for_attr?
+
+      result = %Q|
         <div class="form-group form-group-year">
           <label for="#{html_id(:year)}">Year</label>
-          <input class="form-control" id="#{html_id(:year)}" name="#{html_name(:year)}" type="number" min="0" max="2100" value="#{year_value}">
+          <input class="#{css_class}" id="#{html_id(:year)}" name="#{html_name(:year)}" type="number" min="0" max="2100" value="#{year_value}">
         </div>
       |
     end

data/lib/gov_uk_date_fields/version.rb

@@ -1,3 +1,3 @@
 module GovUkDateFields
-  VERSION = "2.2.0"
+  VERSION = "3.0.0"
 end

data/test/dummy/log/test.log

@@ -14460,3 +14460,433 @@ DirectorTest: test_updating_existing_record_with_invalid_dates_is_valid_when_val
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.7ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.3ms)  BEGIN
+--------------------------------------------
+EmployeesControllerTest: test_should_get_new
+--------------------------------------------
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (19.5ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", Tue, 13 Aug 1963], ["joined", Tue, 01 Apr 2014], ["created_at", 2018-05-03 10:08:46 UTC], ["updated_at", 2018-05-03 10:08:46 UTC]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", Mon, 17 May 1965], ["joined", Wed, 21 May 2014], ["created_at", 2018-05-03 10:08:46 UTC], ["updated_at", 2018-05-03 10:08:46 UTC]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#new as HTML
+  Rendering employees/new.html.erb within layouts/application
+  Rendered employees/_form.html.erb (21.5ms)
+  Rendered employees/new.html.erb within layouts/application (24.8ms)
+Completed 200 OK in 225ms (Views: 222.4ms | ActiveRecord: 0.0ms)
+   (0.4ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------
+EmployeesControllerTest: test_should_destroy_employee
+-----------------------------------------------------
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", Tue, 13 Aug 1963], ["joined", Tue, 01 Apr 2014], ["created_at", 2018-05-03 10:08:46 UTC], ["updated_at", 2018-05-03 10:08:46 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", Mon, 17 May 1965], ["joined", Wed, 21 May 2014], ["created_at", 2018-05-03 10:08:46 UTC], ["updated_at", 2018-05-03 10:08:46 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (12.3ms)  SELECT COUNT(*) FROM "employees"
+Processing by EmployeesController#destroy as HTML
+  Parameters: {"id"=>"683"}
+  Employee Load (0.3ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT $2  [["id", 683], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  DELETE FROM "employees" WHERE "employees"."id" = $1  [["id", 683]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://test.host/employees
+Completed 302 Found in 6ms (ActiveRecord: 1.1ms)
+   (0.2ms)  SELECT COUNT(*) FROM "employees"
+   (6.4ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------
+EmployeesControllerTest: test_should_get_index
+----------------------------------------------
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (1.2ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", Tue, 13 Aug 1963], ["joined", Tue, 01 Apr 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.3ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", Mon, 17 May 1965], ["joined", Wed, 21 May 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#index as HTML
+  Rendering employees/index.html.erb within layouts/application
+  Employee Load (0.4ms)  SELECT "employees".* FROM "employees"
+  Rendered employees/index.html.erb within layouts/application (2.5ms)
+Completed 200 OK in 6ms (Views: 3.7ms | ActiveRecord: 0.4ms)
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------
+EmployeesControllerTest: test_should_create_employee
+----------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", Tue, 13 Aug 1963], ["joined", Tue, 01 Apr 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", Mon, 17 May 1965], ["joined", Wed, 21 May 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SELECT COUNT(*) FROM "employees"
+Processing by EmployeesController#create as HTML
+  Parameters: {"employee"=>{"dob_dd"=>"31", "dob_mm"=>"12", "dob_yyyy"=>"1965", "joined_dd"=>"4", "joined_mm"=>"mar", "joined_yyyy"=>"2015", "name"=>"Joe Blow"}}
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Joe Blow"], ["dob", Fri, 31 Dec 1965], ["joined", Wed, 04 Mar 2015], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://test.host/employees/689
+Completed 302 Found in 3ms (ActiveRecord: 0.7ms)
+   (0.2ms)  SELECT COUNT(*) FROM "employees"
+   (0.3ms)  SELECT COUNT(*) FROM "employees"
+  Employee Load (0.3ms)  SELECT  "employees".* FROM "employees" ORDER BY "employees"."id" DESC LIMIT $1  [["LIMIT", 1]]
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------
+EmployeesControllerTest: test_should_get_edit
+---------------------------------------------
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", Tue, 13 Aug 1963], ["joined", Tue, 01 Apr 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", Mon, 17 May 1965], ["joined", Wed, 21 May 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#edit as HTML
+  Parameters: {"id"=>"690"}
+  Employee Load (0.3ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT $2  [["id", 690], ["LIMIT", 1]]
+  Rendering employees/edit.html.erb within layouts/application
+  Rendered employees/_form.html.erb (2.0ms)
+  Rendered employees/edit.html.erb within layouts/application (2.6ms)
+Completed 200 OK in 7ms (Views: 4.3ms | ActiveRecord: 0.3ms)
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------
+EmployeesControllerTest: test_should_render_gov_uk_date_fields
+--------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", Tue, 13 Aug 1963], ["joined", Tue, 01 Apr 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", Mon, 17 May 1965], ["joined", Wed, 21 May 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#edit as HTML
+  Parameters: {"id"=>"692"}
+  Employee Load (0.2ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT $2  [["id", 692], ["LIMIT", 1]]
+  Rendering employees/edit.html.erb within layouts/application
+  Rendered employees/_form.html.erb (2.3ms)
+  Rendered employees/edit.html.erb within layouts/application (2.8ms)
+Completed 200 OK in 5ms (Views: 4.2ms | ActiveRecord: 0.2ms)
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------
+EmployeesControllerTest: test_should_show_employee
+--------------------------------------------------
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", Tue, 13 Aug 1963], ["joined", Tue, 01 Apr 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", Mon, 17 May 1965], ["joined", Wed, 21 May 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#show as HTML
+  Parameters: {"id"=>"694"}
+  Employee Load (0.3ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT $2  [["id", 694], ["LIMIT", 1]]
+  Rendering employees/show.html.erb within layouts/application
+  Rendered employees/show.html.erb within layouts/application (0.9ms)
+Completed 200 OK in 5ms (Views: 2.1ms | ActiveRecord: 0.3ms)
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------
+EmployeesControllerTest: test_should_update_employee
+----------------------------------------------------
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", Tue, 13 Aug 1963], ["joined", Tue, 01 Apr 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (1.4ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", Mon, 17 May 1965], ["joined", Wed, 21 May 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (4.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#update as HTML
+  Parameters: {"employee"=>{"dob_dd"=>"1", "dob_mm"=>"11", "dob_yyyy"=>"1981", "joined_dd"=>"3", "joined_mm"=>"oct", "joined_yyyy"=>"2015", "name"=>"Ioannis Kole"}, "id"=>"696"}
+  Employee Load (0.2ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT $2  [["id", 696], ["LIMIT", 1]]
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  UPDATE "employees" SET "dob" = $1, "joined" = $2, "name" = $3, "updated_at" = $4 WHERE "employees"."id" = $5  [["dob", Sun, 01 Nov 1981], ["joined", Sat, 03 Oct 2015], ["name", "Ioannis Kole"], ["updated_at", 2018-05-03 10:08:47 UTC], ["id", 696]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://test.host/employees/696
+Completed 302 Found in 4ms (ActiveRecord: 0.9ms)
+  Employee Load (0.3ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT $2  [["id", 696], ["LIMIT", 1]]
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+----------------------------------------------------------------------
+OmitErrorClashEmployeeTest: test_valid_dates_generate_no_errors_at_all
+----------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+-------------------------------------------------------------------------------------------------------
+OmitErrorClashEmployeeTest: test_invalid_day_does_not_add_invalid_date_message_to_cant_be_blank_message
+-------------------------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------
+OmitErrorClashEmployeeTest: test_presence_error_messages_generated
+------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------------------------------
+DefaultErrorClashEmployeeTest: test_invalid_day_adds_invalid_date_message_to_cant_be_blank_message
+--------------------------------------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------
+DefaultErrorClashEmployeeTest: test_presence_error_messages_generated
+---------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------------------
+DefaultErrorClashEmployeeTest: test_valid_dates_generate_no_errors_at_all
+-------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------
+GovUkDateFieldsTest: test_basic_output_without_fieldset
+-------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_error_class_and_supplied_error_messages
+-------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_today_button_with_no_css_class_specified
+---------------------------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_form_hint
+--------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_today_button_with_css_class_applied
+----------------------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_legend_class
+-----------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_id
+------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------
+GovUkDateFieldsTest: test_placeholder_output_without_fieldset
+-------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.2ms)  BEGIN
+---------------------------------------------------------------
+GovUkDateFieldsTest: test_error_raised_if_invalid_options_given
+---------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_error_class_and_message
+---------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+-------------------------------------
+GovUkDateFieldsTest: test_squash_html
+-------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------
+EmployeeTest: test_nil_dates_raise_no_errors
+--------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------
+EmployeeTest: test_employee_class_responds_to_acts_as_gov_uk_date
+-----------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+EmployeeTest: test_that_nil_can_be_assigned_to_a_date_field
+-----------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------------------
+EmployeeTest: test_that_form_population_values_can_be_extracted_from_the_date_field
+-----------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------
+EmployeeTest: test_creating_a_new_employee_with_invalid_dates_is_invalid
+------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------------------------------------------------------------
+EmployeeTest: test_argument_error_is_raised_if_an_object_that_doesnt_respond_to_to_date_is_assigned_to_a_date_field
+-------------------------------------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+EmployeeTest: test_new_dates_can_be_populated_from_the_form
+-----------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------
+EmployeeTest: test_employee_instance_has_form_date_instance_variables_for_each_gov_uk_date
+------------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------
+EmployeeTest: test_updating_existing_record_with_valid_dates_is_valid
+---------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "John"], ["dob", Tue, 13 Aug 1963], ["joined", Mon, 21 Apr 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  UPDATE "employees" SET "dob" = $1, "updated_at" = $2 WHERE "employees"."id" = $3  [["dob", Mon, 17 May 1965], ["updated_at", 2018-05-03 10:08:47 UTC], ["id", 698]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------------------------------------------------
+EmployeeTest: test_that_the_calling_the_field_name_on_employee_will_return_the_date_part_of_the_form_date_object
+----------------------------------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------------------------------
+EmployeeTest: test_no_argument_error_is_raised_if_parseable_string_is_assigned_to_a_date_field
+----------------------------------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------
+EmployeeTest: test_createing_a_new_employee_with_valid_dates_is_valid
+---------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.2ms)  BEGIN
+-------------------------------------------
+EmployeeTest: test_invalid_day_raises_error
+-------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------------------
+EmployeeTest: test_updating_existing_record_with_invalid_dates_is_invalid
+-------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "John"], ["dob", Tue, 13 Aug 1963], ["joined", Mon, 21 Apr 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------
+EmployeeTest: test_valid_dates_raise_no_errors
+----------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------------------------------------------
+EmployeeTest: test_that_argument_error_is_raised_if_unparseable_string_object_is_assigned_to_a_date_field
+---------------------------------------------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------
+EmployeeTest: test_employee_has_class_variable_describing_all_gov_uk_dates
+--------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------
+EmployeeTest: test_that_we_can_assign_new_dates_to_the_form_date_object
+-----------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_set_from_date_instantiates_the_attribute_and_is_valid
+-----------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_set_from_date_instantiates_a_nil_object_if_date_is_nil
+------------------------------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_set_one_date_part_leaves_the_rest_unchanged
+-------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_new_raises_error_if_called_from_outside_class
+---------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_setting_all_date_parts_to_nil_sets_date_to_nil_and_is_valid
+-----------------------------------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_setting_all_three_date_parts_changes_the_date
+---------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_setting_date_parts_with_invalid_values_marks_date_as_invalid_and_leaves_date_variable_the_same
+----------------------------------------------------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------------
+OverrideErrorClashEmployeeTest: test_invalid_day_overrides_cant_be_blank_message
+--------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------
+OverrideErrorClashEmployeeTest: test_presence_error_messages_generated
+----------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------
+OverrideErrorClashEmployeeTest: test_valid_dates_generate_no_errors_at_all
+--------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------
+DirectorTest: test_director_class_responds_to_acts_as_gov_uk_date
+-----------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------
+DirectorTest: test_director_has_class_variable_describing_all_gov_uk_dates
+--------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------------
+DirectorTest: test_updating_existing_record_with_invalid_dates_is_valid_when_validation_disabled
+------------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "John"], ["dob", Tue, 13 Aug 1963], ["joined", Mon, 21 Apr 2014], ["created_at", 2018-05-03 10:08:47 UTC], ["updated_at", 2018-05-03 10:08:47 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------
+DirectorTest: test_valid_dates_raise_no_errors_when_validation_disabled
+-----------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------------------------------
+DirectorTest: test_creating_a_new_director_with_invalid_dates_is_valid_when_validation_disabled
+-----------------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------
+DirectorTest: test_invalid_day_raises_no_error_when_validation_disabled
+-----------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------
+DirectorTest: test_nil_dates_raise_no_errors_when_validation_disabled
+---------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------
+ReplicantTest: test_joined_date_is_same_as_dob
+----------------------------------------------
+   (0.2ms)  ROLLBACK

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

@@ -103,149 +103,171 @@ class GovUkDateFieldsTest < ActiveSupport::TestCase
 
   def expected_fieldset_output_with_error_class_and_message
     %Q{
-      <fieldset id="employee_date_joined" class="gov_uk_date error">
-        <legend>Joining date</legend>
-        <div class="form-date">
-          <ul>
-            <li>
-              <span class="error-message">Invalid joining date</span>
-            </li>
-            <li>
-              <span class="error-message">Joining date must be in the past</span>
-            </li>
-          </ul>
-          <p class="form-hint" id="employee_date_joined-hint">For example, 31 3 1980</p>
-          <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_date_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 class="form-group gov_uk_date form-group-error" id="employee_date_joined">
+        <fieldset>
+          <legend>
+            <span class="form-label-bold">Joining date</span>
+            <span class="form-hint" id="employee_date_joined-hint">
+              For example, 31 3 1980
+            </span>
+            <ul>
+              <li><span class="error-message">Invalid joining date</span></li>
+              <li><span class="error-message">Joining date must be in the past</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_date_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>
-        </div>
-      </fieldset>
+        </fieldset>
+      </div>
     }
   end
 
   def expected_fieldset_output_with_id
     %Q{
-      <fieldset id="employee_date_joined" class="gov_uk_date">
-        <legend>Joining date</legend>
-        <div class="form-date">
-          <p class="form-hint" id="employee_date_joined-hint">For example, 31 3 1980</p>
-          <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_date_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 class="form-group gov_uk_date" id="employee_date_joined">
+        <fieldset>
+          <legend>
+            <span class="form-label-bold">Joining date</span>
+            <span class="form-hint" id="employee_date_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_date_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>
-        </div>
-      </fieldset>
+        </fieldset>
+      </div>
     }
   end
 
   def expected_fieldset_output_with_form_hint
     %Q{
-      <fieldset class="gov_uk_date">
-        <legend class="govuk_legend_class">Date of birth</legend>
-        <div class="form-date">
-          <p class="form-hint" id="dob-hint">In the form: dd mm yyyy</p>
-          <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">
-          </div>
-          <div class="form-group form-group-month">
-            <label for="employee_dob_mm">Month</label>
-            <input class="form-control" id="employee_dob_mm" name="employee[dob_mm]" type="number" min="0" max="12" value="12">
-          </div>
-          <div class="form-group form-group-year">
-            <label for="employee_dob_yyyy">Year</label>
-            <input class="form-control" id="employee_dob_yyyy" name="employee[dob_yyyy]" type="number" min="0" max="2100" value="1963">
+      <div class="form-group gov_uk_date">
+        <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>
+          </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">
+            </div>
+            <div class="form-group form-group-month">
+              <label for="employee_dob_mm">Month</label>
+              <input class="form-control" id="employee_dob_mm" name="employee[dob_mm]" type="number" min="0" max="12" value="12">
+            </div>
+            <div class="form-group form-group-year">
+              <label for="employee_dob_yyyy">Year</label>
+              <input class="form-control" id="employee_dob_yyyy" name="employee[dob_yyyy]" type="number" min="0" max="2100" value="1963">
+            </div>
           </div>
-        </div>
-      </fieldset>
+        </fieldset>
+      </div>
     }
   end
 
   def expected_fieldset_output_with_legend_class
     %Q{
-      <fieldset class="gov_uk_date">
-        <legend class="date-legend-class">Joining date</legend>
-        <div class="form-date">
-          <p class="form-hint" id="joined-hint">For example, 31 3 1980</p>
-          <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">
-          </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 class="form-group gov_uk_date">
+        <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>
+          </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">
+            </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>
-        </div>
-      </fieldset>
+        </fieldset>
+      </div>
     }
   end
 
   def expected_fieldset_output_with_unstyled_today_button
     %Q{
-      <fieldset id="employee_date_joined" class="gov_uk_date">
-        <legend>Joining date</legend>
-        <div class="form-date">
-          <p class="form-hint" id="employee_date_joined-hint">For example, 31 3 1980</p>
-          <a class="button" role="button" href="#">Today</a>
-          <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_date_joined-hint" value="1">
+      <div class="form-group gov_uk_date" id="employee_date_joined">
+        <fieldset>
+          <legend>
+            <span class="form-label-bold">Joining date</span>
+            <span class="form-hint" id="employee_date_joined-hint">For example, 31 3 1980</span>
+          </legend>
+          <div class="form-date">
+            <a class="button" role="button" href="#">Today</a>
+            <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_date_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>
-          <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>
+        </fieldset>
+      </div>
     }
   end
 
   def expected_fieldset_output_with_syled_today_button
     %Q{
-      <fieldset id="employee_date_joined" class="gov_uk_date">
-        <legend>Joining date</legend>
-        <div class="form-date">
-          <p class="form-hint" id="employee_date_joined-hint">For example, 31 3 1980</p>
-          <a class="today-button-class" role="button" href="#">Today</a>
-          <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_date_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 class="form-group gov_uk_date" id="employee_date_joined">
+        <fieldset>
+          <legend>
+            <span class="form-label-bold">Joining date</span>
+            <span class="form-hint" id="employee_date_joined-hint">For example, 31 3 1980</span>
+          </legend>
+          <div class="form-date">
+            <a class="today-button-class" role="button" href="#">Today</a>
+            <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_date_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>
-        </div>
-      </fieldset>
+        </fieldset>
+      </div>
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gov_uk_date_fields
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Stephen Richards