diff --git a/Gemfile.lock b/Gemfile.lock index 3bf0d300..5b5d234e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ PATH acts_as_list (~> 0.9) alba (~> 1.3.0) bcrypt - country_select + country_select (>= 9.0.0) dis (~> 1.1.2) dynamic_image (>= 2.0) jbuilder (~> 2.5) diff --git a/app/helpers/pages_core/labelled_form_builder.rb b/app/helpers/pages_core/labelled_form_builder.rb index 1943c5c7..3860da8b 100644 --- a/app/helpers/pages_core/labelled_form_builder.rb +++ b/app/helpers/pages_core/labelled_form_builder.rb @@ -30,15 +30,10 @@ def labelled_check_box( end def labelled_country_select( - attr, label = nil, priority = {}, opts = {}, html_opts = {} + attr, label = nil, opts = {}, html_opts = {} ) - if priority.is_a?(Hash) - return labelled_field(attr, label, priority) do |options| - country_select(attr, options, opts, html_opts) - end - end labelled_field(attr, label, opts) do |options| - country_select(attr, priority, options, html_opts) + country_select(attr, options, html_opts) end end diff --git a/pages_core.gemspec b/pages_core.gemspec index bf6b0156..fe96469e 100644 --- a/pages_core.gemspec +++ b/pages_core.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |s| s.add_dependency "actionpack-page_caching", ">= 1.1.0" s.add_dependency "alba", "~> 1.3.0" s.add_dependency "bcrypt" - s.add_dependency "country_select" + s.add_dependency "country_select", ">= 9.0.0" s.add_dependency "dis", "~> 1.1.2" s.add_dependency "dynamic_image", ">= 2.0" s.add_dependency "lograge", "~> 0.11.2" diff --git a/spec/helpers/pages_core/form_builder_spec.rb b/spec/helpers/pages_core/form_builder_spec.rb index f6b4a209..7691ad8a 100644 --- a/spec/helpers/pages_core/form_builder_spec.rb +++ b/spec/helpers/pages_core/form_builder_spec.rb @@ -87,7 +87,7 @@ allow(builder).to receive(:country_select) builder.labelled_country_select(:email) expect(builder).to have_received(:country_select) - .with(:email, {}, {}, {}) + .with(:email, {}, {}) end end