Unverified Commit b8094544 authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Bump faraday

parent 9c054e03

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -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"

Gemfile.lock

+2 −2
Original line number Diff line number Diff line
@@ -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)

spec/controllers/api/openid_connect/clients_controller_spec.rb

+4 −4
Original line number Diff line number Diff line
@@ -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: {})