Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

Update faraday dependency to support faraday 2.x #42

Merged
merged 2 commits into from
Dec 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions aftership.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Gem::Specification.new do |s|
s.licenses = ['MIT']
s.summary = 'Formerly known as aftership_ruby and a wrapper for AfterShip API. Support the latest V3/V4 API'
s.description = 'Developed for easy integration with AfterShip'
s.required_ruby_version = '>= 2.3.0'
s.required_ruby_version = '>= 2.6'

s.author = ['AfterShip Limited']
s.email = ['[email protected]']
Expand All @@ -15,8 +15,7 @@ Gem::Specification.new do |s|
s.require_paths = ['lib']
s.requirements << 'none'

s.add_dependency 'faraday', '~> 1.0', '>= 1.0.1'
s.add_dependency 'faraday_middleware', '~> 1.0'
s.add_dependency 'faraday', '>= 2.0.0'

s.add_development_dependency 'pry'
s.add_development_dependency 'rspec', '~> 2.14.1'
Expand Down
1 change: 0 additions & 1 deletion lib/aftership/v4/base.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'faraday'
require 'faraday_middleware'

module AfterShip
module V4
Expand Down
10 changes: 5 additions & 5 deletions spec/base_v4_spec.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
require 'spec_helper'

describe AfterShip::V4::Base do
let(:http_verb_method) { 'get' }
let(:http_verb_method) { :get }
let(:end_point) { 'trackings' }
let(:params) { { courier: 'usps' } }
let(:query) { { courier: 'usps' } }
let(:body) { { emails: ['[email protected]'] } }
subject { described_class.new(http_verb_method, end_point, params, body) }
subject { described_class.new(http_verb_method, end_point, query, body) }

its(:body) { should(eq(body)) }
its(:params) { should(eq(params)) }
its(:query) { should(eq(query)) }
its(:end_point) { should(eq(end_point)) }
its(:http_verb_method) { should(eq(http_verb_method)) }

Expand All @@ -24,7 +24,7 @@
#HTTPI.logger.should_receive(:warn).with("the emails field should be an array").once
#HTTPI.logger.should_receive(:warn).with('the smses field should be an array').once

#HTTPI.should_receive(:send).with(:get, kind_of(HTTPI::Request)).and_return(response)
# HTTPI.should_receive(:send).with(:get, kind_of(HTTPI::Request)).and_return(response)
subject.call
end

Expand Down