Skip to content

Commit 5cdbf6f

Browse files
author
Bastian Bartmann
committed
Fix ruby 2.7 deprecation warnings
1 parent 2c925fd commit 5cdbf6f

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

lib/stripe_mock/api/client.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def self.start_client(port=4999)
88
return false if @state == 'live'
99
return @client unless @client.nil?
1010

11-
Stripe::StripeClient.send(:define_method, :execute_request) { |*args| StripeMock.redirect_to_mock_server(*args) }
11+
Stripe::StripeClient.send(:define_method, :execute_request) { |*args, **keyword_args| StripeMock.redirect_to_mock_server(*args, **keyword_args) }
1212
@client = StripeMock::Client.new(port)
1313
@state = 'remote'
1414
@client

lib/stripe_mock/api/instance.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module StripeMock
77
def self.start
88
return false if @state == 'live'
99
@instance = instance = Instance.new
10-
Stripe::StripeClient.send(:define_method, :execute_request) { |*args| instance.mock_request(*args) }
10+
Stripe::StripeClient.send(:define_method, :execute_request) { |*args, **keyword_args| instance.mock_request(*args, **keyword_args) }
1111
@state = 'local'
1212
end
1313

lib/stripe_mock/client.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ def mock_request(method, url, api_key: nil, params: {}, headers: {})
1818
@pipe.mock_request(method, url, api_key: api_key, params: params, headers: headers).tap {|result|
1919
response, api_key = result
2020
if response.is_a?(Hash) && response[:error_raised] == 'invalid_request'
21-
raise Stripe::InvalidRequestError.new(*response[:error_params])
21+
args, keyword_args = response[:error_params].first(2), response[:error_params].last
22+
raise Stripe::InvalidRequestError.new(*args, **keyword_args)
2223
end
2324
}
2425
end

lib/stripe_mock/request_handlers/charges.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def ensure_required_params(params)
146146
elsif non_positive_charge_amount?(params)
147147
raise Stripe::InvalidRequestError.new('Invalid positive integer', 'amount', http_status: 400)
148148
elsif params[:source].nil? && params[:customer].nil?
149-
raise Stripe::InvalidRequestError.new('Must provide source or customer.', http_status: nil)
149+
raise Stripe::InvalidRequestError.new('Must provide source or customer.', nil, http_status: nil)
150150
end
151151
end
152152

lib/stripe_mock/request_handlers/ephemeral_key.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def self.included(klass)
66
end
77

88
def create_ephemeral_key(route, method_url, params, headers)
9-
Data.mock_ephemeral_key(params)
9+
Data.mock_ephemeral_key(**params)
1010
end
1111
end
1212
end

lib/stripe_mock/request_handlers/payment_methods.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def get_payment_methods(route, method_url, params, headers)
5151

5252
Data.mock_list_object(clone.values, params)
5353
end
54-
54+
5555
# post /v1/payment_methods/:id/attach
5656
def attach_payment_method(route, method_url, params, headers)
5757
allowed_params = [:customer]
@@ -86,6 +86,7 @@ def update_payment_method(route, method_url, params, headers)
8686
if payment_method[:customer].nil?
8787
raise Stripe::InvalidRequestError.new(
8888
'You must save this PaymentMethod to a customer before you can update it.',
89+
nil,
8990
http_status: 400
9091
)
9192
end
@@ -104,6 +105,7 @@ def ensure_payment_method_required_params(params)
104105
if invalid_type?(params[:type])
105106
raise Stripe::InvalidRequestError.new(
106107
'Invalid type: must be one of card, ideal or sepa_debit',
108+
nil,
107109
http_status: 400
108110
)
109111
end

0 commit comments

Comments
 (0)