Bump faraday

parent 98d165c0
...@@ -180,7 +180,7 @@ gem "acts-as-taggable-on", "6.0.0" ...@@ -180,7 +180,7 @@ gem "acts-as-taggable-on", "6.0.0"
# URIs and HTTP # URIs and HTTP
gem "addressable", "2.5.2", require: "addressable/uri" gem "addressable", "2.5.2", require: "addressable/uri"
gem "faraday", "0.12.2" # also update User-Agent in OpenID specs gem "faraday", "0.15.3"
gem "faraday_middleware", "0.12.2" gem "faraday_middleware", "0.12.2"
gem "faraday-cookie_jar", "0.0.6" gem "faraday-cookie_jar", "0.0.6"
gem "typhoeus", "1.3.0" gem "typhoeus", "1.3.0"
......
...@@ -210,7 +210,7 @@ GEM ...@@ -210,7 +210,7 @@ GEM
factory_girl_rails (4.8.0) factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0) factory_girl (~> 4.8.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.12.2) faraday (0.15.3)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6) faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4) faraday (>= 0.7.4)
...@@ -403,9 +403,9 @@ GEM ...@@ -403,9 +403,9 @@ GEM
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
oauth (0.5.4) oauth (0.5.4)
oauth2 (1.4.0) oauth2 (1.4.1)
faraday (>= 0.8, < 0.13) faraday (>= 0.8, < 0.16.0)
jwt (~> 1.0) jwt (>= 1.0, < 3.0)
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
...@@ -787,7 +787,7 @@ DEPENDENCIES ...@@ -787,7 +787,7 @@ DEPENDENCIES
entypo-rails (= 3.0.0) entypo-rails (= 3.0.0)
eye (= 0.10.0) eye (= 0.10.0)
factory_girl_rails (= 4.8.0) factory_girl_rails (= 4.8.0)
faraday (= 0.12.2) faraday (= 0.15.3)
faraday-cookie_jar (= 0.0.6) faraday-cookie_jar (= 0.0.6)
faraday_middleware (= 0.12.2) faraday_middleware (= 0.12.2)
fixture_builder (= 0.5.2.rc3) fixture_builder (= 0.5.2.rc3)
......
...@@ -8,7 +8,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf ...@@ -8,7 +8,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf
.with(headers: { .with(headers: {
"Accept" => "*/*", "Accept" => "*/*",
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
"User-Agent" => "Faraday v0.12.2" "User-Agent" => "Faraday v#{Faraday::VERSION}"
}) })
.to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {})
post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client", post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client",
...@@ -28,7 +28,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf ...@@ -28,7 +28,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf
.with(headers: { .with(headers: {
"Accept" => "*/*", "Accept" => "*/*",
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
"User-Agent" => "Faraday v0.12.2" "User-Agent" => "Faraday v#{Faraday::VERSION}"
}) })
.to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {})
post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client", post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client",
...@@ -89,14 +89,14 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf ...@@ -89,14 +89,14 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf
.with(headers: { .with(headers: {
"Accept" => "*/*", "Accept" => "*/*",
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
"User-Agent" => "Faraday v0.12.2" "User-Agent" => "Faraday v#{Faraday::VERSION}"
}) })
.to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {})
stub_request(:get, "https://kentshikama.com/api/openid_connect/jwks.json") stub_request(:get, "https://kentshikama.com/api/openid_connect/jwks.json")
.with(headers: { .with(headers: {
"Accept" => "*/*", "Accept" => "*/*",
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
"User-Agent" => "Faraday v0.12.2" "User-Agent" => "Faraday v#{Faraday::VERSION}"
}) })
.to_return(status: 200, .to_return(status: 200,
body: "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"n\":\"qpW\",\"use\":\"sig\"}]}", headers: {}) body: "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"n\":\"qpW\",\"use\":\"sig\"}]}", headers: {})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment