Skip to content

Commit

Permalink
Rename BooleanValidator to YesNoValidator
Browse files Browse the repository at this point in the history
Since these fields aren't booleans any more, I renamed the shared validator to reflect what we are actually checking.
  • Loading branch information
irisfaraway committed Jul 25, 2018
1 parent 1e46a39 commit 486355f
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/forms/waste_carriers_engine/check_your_answers_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def contact_name
validates :company_no, "waste_carriers_engine/company_no": true
validates :contact_address, "waste_carriers_engine/address": true
validates :contact_email, "waste_carriers_engine/email": true
validates :declared_convictions, "waste_carriers_engine/boolean": true
validates :declared_convictions, "waste_carriers_engine/yes_no": true
validates :first_name, :last_name, "waste_carriers_engine/person_name": true
validates :location, "waste_carriers_engine/location": true
validates :phone_number, "waste_carriers_engine/phone_number": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ def submit(params)
super(attributes, params[:reg_identifier])
end

validates :construction_waste, "waste_carriers_engine/boolean": true
validates :construction_waste, "waste_carriers_engine/yes_no": true
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ def submit(params)
super(attributes, params[:reg_identifier])
end

validates :declared_convictions, "waste_carriers_engine/boolean": true
validates :declared_convictions, "waste_carriers_engine/yes_no": true
end
end
2 changes: 1 addition & 1 deletion app/forms/waste_carriers_engine/other_businesses_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ def submit(params)
super(attributes, params[:reg_identifier])
end

validates :other_businesses, "waste_carriers_engine/boolean": true
validates :other_businesses, "waste_carriers_engine/yes_no": true
end
end
2 changes: 1 addition & 1 deletion app/forms/waste_carriers_engine/service_provided_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ def submit(params)
super(attributes, params[:reg_identifier])
end

validates :is_main_service, "waste_carriers_engine/boolean": true
validates :is_main_service, "waste_carriers_engine/yes_no": true
end
end
2 changes: 1 addition & 1 deletion app/forms/waste_carriers_engine/tier_check_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ def submit(params)
super(attributes, params[:reg_identifier])
end

validates :temp_tier_check, "waste_carriers_engine/boolean": true
validates :temp_tier_check, "waste_carriers_engine/yes_no": true
end
end
2 changes: 1 addition & 1 deletion app/forms/waste_carriers_engine/waste_types_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ def submit(params)
super(attributes, params[:reg_identifier])
end

validates :only_amf, "waste_carriers_engine/boolean": true
validates :only_amf, "waste_carriers_engine/yes_no": true
end
end
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module WasteCarriersEngine
class BooleanValidator < ActiveModel::EachValidator
class YesNoValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
valid_values = %w[yes no]
return true if valid_values.include?(value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module WasteCarriersEngine
end
end

include_examples "validate boolean", form = :check_your_answers_form, field = :declared_convictions
include_examples "validate yes no", form = :check_your_answers_form, field = :declared_convictions
include_examples "validate business_type", form = :check_your_answers_form
include_examples "validate company_name", form = :check_your_answers_form
include_examples "validate company_no", form = :check_your_answers_form
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ module WasteCarriersEngine
end
end

include_examples "validate boolean", form = :construction_demolition_form, field = :construction_waste
include_examples "validate yes no", form = :construction_demolition_form, field = :construction_waste
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ module WasteCarriersEngine
end
end

include_examples "validate boolean", form = :declare_convictions_form, field = :declared_convictions
include_examples "validate yes no", form = :declare_convictions_form, field = :declared_convictions
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ module WasteCarriersEngine
end
end

include_examples "validate boolean", form = :other_businesses_form, field = :other_businesses
include_examples "validate yes no", form = :other_businesses_form, field = :other_businesses
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ module WasteCarriersEngine
end
end

include_examples "validate boolean", form = :service_provided_form, field = :is_main_service
include_examples "validate yes no", form = :service_provided_form, field = :is_main_service
end
end
2 changes: 1 addition & 1 deletion spec/forms/waste_carriers_engine/tier_check_forms_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ module WasteCarriersEngine
end
end

include_examples "validate boolean", form = :tier_check_form, field = :temp_tier_check
include_examples "validate yes no", form = :tier_check_form, field = :temp_tier_check
end
end
2 changes: 1 addition & 1 deletion spec/forms/waste_carriers_engine/waste_types_forms_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ module WasteCarriersEngine
end
end

include_examples "validate boolean", form = :waste_types_form, field = :only_amf
include_examples "validate yes no", form = :waste_types_form, field = :only_amf
end
end
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Tests for fields using the BooleanValidator
RSpec.shared_examples "validate boolean" do |form_factory, field|
# Tests for fields using the YesNoValidator
RSpec.shared_examples "validate yes no" do |form_factory, field|
context "when a valid transient registration exists" do
let(:form) { build(form_factory, :has_required_data) }

Expand Down

0 comments on commit 486355f

Please sign in to comment.