From 0f6b335a22b0ccc8ea0ce25f7c4b1a29b9ad06da Mon Sep 17 00:00:00 2001 From: Nihal Mohammed Date: Mon, 14 Mar 2022 17:44:04 +0530 Subject: [PATCH 1/6] Change deprecated syntax File.exists? to File.exist? --- config/boot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/boot.rb b/config/boot.rb index eafbdb18d7..4d788c0a5a 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -3,5 +3,5 @@ require 'rubygems' # Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) +require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) require 'bootsnap/setup' From ccc3322c1280edcb5d492022bb23c4e9774d557c Mon Sep 17 00:00:00 2001 From: Nihal Mohammed Date: Mon, 14 Mar 2022 17:45:26 +0530 Subject: [PATCH 2/6] Change deprecated file path upload path syntax in enterprises_controller_spec --- spec/controllers/api/v0/enterprises_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/api/v0/enterprises_controller_spec.rb b/spec/controllers/api/v0/enterprises_controller_spec.rb index 609b5329af..ce9cf59254 100644 --- a/spec/controllers/api/v0/enterprises_controller_spec.rb +++ b/spec/controllers/api/v0/enterprises_controller_spec.rb @@ -75,7 +75,7 @@ describe Api::V0::EnterprisesController, type: :controller do end describe "submitting a valid image" do - let!(:logo) { fixture_file_upload("files/logo.png", "image/png") } + let!(:logo) { fixture_file_upload("logo.png", "image/png") } before do allow(Enterprise) .to receive(:find_by).with({ permalink: enterprise.id.to_s }) { enterprise } From ad52805a0dc250e73c81fd5ed35b75e2ca039b01 Mon Sep 17 00:00:00 2001 From: Nihal Mohammed Date: Mon, 14 Mar 2022 19:36:13 +0530 Subject: [PATCH 3/6] Change errors to be accessed by a block with single paramter instead of hash --- app/models/spree/payment.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb index 8d66fc2757..4d61396129 100644 --- a/app/models/spree/payment.rb +++ b/app/models/spree/payment.rb @@ -183,9 +183,11 @@ module Spree def validate_source if source && !skip_source_validation && !source.valid? - source.errors.each do |field, error| - field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}") - errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{error}") + source.errors.each do |error| + field_name = + I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{error.attribute}") + errors.add(Spree.t(source.class.to_s.demodulize.underscore), + "#{field_name} #{error.message}") end end errors.blank? From 8ceeaaa7d4a5bb3f9d152eb1b2f8604b3041da6a Mon Sep 17 00:00:00 2001 From: Nihal Mohammed Date: Mon, 14 Mar 2022 19:42:44 +0530 Subject: [PATCH 4/6] Fix deprecated Object warning in lib/spree/localized_number --- lib/spree/localized_number.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/spree/localized_number.rb b/lib/spree/localized_number.rb index 88e8373663..77270d49ee 100644 --- a/lib/spree/localized_number.rb +++ b/lib/spree/localized_number.rb @@ -44,7 +44,7 @@ module Spree def self.valid_localizable_number?(number) return true unless number.is_a?(String) || number.respond_to?(:to_d) - return false if number =~ /[.,]\d{2}[.,]/ + return false if number.to_s =~ /[.,]\d{2}[.,]/ true end From b3771bb62390fbd8d178f077a1ccbda51fd1c232 Mon Sep 17 00:00:00 2001 From: Nihal Mohammed Date: Mon, 14 Mar 2022 19:49:20 +0530 Subject: [PATCH 5/6] Use bypass_sign_in method instead of bypass option in app/controllers/spree/users_controller.rb --- app/controllers/spree/users_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/spree/users_controller.rb b/app/controllers/spree/users_controller.rb index cf87ba49da..49900a9a46 100644 --- a/app/controllers/spree/users_controller.rb +++ b/app/controllers/spree/users_controller.rb @@ -62,8 +62,7 @@ module Spree if params[:user][:password].present? # this logic needed b/c devise wants to log us out after password changes Spree::User.reset_password_by_token(params[:user]) - sign_in(@user, event: :authentication, - bypass: true) + bypass_sign_in(@user) end redirect_to spree.account_url, notice: Spree.t(:account_updated) else From df7227443aa2614870ae552dcdeec36d3225a62b Mon Sep 17 00:00:00 2001 From: Nihal Mohammed Date: Mon, 14 Mar 2022 20:04:49 +0530 Subject: [PATCH 6/6] Replace deprecated any_instace syntax with allow_any_instance_of in spec/system/consumer/registration_spec.rb --- spec/system/consumer/registration_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/system/consumer/registration_spec.rb b/spec/system/consumer/registration_spec.rb index 6aa64dd231..5609430a2e 100644 --- a/spec/system/consumer/registration_spec.rb +++ b/spec/system/consumer/registration_spec.rb @@ -17,7 +17,7 @@ describe "Registration", js: true do Spree::State.create!({ name: "Berat", abbr: "BRA", country: albania }) Spree::Country.create!({ name: "Chad", iso3: "TCD", iso: "TD", iso_name: "CHAD", numcode: "148" }) - AddressGeocoder.any_instance.stub(:geocode) + allow_any_instance_of(AddressGeocoder).to receive(:geocode) end after do