Browse Source

Fix lint

pull/2674/head
Manny Dinssa 2 years ago
parent
commit
73cacc830d
  1. 2
      app/helpers/formatting_helper.rb
  2. 26
      spec/models/form/question_spec.rb

2
app/helpers/formatting_helper.rb

@ -1,11 +1,13 @@
module FormattingHelper module FormattingHelper
def ensure_punctuation(value) def ensure_punctuation(value)
return value if value.blank? return value if value.blank?
value.match?(/[[:punct:]]\z/) && !value.match?(/[(){}\[\]]\z/) ? value : "#{value}." value.match?(/[[:punct:]]\z/) && !value.match?(/[(){}\[\]]\z/) ? value : "#{value}."
end end
def downcase_first_letter(str) def downcase_first_letter(str)
return str if str.blank? return str if str.blank?
str[0].downcase + str[1..] str[0].downcase + str[1..]
end end
end end

26
spec/models/form/question_spec.rb

@ -395,57 +395,57 @@ RSpec.describe Form::Question, type: :model do
let(:question_with_id_only_no_punctuation) { described_class.new("address_line1_input", {}, page) } let(:question_with_id_only_no_punctuation) { described_class.new("address_line1_input", {}, page) }
context "when the error label should stay the same" do context "when the error label should stay the same" do
it "returns the error label" do it "returns the error label unchanged with full stop" do
expect(question_with_error_label_with_full_stop.error_display_label).to eq("Address line 1.") expect(question_with_error_label_with_full_stop.error_display_label).to eq("Address line 1.")
end end
it "returns the error label" do it "returns the error label unchanged with question mark" do
expect(question_with_error_label_with_question_mark.error_display_label).to eq("Address line 1?") expect(question_with_error_label_with_question_mark.error_display_label).to eq("Address line 1?")
end end
it "returns the error label" do it "returns the check answer label unchanged with full stop" do
expect(question_with_check_answer_label_with_full_stop.error_display_label).to eq("Address line 1.") expect(question_with_check_answer_label_with_full_stop.error_display_label).to eq("Address line 1.")
end end
it "returns the error label" do it "returns the check answer label unchanged with question mark" do
expect(question_with_check_answer_label_with_question_mark.error_display_label).to eq("Address line 1?") expect(question_with_check_answer_label_with_question_mark.error_display_label).to eq("Address line 1?")
end end
it "returns the error label" do it "returns the header unchanged with full stop" do
expect(question_with_header_with_full_stop.error_display_label).to eq("Address line 1.") expect(question_with_header_with_full_stop.error_display_label).to eq("Address line 1.")
end end
it "returns the error label" do it "returns the header unchanged with question mark" do
expect(question_with_header_with_question_mark.error_display_label).to eq("Address line 1?") expect(question_with_header_with_question_mark.error_display_label).to eq("Address line 1?")
end end
end end
context "when the error label should have a full stop added" do context "when the error label should have a full stop added" do
it "returns the error label" do it "returns the error label with no punctuation changed to with a full stop" do
expect(question_with_error_label_no_punctuation.error_display_label).to eq("Address line 1.") expect(question_with_error_label_no_punctuation.error_display_label).to eq("Address line 1.")
end end
it "returns the error label" do it "returns the error label with brackets changed to with a full stop" do
expect(question_with_error_label_with_brackets.error_display_label).to eq("(Address line 1).") expect(question_with_error_label_with_brackets.error_display_label).to eq("(Address line 1).")
end end
it "returns the error label" do it "returns the check answer label with no punctuation changed with a full stop" do
expect(question_with_check_answer_label_no_punctuation.error_display_label).to eq("Address line 1.") expect(question_with_check_answer_label_no_punctuation.error_display_label).to eq("Address line 1.")
end end
it "returns the error label" do it "returns the check answer label with brackets changed with a full stop" do
expect(question_with_check_answer_label_with_brackets.error_display_label).to eq("(Address line 1).") expect(question_with_check_answer_label_with_brackets.error_display_label).to eq("(Address line 1).")
end end
it "returns the error label" do it "returns the header with no punctuation changed with a full stop" do
expect(question_with_header_no_punctuation.error_display_label).to eq("Address line 1.") expect(question_with_header_no_punctuation.error_display_label).to eq("Address line 1.")
end end
it "returns the error label" do it "returns the header with brackets changed with a full stop" do
expect(question_with_header_with_brackets.error_display_label).to eq("(Address line 1).") expect(question_with_header_with_brackets.error_display_label).to eq("(Address line 1).")
end end
it "returns the error label" do it "returns the id with no punctuation changed with a full stop" do
expect(question_with_id_only_no_punctuation.error_display_label).to eq("Address line1 input.") expect(question_with_id_only_no_punctuation.error_display_label).to eq("Address line1 input.")
end end
end end

Loading…
Cancel
Save