diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-04-08 02:08:56 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-04-12 03:41:54 +0300 |
| commit | b8094544a00f3aa5aff32e4ae3ff4c157c71c8bb (patch) | |
| tree | e2033bf7e7ba05db42707a99b770b315e916d334 | |
| parent | 9c054e03d8012cf68c31ce39d9ac99a6aabdee6d (diff) | |
Bump faraday
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | spec/controllers/api/openid_connect/clients_controller_spec.rb | 8 |
3 files changed, 7 insertions, 7 deletions
@@ -181,7 +181,7 @@ gem "acts-as-taggable-on", "5.0.0" # URIs and HTTP gem "addressable", "2.5.2", require: "addressable/uri" -gem "faraday", "0.11.0" # also update User-Agent in OpenID specs +gem "faraday", "0.12.2" # also update User-Agent in OpenID specs gem "faraday_middleware", "0.12.2" gem "faraday-cookie_jar", "0.0.6" gem "typhoeus", "1.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index b45a7c320..ad4af429e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,7 +211,7 @@ GEM factory_girl_rails (4.8.0) factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.11.0) + faraday (0.12.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -790,7 +790,7 @@ DEPENDENCIES entypo-rails (= 3.0.0) eye (= 0.9.2) factory_girl_rails (= 4.8.0) - faraday (= 0.11.0) + faraday (= 0.12.2) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.12.2) fixture_builder (= 0.5.0) diff --git a/spec/controllers/api/openid_connect/clients_controller_spec.rb b/spec/controllers/api/openid_connect/clients_controller_spec.rb index 1a2c0eb4d..b1f59640d 100644 --- a/spec/controllers/api/openid_connect/clients_controller_spec.rb +++ b/spec/controllers/api/openid_connect/clients_controller_spec.rb @@ -8,7 +8,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.11.0" + "User-Agent" => "Faraday v0.12.2" }) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client", @@ -28,7 +28,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.11.0" + "User-Agent" => "Faraday v0.12.2" }) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client", @@ -89,14 +89,14 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.11.0" + "User-Agent" => "Faraday v0.12.2" }) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) stub_request(:get, "https://kentshikama.com/api/openid_connect/jwks.json") .with(headers: { "Accept" => "*/*", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", - "User-Agent" => "Faraday v0.11.0" + "User-Agent" => "Faraday v0.12.2" }) .to_return(status: 200, body: "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"n\":\"qpW\",\"use\":\"sig\"}]}", headers: {}) |