Skip to content
This repository was archived by the owner on Jan 31, 2019. It is now read-only.

Commit 10e497c

Browse files
technoweenietechnoweenie
committed
upgrade faraday to 0.8.7
1 parent ffbacfd commit 10e497c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+75
-78
lines changed

‎Gemfile.lock‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
PATH
22
remote: .
33
specs:
4-
github-services (1.0.0.0adf809)
4+
github-services (1.0.0.ffbacfd)
55
activeresource (~> 3.0.0)
66
addressable (~> 2.2.7)
77
aws-sdk (~> 1.8.0)
88
excon (~> 0.20.1)
9-
faraday (= 0.7.6)
9+
faraday (= 0.8.7)
1010
httparty (= 0.7.4)
1111
mail (~> 2.3)
1212
mash (~> 0.1.1)
@@ -43,10 +43,8 @@ GEM
4343
crack (0.1.8)
4444
eventmachine (0.12.10)
4545
excon (0.20.1)
46-
faraday (0.7.6)
47-
addressable (~> 2.2)
46+
faraday (0.8.7)
4847
multipart-post (~> 1.1)
49-
rack (~> 1.1)
5048
faraday_middleware (0.8.7)
5149
faraday (>= 0.7.4, < 0.9)
5250
hashie (1.2.0)
@@ -69,7 +67,6 @@ GEM
6967
nokogiri (1.5.6)
7068
oauth (0.4.4)
7169
polyglot (0.3.3)
72-
rack (1.4.1)
7370
rake (10.0.3)
7471
rest-client (1.6.7)
7572
mime-types (>= 1.16)

‎github-services.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
2525
spec.add_dependency "mash", "~> 0.1.1"
2626
spec.add_dependency "mime-types", "~> 1.15"
2727
spec.add_dependency "ruby-hmac", "0.4.0"
28-
spec.add_dependency "faraday", "0.7.6"
28+
spec.add_dependency "faraday", "0.8.7"
2929
spec.add_dependency "excon", "~> 0.20.1"
3030

3131
# Basecamp Classic

‎lib/services/shiningpanda.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def receive_push
2121
end
2222
branch = payload['ref'].to_s.split('/').last
2323
if branches.empty? || branches.include?(branch)
24-
Rack::Utils.parse_query(data['parameters']).each do |key, values|
24+
Faraday::Utils.parse_query(data['parameters']).each do |key, values|
2525
if !values.is_a?(String) and values.length > 1
2626
raise_config_error "Only one parameter value allowed for " + key
2727
end
@@ -53,7 +53,7 @@ def branches
5353
end
5454

5555
def parameters
56-
@parameters ||= Rack::Utils.parse_nested_query(cleanup('parameters'))
56+
@parameters ||= Faraday::Utils.parse_nested_query(cleanup('parameters'))
5757
end
5858

5959
def query

‎test/CodePorting-C#2Java_test.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class CodePortingCSharp2JavaTest < Service::TestCase
44
def setup
55
@stubs = Faraday::Adapter::Test::Stubs.new
66
@stubs.post '/csharp2java/v0/UserSignin' do |env|
7-
form = Rack::Utils.parse_query(env[:body])
7+
form = Faraday::Utils.parse_query(env[:body])
88
assert_equal 'codeportingtest', form['LoginName']
99
assert_equal 'testpassword', form['Password']
1010
[200, {}, %(<xml><Token>MONKEY</Token><return success="True"></return></xml>)]
@@ -13,7 +13,7 @@ def setup
1313

1414
def test_push
1515
@stubs.post '/csharp2java/v0/githubpluginsupport' do |env|
16-
form = Rack::Utils.parse_query(env[:body])
16+
form = Faraday::Utils.parse_query(env[:body])
1717
assert_equal 'MONKEY', form['token']
1818
assert_equal 'Test_Project', form['ProjectName']
1919
assert_equal 'Test', form['RepoKey']

‎test/active_collab_test.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ def setup
77

88
def test_push
99
@stubs.post "/foo" do |env|
10-
query = Rack::Utils.parse_nested_query(env[:url].query)
11-
body = Rack::Utils.parse_nested_query(env[:body])
10+
query = Faraday::Utils.parse_nested_query(env[:url].query)
11+
body = Faraday::Utils.parse_nested_query(env[:body])
1212
assert_equal '2', body['discussion']['milestone_id']
1313
assert_equal '3', body['discussion']['parent_id']
1414
assert_equal 'activecollab.com', env[:url].host

‎test/apoio_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ def test_push
2222
def service(*args)
2323
super Service::Apoio, *args
2424
end
25-
end
25+
end

‎test/asana_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@ def modified_payload
8383
pay
8484
end
8585

86-
end
86+
end

‎test/bamboo_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def compound_data1
141141
# Raises Test::Unit::AssertionFailedError if the assertion doesn't match.
142142
# Returns nothing.
143143
def assert_params(body, expected)
144-
params = Rack::Utils.parse_query(body)
144+
params = Faraday::Utils.parse_query(body)
145145
expected.each do |key, expected_value|
146146
assert value = params.delete(key.to_s), "#{key} not in #{params.inspect}"
147147
assert_equal expected_value, value, "#{key} = #{value.inspect}, not #{expected_value.inspect}"

‎test/codeclimate_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_posts_payload
2121
assert_equal 'codeclimate.com', env[:url].host
2222
assert_equal basic_auth('github', '5373dd4a3648b88fa9acb8e46ebc188a'),
2323
env[:request_headers]['authorization']
24-
assert_equal payload, JSON.parse(Rack::Utils.parse_query(env[:body])['payload'])
24+
assert_equal payload, JSON.parse(Faraday::Utils.parse_query(env[:body])['payload'])
2525
end
2626

2727
@svc.receive_push

‎test/coffeedocinfo_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def setup
88
def test_push
99
@stubs.post "/checkout" do |env|
1010
assert_equal 'coffeedoc.info', env[:url].host
11-
data = Rack::Utils.parse_query(env[:body])
11+
data = Faraday::Utils.parse_query(env[:body])
1212
assert_equal 1, JSON.parse(data['payload'])['a']
1313
[200, {}, '']
1414
end

0 commit comments

Comments
 (0)