From 076714d6483387b36e584197da008d5804e6aa1e Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Wed, 16 May 2018 12:54:32 +1000 Subject: [PATCH] update hash syntax in spec --- .../extensions/date_time_select_spec.rb | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/spec/validates_timeliness/extensions/date_time_select_spec.rb b/spec/validates_timeliness/extensions/date_time_select_spec.rb index 78d7421..d993569 100644 --- a/spec/validates_timeliness/extensions/date_time_select_spec.rb +++ b/spec/validates_timeliness/extensions/date_time_select_spec.rb @@ -20,8 +20,8 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do "birth_datetime(6i)" => '14', } person.birth_datetime = nil - @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) + @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) end 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', } person.birth_datetime = "2010-01-01 15:16:17" - @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) + @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) end it "should use attribute values from object if no params" do person.birth_datetime = "2009-01-02 12:13:14" - @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) + @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) end it "should use attribute values if params does not contain attribute params" do person.birth_datetime = "2009-01-02 12:13:14" @params["person"] = { } - @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) + @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) end it "should not select values when attribute value is nil and has no param values" do 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) end end @@ -66,8 +66,8 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do "birth_date(3i)" => '29', } person.birth_date = nil - @output = date_select(:person, :birth_date, :include_blank => true) - should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February', :day => 29) + @output = date_select(:person, :birth_date, include_blank: true) + should_have_datetime_selected(:birth_date, year: 2009, month: 'February', day: 29) end 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', } person.birth_date = "2009-03-01" - @output = date_select(:person, :birth_date, :include_blank => true) - should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February', :day => 29) + @output = date_select(:person, :birth_date, include_blank: true) + should_have_datetime_selected(:birth_date, year: 2009, month: 'February', day: 29) end it "should select attribute values from object if no params" do person.birth_date = "2009-01-02" - @output = date_select(:person, :birth_date, :include_blank => true) - should_have_datetime_selected(:birth_date, :year => 2009, :month => 'January', :day => 2) + @output = date_select(:person, :birth_date, include_blank: true) + should_have_datetime_selected(:birth_date, year: 2009, month: 'January', day: 2) end it "should select attribute values if params does not contain attribute params" do person.birth_date = "2009-01-02" @params["person"] = { } - @output = date_select(:person, :birth_date, :include_blank => true) - should_have_datetime_selected(:birth_date, :year => 2009, :month => 'January', :day => 2) + @output = date_select(:person, :birth_date, include_blank: true) + should_have_datetime_selected(:birth_date, year: 2009, month: 'January', day: 2) end it "should not select values when attribute value is nil and has no param values" do 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) end @@ -106,8 +106,8 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do "birth_date(2i)" => '2', } - @output = date_select(:person, :birth_date, :include_blank => true, :discard_day => true) - should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February') + @output = date_select(:person, :birth_date, include_blank: true, discard_day: true) + should_have_datetime_selected(:birth_date, year: 2009, month: 'February') should_not_have_datetime_selected(:birth_time, :day) expect(@output).to have_tag("input[id=person_birth_date_3i][type=hidden][value='1']") end @@ -128,33 +128,33 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do "birth_time(6i)" => '14', } person.birth_time = nil - @output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true) - should_have_datetime_selected(:birth_time, :hour => 12, :min => 13, :sec => 14) + @output = time_select(:person, :birth_time, include_blank: true, include_seconds: true) + should_have_datetime_selected(:birth_time, hour: 12, min: 13, sec: 14) end it "should select attribute values from object if no params" do person.birth_time = "2000-01-01 12:13:14" - @output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true) - should_have_datetime_selected(:birth_time, :hour => 12, :min => 13, :sec => 14) + @output = time_select(:person, :birth_time, include_blank: true, include_seconds: true) + should_have_datetime_selected(:birth_time, hour: 12, min: 13, sec: 14) end it "should not select values when attribute value is nil and has no param values" do 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) end end def should_have_datetime_selected(field, datetime_hash) 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) end end def should_not_have_datetime_selected(field, *attributes) 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]") end end