update hash syntax in spec

This commit is contained in:
Adam Meehan 2018-05-16 12:54:32 +10:00
parent a40a758848
commit 076714d648

View File

@ -20,8 +20,8 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
"birth_datetime(6i)" => '14', "birth_datetime(6i)" => '14',
} }
person.birth_datetime = nil person.birth_datetime = nil
@output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true) @output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'February', :day => 29, :hour => 12, :min => 13, :sec => 14) should_have_datetime_selected(:birth_datetime, year: 2009, month: 'February', day: 29, hour: 12, min: 13, sec: 14)
end end
it "should override object values and use params if present" do it "should override object values and use params if present" do
@ -34,26 +34,26 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
"birth_datetime(6i)" => '14', "birth_datetime(6i)" => '14',
} }
person.birth_datetime = "2010-01-01 15:16:17" person.birth_datetime = "2010-01-01 15:16:17"
@output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true) @output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'February', :day => 29, :hour => 12, :min => 13, :sec => 14) should_have_datetime_selected(:birth_datetime, year: 2009, month: 'February', day: 29, hour: 12, min: 13, sec: 14)
end end
it "should use attribute values from object if no params" do it "should use attribute values from object if no params" do
person.birth_datetime = "2009-01-02 12:13:14" person.birth_datetime = "2009-01-02 12:13:14"
@output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true) @output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'January', :day => 2, :hour => 12, :min => 13, :sec => 14) should_have_datetime_selected(:birth_datetime, year: 2009, month: 'January', day: 2, hour: 12, min: 13, sec: 14)
end end
it "should use attribute values if params does not contain attribute params" do it "should use attribute values if params does not contain attribute params" do
person.birth_datetime = "2009-01-02 12:13:14" person.birth_datetime = "2009-01-02 12:13:14"
@params["person"] = { } @params["person"] = { }
@output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true) @output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'January', :day => 2, :hour => 12, :min => 13, :sec => 14) should_have_datetime_selected(:birth_datetime, year: 2009, month: 'January', day: 2, hour: 12, min: 13, sec: 14)
end end
it "should not select values when attribute value is nil and has no param values" do it "should not select values when attribute value is nil and has no param values" do
person.birth_datetime = nil person.birth_datetime = nil
@output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true) @output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
should_not_have_datetime_selected(:birth_datetime, :year, :month, :day, :hour, :min, :sec) should_not_have_datetime_selected(:birth_datetime, :year, :month, :day, :hour, :min, :sec)
end end
end end
@ -66,8 +66,8 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
"birth_date(3i)" => '29', "birth_date(3i)" => '29',
} }
person.birth_date = nil person.birth_date = nil
@output = date_select(:person, :birth_date, :include_blank => true) @output = date_select(:person, :birth_date, include_blank: true)
should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February', :day => 29) should_have_datetime_selected(:birth_date, year: 2009, month: 'February', day: 29)
end end
it "should override object values and use params if present" do it "should override object values and use params if present" do
@ -77,26 +77,26 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
"birth_date(3i)" => '29', "birth_date(3i)" => '29',
} }
person.birth_date = "2009-03-01" person.birth_date = "2009-03-01"
@output = date_select(:person, :birth_date, :include_blank => true) @output = date_select(:person, :birth_date, include_blank: true)
should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February', :day => 29) should_have_datetime_selected(:birth_date, year: 2009, month: 'February', day: 29)
end end
it "should select attribute values from object if no params" do it "should select attribute values from object if no params" do
person.birth_date = "2009-01-02" person.birth_date = "2009-01-02"
@output = date_select(:person, :birth_date, :include_blank => true) @output = date_select(:person, :birth_date, include_blank: true)
should_have_datetime_selected(:birth_date, :year => 2009, :month => 'January', :day => 2) should_have_datetime_selected(:birth_date, year: 2009, month: 'January', day: 2)
end end
it "should select attribute values if params does not contain attribute params" do it "should select attribute values if params does not contain attribute params" do
person.birth_date = "2009-01-02" person.birth_date = "2009-01-02"
@params["person"] = { } @params["person"] = { }
@output = date_select(:person, :birth_date, :include_blank => true) @output = date_select(:person, :birth_date, include_blank: true)
should_have_datetime_selected(:birth_date, :year => 2009, :month => 'January', :day => 2) should_have_datetime_selected(:birth_date, year: 2009, month: 'January', day: 2)
end end
it "should not select values when attribute value is nil and has no param values" do it "should not select values when attribute value is nil and has no param values" do
person.birth_date = nil person.birth_date = nil
@output = date_select(:person, :birth_date, :include_blank => true) @output = date_select(:person, :birth_date, include_blank: true)
should_not_have_datetime_selected(:birth_time, :year, :month, :day) should_not_have_datetime_selected(:birth_time, :year, :month, :day)
end end
@ -106,8 +106,8 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
"birth_date(2i)" => '2', "birth_date(2i)" => '2',
} }
@output = date_select(:person, :birth_date, :include_blank => true, :discard_day => true) @output = date_select(:person, :birth_date, include_blank: true, discard_day: true)
should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February') should_have_datetime_selected(:birth_date, year: 2009, month: 'February')
should_not_have_datetime_selected(:birth_time, :day) should_not_have_datetime_selected(:birth_time, :day)
expect(@output).to have_tag("input[id=person_birth_date_3i][type=hidden][value='1']") expect(@output).to have_tag("input[id=person_birth_date_3i][type=hidden][value='1']")
end end
@ -128,33 +128,33 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
"birth_time(6i)" => '14', "birth_time(6i)" => '14',
} }
person.birth_time = nil person.birth_time = nil
@output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true) @output = time_select(:person, :birth_time, include_blank: true, include_seconds: true)
should_have_datetime_selected(:birth_time, :hour => 12, :min => 13, :sec => 14) should_have_datetime_selected(:birth_time, hour: 12, min: 13, sec: 14)
end end
it "should select attribute values from object if no params" do it "should select attribute values from object if no params" do
person.birth_time = "2000-01-01 12:13:14" person.birth_time = "2000-01-01 12:13:14"
@output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true) @output = time_select(:person, :birth_time, include_blank: true, include_seconds: true)
should_have_datetime_selected(:birth_time, :hour => 12, :min => 13, :sec => 14) should_have_datetime_selected(:birth_time, hour: 12, min: 13, sec: 14)
end end
it "should not select values when attribute value is nil and has no param values" do it "should not select values when attribute value is nil and has no param values" do
person.birth_time = nil person.birth_time = nil
@output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true) @output = time_select(:person, :birth_time, include_blank: true, include_seconds: true)
should_not_have_datetime_selected(:birth_time, :hour, :min, :sec) should_not_have_datetime_selected(:birth_time, :hour, :min, :sec)
end end
end end
def should_have_datetime_selected(field, datetime_hash) def should_have_datetime_selected(field, datetime_hash)
datetime_hash.each do |key, value| datetime_hash.each do |key, value|
index = {:year => 1, :month => 2, :day => 3, :hour => 4, :min => 5, :sec => 6}[key] index = {year: 1, month: 2, day: 3, hour: 4, min: 5, sec: 6}[key]
expect(@output).to have_tag("select[id=person_#{field}_#{index}i] option[selected=selected]", value.to_s) expect(@output).to have_tag("select[id=person_#{field}_#{index}i] option[selected=selected]", value.to_s)
end end
end end
def should_not_have_datetime_selected(field, *attributes) def should_not_have_datetime_selected(field, *attributes)
attributes.each do |attribute| attributes.each do |attribute|
index = {:year => 1, :month => 2, :day => 3, :hour => 4, :min => 5, :sec => 6}[attribute] index = {year: 1, month: 2, day: 3, hour: 4, min: 5, sec: 6}[attribute]
expect(@output).not_to have_tag("select[id=person_#{attribute}_#{index}i] option[selected=selected]") expect(@output).not_to have_tag("select[id=person_#{attribute}_#{index}i] option[selected=selected]")
end end
end end