gov_uk_date_fields 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec9ca6a651be83cc6a6cf10b8e0262729f9ff72
-  data.tar.gz: 89390a34df913cb4b83e56145df959b65c6a4de6
+  metadata.gz: 97d3f862b011c12c8cfb47b97019f694a75d20b7
+  data.tar.gz: a58ba69eadf26038875b86eb673f4200b68ada9f
 SHA512:
-  metadata.gz: 879582b734ad6e4f6f202a4950654c5c39d45798d68aa44ccb1ac6c6b54b95f29e9358a5b4d5c581d79c57f8e6155736bceb5ec4a0f82309da9dac3a01f94f97
-  data.tar.gz: 24e6f09eff12fbafaf828a8cbe094b7e00e4aa1f7599c78580efe6f0b9be87c5198695f00827f7da1a3b4932430b3d20732037c3aa4fc5a01bb437c6b856ee7c
+  metadata.gz: 198a6db12b94e8aa753f6bfc8be5c043b4b6403a4d227ef4e378a71081ac4dc50a824ac7163179bfdc9f266fd1200110db6ff880973bbb77cc72bbc1aad9d92e
+  data.tar.gz: 60a2391c1e2b3df687dec851ead4135547fc564c18794080e4d12e8681b5c0224ad00274b8d7066fe2c575a04478d1e922274e97ca2c5efb26b32df0c8250e7c

data/lib/gov_uk_date_fields/form_fields.rb

@@ -1,7 +1,7 @@
 module GovUkDateFields
 
   class FormFields
-    VALID_OPTIONS = [:legend_text, :legend_class, :form_hint_text, :id, :placeholders]
+    VALID_OPTIONS = [:legend_text, :legend_class, :form_hint_text, :id, :placeholders, :error_messages]
 
     DATE_SEGMENTS = {
       day:    '_dd',
@@ -27,6 +27,7 @@ module GovUkDateFields
       @form_hint_text     = @options[:form_hint_text] || "For example, 31 3 1980"
       @fieldset_required  = false
       @fieldset_id        = @options[:id]
+      @error_messages     = @options[:error_messages]
       parse_options
     end
 
@@ -94,7 +95,10 @@ module GovUkDateFields
       result = ''
       if error_for_attr?
         result = "<ul>"
-        @object.errors[@attribute].each do |message|
+        if @error_messages.nil?
+          @error_messages = @object.errors[@attribute]
+        end
+        @error_messages.each do |message|
           result += %Q|<li><span class="error-message">#{message}</span></li>|
         end
         result += "</ul>"

data/lib/gov_uk_date_fields/version.rb

@@ -1,3 +1,3 @@
 module GovUkDateFields
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/test/dummy/log/test.log

@@ -11935,3 +11935,358 @@ EmployeeTest: test_that_form_population_values_can_be_extracted_from_the_date_fi
 EmployeeTest: test_that_the_calling_the_field_name_on_employee_will_return_the_date_part_of_the_form_date_object
 ----------------------------------------------------------------------------------------------------------------
    (0.1ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (2.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  BEGIN
+-------------------------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_error_class_and_supplied_error_messages
+-------------------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)  BEGIN
+-------------------------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_error_class_and_supplied_error_messages
+-------------------------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_error_class_and_message
+---------------------------------------------------------------
+   (0.2ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)  BEGIN
+---------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_error_class_and_message
+---------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  BEGIN
+-------------------------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_error_class_and_supplied_error_messages
+-------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)  BEGIN
+---------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_new_raises_error_if_called_from_outside_class
+---------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_set_one_date_part_leaves_the_rest_unchanged
+-------------------------------------------------------------------------------
+   (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
+------------------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_set_from_date_instantiates_a_nil_object_if_date_is_nil
+------------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+-----------------------------------------------------------------------------------------
+GovUkDateFields::FormDateTest: test_set_from_date_instantiates_the_attribute_and_is_valid
+-----------------------------------------------------------------------------------------
+   (0.1ms)  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_all_date_parts_to_nil_sets_date_to_nil_and_is_valid
+-----------------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+EmployeeTest: test_new_dates_can_be_populated_from_the_form
+-----------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+EmployeeTest: test_that_nil_can_be_assigned_to_a_date_field
+-----------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------
+EmployeeTest: test_updating_existing_record_with_valid_dates_is_valid
+---------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (2.3ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "John"], ["dob", "1963-08-13"], ["joined", "2014-04-21"], ["created_at", "2016-04-29 08:57:00.194956"], ["updated_at", "2016-04-29 08:57:00.194956"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  UPDATE "employees" SET "dob" = $1, "updated_at" = $2 WHERE "employees"."id" = $3  [["dob", "1965-05-17"], ["updated_at", "2016-04-29 08:57:00.209064"], ["id", 628]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------
+EmployeeTest: test_invalid_day_raises_error
+-------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------------
+EmployeeTest: test_createing_a_new_employee_with_valid_dates_is_valid
+---------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------
+EmployeeTest: test_nil_dates_raise_no_errors
+--------------------------------------------
+   (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_employee_has_class_variable_describing_all_gov_uk_dates
+--------------------------------------------------------------------------
+   (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", "1963-08-13"], ["joined", "2014-04-21"], ["created_at", "2016-04-29 08:57:00.218586"], ["updated_at", "2016-04-29 08:57:00.218586"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  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_valid_dates_raise_no_errors
+----------------------------------------------
+   (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
+-----------------------------------------------------------------------------------
+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_no_argument_error_is_raised_if_parseable_string_is_assigned_to_a_date_field
+----------------------------------------------------------------------------------------------
+   (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_that_argument_error_is_raised_if_unparseable_string_object_is_assigned_to_a_date_field
+---------------------------------------------------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------
+EmployeeTest: test_employee_class_responds_to_acts_as_gov_uk_date
+-----------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------
+GovUkDateFieldsTest: test_basic_output_without_fieldset
+-------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------
+GovUkDateFieldsTest: test_squash_html
+-------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_form_hint
+--------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_output_with_legend_class
+-----------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+GovUkDateFieldsTest: test_error_raised_if_invalid_options_given
+---------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-------------------------------------------------------------
+GovUkDateFieldsTest: test_placeholder_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_with_id
+------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+GovUkDateFieldsTest: test_fieldset_with_error_class_and_message
+---------------------------------------------------------------
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------
+EmployeesControllerTest: test_should_show_employee
+--------------------------------------------------
+   (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", "Stephen"], ["dob", "1963-08-13"], ["joined", "2014-04-01"], ["created_at", "2016-04-29 08:57:00.279199"], ["updated_at", "2016-04-29 08:57:00.279199"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", "1965-05-17"], ["joined", "2014-05-21"], ["created_at", "2016-04-29 08:57:00.280771"], ["updated_at", "2016-04-29 08:57:00.280771"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#show as HTML
+  Parameters: {"id"=>"630"}
+  Employee Load (0.2ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT 1  [["id", 630]]
+  Rendered employees/show.html.erb within layouts/application (1.6ms)
+Completed 200 OK in 117ms (Views: 113.7ms | ActiveRecord: 0.2ms)
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------
+EmployeesControllerTest: test_should_get_index
+----------------------------------------------
+   (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", "Stephen"], ["dob", "1963-08-13"], ["joined", "2014-04-01"], ["created_at", "2016-04-29 08:57:00.402428"], ["updated_at", "2016-04-29 08:57:00.402428"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", "1965-05-17"], ["joined", "2014-05-21"], ["created_at", "2016-04-29 08:57:00.403674"], ["updated_at", "2016-04-29 08:57:00.403674"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#index as HTML
+  Employee Load (0.9ms)  SELECT "employees".* FROM "employees"
+  Rendered employees/index.html.erb within layouts/application (3.2ms)
+Completed 200 OK in 6ms (Views: 4.9ms | ActiveRecord: 0.9ms)
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------
+EmployeesControllerTest: test_should_create_employee
+----------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", "1963-08-13"], ["joined", "2014-04-01"], ["created_at", "2016-04-29 08:57:00.412398"], ["updated_at", "2016-04-29 08:57:00.412398"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", "1965-05-17"], ["joined", "2014-05-21"], ["created_at", "2016-04-29 08:57:00.413542"], ["updated_at", "2016-04-29 08:57:00.413542"]]
+   (0.1ms)  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.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Joe Blow"], ["dob", "1965-12-31"], ["joined", "2015-03-04"], ["created_at", "2016-04-29 08:57:00.416530"], ["updated_at", "2016-04-29 08:57:00.416530"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://test.host/employees/636
+Completed 302 Found in 2ms (ActiveRecord: 0.3ms)
+   (0.1ms)  SELECT COUNT(*) FROM "employees"
+   (0.1ms)  SELECT COUNT(*) FROM "employees"
+  Employee Load (0.8ms)  SELECT  "employees".* FROM "employees"  ORDER BY "employees"."id" DESC LIMIT 1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------
+EmployeesControllerTest: test_should_update_employee
+----------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", "1963-08-13"], ["joined", "2014-04-01"], ["created_at", "2016-04-29 08:57:00.420961"], ["updated_at", "2016-04-29 08:57:00.420961"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", "1965-05-17"], ["joined", "2014-05-21"], ["created_at", "2016-04-29 08:57:00.422130"], ["updated_at", "2016-04-29 08:57:00.422130"]]
+   (0.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"=>"637"}
+  Employee Load (0.2ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT 1  [["id", 637]]
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  UPDATE "employees" SET "name" = $1, "dob" = $2, "joined" = $3, "updated_at" = $4 WHERE "employees"."id" = $5  [["name", "Ioannis Kole"], ["dob", "1981-11-01"], ["joined", "2015-10-03"], ["updated_at", "2016-04-29 08:57:00.425159"], ["id", 637]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://test.host/employees/637
+Completed 302 Found in 3ms (ActiveRecord: 0.6ms)
+  Employee Load (0.2ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT 1  [["id", 637]]
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------
+EmployeesControllerTest: test_should_get_new
+--------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Stephen"], ["dob", "1963-08-13"], ["joined", "2014-04-01"], ["created_at", "2016-04-29 08:57:00.428691"], ["updated_at", "2016-04-29 08:57:00.428691"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", "1965-05-17"], ["joined", "2014-05-21"], ["created_at", "2016-04-29 08:57:00.429771"], ["updated_at", "2016-04-29 08:57:00.429771"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#new as HTML
+  Rendered employees/_form.html.erb (8.3ms)
+  Rendered employees/new.html.erb within layouts/application (11.8ms)
+Completed 200 OK in 14ms (Views: 13.9ms | ActiveRecord: 0.0ms)
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------
+EmployeesControllerTest: test_should_render_gov_uk_date_fields
+--------------------------------------------------------------
+   (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", "Stephen"], ["dob", "1963-08-13"], ["joined", "2014-04-01"], ["created_at", "2016-04-29 08:57:00.446611"], ["updated_at", "2016-04-29 08:57:00.446611"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", "1965-05-17"], ["joined", "2014-05-21"], ["created_at", "2016-04-29 08:57:00.447916"], ["updated_at", "2016-04-29 08:57:00.447916"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#edit as HTML
+  Parameters: {"id"=>"641"}
+  Employee Load (0.2ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT 1  [["id", 641]]
+  Rendered employees/_form.html.erb (1.6ms)
+  Rendered employees/edit.html.erb within layouts/application (2.1ms)
+Completed 200 OK in 5ms (Views: 4.1ms | ActiveRecord: 0.2ms)
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------
+EmployeesControllerTest: test_should_destroy_employee
+-----------------------------------------------------
+   (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", "Stephen"], ["dob", "1963-08-13"], ["joined", "2014-04-01"], ["created_at", "2016-04-29 08:57:00.465018"], ["updated_at", "2016-04-29 08:57:00.465018"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", "1965-05-17"], ["joined", "2014-05-21"], ["created_at", "2016-04-29 08:57:00.466228"], ["updated_at", "2016-04-29 08:57:00.466228"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SELECT COUNT(*) FROM "employees"
+Processing by EmployeesController#destroy as HTML
+  Parameters: {"id"=>"643"}
+  Employee Load (0.1ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT 1  [["id", 643]]
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  DELETE FROM "employees" WHERE "employees"."id" = $1  [["id", 643]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://test.host/employees
+Completed 302 Found in 2ms (ActiveRecord: 0.4ms)
+   (0.1ms)  SELECT COUNT(*) FROM "employees"
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------
+EmployeesControllerTest: test_should_get_edit
+---------------------------------------------
+   (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", "Stephen"], ["dob", "1963-08-13"], ["joined", "2014-04-01"], ["created_at", "2016-04-29 08:57:00.471347"], ["updated_at", "2016-04-29 08:57:00.471347"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "employees" ("name", "dob", "joined", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5) RETURNING "id"  [["name", "Tony"], ["dob", "1965-05-17"], ["joined", "2014-05-21"], ["created_at", "2016-04-29 08:57:00.472497"], ["updated_at", "2016-04-29 08:57:00.472497"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by EmployeesController#edit as HTML
+  Parameters: {"id"=>"645"}
+  Employee Load (0.1ms)  SELECT  "employees".* FROM "employees" WHERE "employees"."id" = $1 LIMIT 1  [["id", 645]]
+  Rendered employees/_form.html.erb (1.4ms)
+  Rendered employees/edit.html.erb within layouts/application (1.6ms)
+Completed 200 OK in 3ms (Views: 2.5ms | ActiveRecord: 0.1ms)
+   (0.1ms)  ROLLBACK

data/test/form_fields_test.rb

@@ -60,6 +60,13 @@ class GovUkDateFieldsTest < ActiveSupport::TestCase
     assert_html_equal(date_fields.raw_output, expected_fieldset_output_with_error_class_and_message)
   end
 
+  test 'fieldset with error_class and supplied error messages' do
+    @employee.errors[:joined] <<  "invalid"
+    @employee.errors[: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
+
   test "squash_html" do
     html = "   <html>  This is some   text \n  <tr>  \n    <td>  <%=   dfkhdfh   %>  </td>  </tr>\n</html> "
     expected_result = "<html>This is some   text<tr><td><%=   dfkhdfh   %></td></tr></html>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gov_uk_date_fields
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Stephen Richards
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails