Fix broken tests due to them using query string instead of form body

Author: ThisIsMissEm

spec/requests/endpoints/token_spec.rb

@@ -13,7 +13,7 @@
   end
 
   it "respond with correct headers" do
-    post token_endpoint_url(code: @authorization.token, client: @client)
+    post token_endpoint_url, params: token_endpoint_params(code: @authorization.token, client: @client)
 
     expect(headers["Cache-Control"]).to be_in(["no-store", "no-cache, no-store", "private, no-store"])
     expect(headers["Content-Type"]).to eq("application/json; charset=utf-8")
@@ -22,10 +22,10 @@
 
   it "accepts client credentials with basic auth header" do
     post token_endpoint_url,
-         params: {
+         params: token_endpoint_params(
            code: @authorization.token,
            redirect_uri: @client.redirect_uri,
-         },
+         ),
          headers: { "HTTP_AUTHORIZATION" => basic_auth_header_for_client(@client) }
 
     expect(json_response).to include("access_token" => Doorkeeper::AccessToken.first.token)
@@ -34,14 +34,14 @@
   it "returns null for expires_in when a permanent token is set" do
     config_is_set(:access_token_expires_in, nil)
 
-    post token_endpoint_url(code: @authorization.token, client: @client)
+    post token_endpoint_url, params: token_endpoint_params(code: @authorization.token, client: @client)
 
     expect(json_response).to include("access_token" => Doorkeeper::AccessToken.first.token)
     expect(json_response).not_to include("expires_in")
   end
 
   it "returns unsupported_grant_type for invalid grant_type param" do
-    post token_endpoint_url(code: @authorization.token, client: @client, grant_type: "nothing")
+    post token_endpoint_url, params: token_endpoint_params(code: @authorization.token, client: @client, grant_type: "nothing")
 
     expect(json_response).to match(
       "error" => "unsupported_grant_type",
@@ -51,7 +51,7 @@
 
   it "returns unsupported_grant_type for disabled grant flows" do
     config_is_set(:grant_flows, ["implicit"])
-    post token_endpoint_url(code: @authorization.token, client: @client, grant_type: "authorization_code")
+    post token_endpoint_url, params: token_endpoint_params(code: @authorization.token, client: @client, grant_type: "authorization_code")
 
     expect(json_response).to match(
       "error" => "unsupported_grant_type",
@@ -60,7 +60,7 @@
   end
 
   it "returns unsupported_grant_type when refresh_token is not in use" do
-    post token_endpoint_url(code: @authorization.token, client: @client, grant_type: "refresh_token")
+    post token_endpoint_url, params: token_endpoint_params(code: @authorization.token, client: @client, grant_type: "refresh_token")
 
     expect(json_response).to match(
       "error" => "unsupported_grant_type",
@@ -69,7 +69,7 @@
   end
 
   it "returns invalid_request if grant_type is missing" do
-    post token_endpoint_url(code: @authorization.token, client: @client, grant_type: "")
+    post token_endpoint_url, params: token_endpoint_params(code: @authorization.token, client: @client, grant_type: "")
 
     expect(json_response).to match(
       "error" => "invalid_request",

spec/requests/flows/authorization_code_errors_spec.rb

@@ -60,11 +60,11 @@
 
   it "returns :invalid_grant error when posting an already revoked grant code" do
     # First successful request
-    post token_endpoint_url(code: @authorization.token, client: @client)
+    post token_endpoint_url, params: token_endpoint_params(code: @authorization.token, client: @client)
 
     # Second attempt with same token
     expect do
-      post token_endpoint_url(code: @authorization.token, client: @client)
+      post token_endpoint_url, params: token_endpoint_params(code: @authorization.token, client: @client)
     end.not_to(change { Doorkeeper::AccessToken.count })
 
     expect(json_response).to match(
@@ -74,7 +74,7 @@
   end
 
   it "returns :invalid_grant error for invalid grant code" do
-    post token_endpoint_url(code: "invalid", client: @client)
+    post token_endpoint_url, params: token_endpoint_params(code: "invalid", client: @client)
 
     access_token_should_not_exist
 

spec/requests/flows/authorization_code_spec.rb

@@ -155,7 +155,7 @@ def authorize(redirect_url)
     click_on "Authorize"
 
     authorization_code = Doorkeeper::AccessGrant.first.token
-    page.driver.post token_endpoint_url(
+    page.driver.post token_endpoint_url, token_endpoint_params(
       code: authorization_code,
       client_id: @client.uid,
       redirect_uri: @client.redirect_uri,
@@ -174,7 +174,7 @@ def authorize(redirect_url)
     click_on "Authorize"
 
     authorization_code = Doorkeeper::AccessGrant.first.token
-    page.driver.post token_endpoint_url(
+    page.driver.post token_endpoint_url, token_endpoint_params(
       code: authorization_code,
       client_secret: @client.secret,
       redirect_uri: @client.redirect_uri,
@@ -334,7 +334,7 @@ def authorize(redirect_url)
         click_on "Authorize"
 
         authorization_code = current_params["code"]
-        page.driver.post token_endpoint_url(
+        page.driver.post token_endpoint_url, token_endpoint_params(
           code: authorization_code,
           client_id: @client.uid,
           redirect_uri: @client.redirect_uri,
@@ -353,7 +353,7 @@ def authorize(redirect_url)
         click_on "Authorize"
 
         authorization_code = current_params["code"]
-        page.driver.post token_endpoint_url(
+        page.driver.post token_endpoint_url, token_endpoint_params(
           code: authorization_code,
           client_id: @client.uid,
           redirect_uri: @client.redirect_uri,
@@ -413,7 +413,7 @@ def authorize(redirect_url)
         click_on "Authorize"
 
         authorization_code = current_params["code"]
-        page.driver.post token_endpoint_url(
+        page.driver.post token_endpoint_url, token_endpoint_params(
           code: authorization_code,
           client: @client,
           code_verifier: code_challenge,
@@ -543,7 +543,7 @@ def authorize(redirect_url)
         allow_any_instance_of(Doorkeeper::AccessGrant)
           .to receive(:revoked?).and_return(false, true)
 
-        page.driver.post token_endpoint_url(code: authorization_code, client: @client)
+        page.driver.post token_endpoint_url, token_endpoint_params(code: authorization_code, client: @client)
 
         expect(json_response).to match(
           "error" => "invalid_grant",
@@ -573,7 +573,7 @@ def authorize(redirect_url)
     end
 
     it "copies custom attributes from the grant into the token" do
-      page.driver.post token_endpoint_url(code: grant.token, client: client)
+      page.driver.post token_endpoint_url, token_endpoint_params(code: grant.token, client: client)
 
       access_token = Doorkeeper::AccessToken.find_by(token: json_response["access_token"])
       expect(access_token.tenant_name).to eq("Tenant 1")

spec/requests/flows/client_credentials_spec.rb

@@ -10,7 +10,7 @@
       headers = authorization client.uid, client.secret
       params  = { grant_type: "client_credentials" }
 
-      post "/oauth/token", params: params, headers: headers
+      post token_endpoint_url, params: params, headers: headers
 
       expect(json_response).to match(
         "access_token" => Doorkeeper::AccessToken.first.token,
@@ -30,7 +30,7 @@
         headers = authorization client.uid, client.secret
         params  = { grant_type: "client_credentials", scope: "write" }
 
-        post "/oauth/token", params: params, headers: headers
+        post token_endpoint_url, params: params, headers: headers
 
         expect(json_response).to include(
           "access_token" => Doorkeeper::AccessToken.first.token,
@@ -43,7 +43,7 @@
           headers = authorization client.uid, client.secret
           params  = { grant_type: "client_credentials", scope: "public" }
 
-          post "/oauth/token", params: params, headers: headers
+          post token_endpoint_url, params: params, headers: headers
 
           expect(json_response).to include(
             "access_token" => Doorkeeper::AccessToken.first.token,
@@ -57,7 +57,7 @@
           headers = authorization client.uid, client.secret
           params  = { grant_type: "client_credentials", scope: "random" }
 
-          post "/oauth/token", params: params, headers: headers
+          post token_endpoint_url, params: params, headers: headers
 
           expect(response.status).to eq(400)
           expect(json_response).to match(
@@ -83,7 +83,7 @@
       headers = authorization client.uid, client.secret
       params  = { grant_type: "client_credentials" }
 
-      post "/oauth/token", params: params, headers: headers
+      post token_endpoint_url, params: params, headers: headers
 
       expect(json_response).to match(
         "error" => "unauthorized_client",
@@ -97,7 +97,7 @@
       headers = authorization client.uid, client.secret
       params  = { grant_type: "client_credentials" }
 
-      post "/oauth/token", params: params, headers: headers
+      post token_endpoint_url, params: params, headers: headers
 
       expect(json_response).to match(
         "access_token" => Doorkeeper::AccessToken.first.token,
@@ -120,7 +120,7 @@
       params  = { grant_type: "client_credentials" }
 
       expect do
-        post "/oauth/token", params: params, headers: headers
+        post token_endpoint_url, params: params, headers: headers
       end.to change { Doorkeeper::AccessToken.count }.by(1)
 
       token = Doorkeeper::AccessToken.first
@@ -139,7 +139,7 @@
       params  = { grant_type: "client_credentials" }
 
       expect do
-        post "/oauth/token", params: params, headers: headers
+        post token_endpoint_url, params: params, headers: headers
       end.to change { Doorkeeper::AccessToken.count }.by(1)
 
       token = Doorkeeper::AccessToken.first
@@ -157,7 +157,7 @@
       headers = authorization client.uid, client.secret
       params  = { grant_type: "client_credentials" }
 
-      post "/oauth/token", params: params, headers: headers
+      post token_endpoint_url, params: params, headers: headers
 
       expect(json_response).to match(
         "error" => "invalid_scope",
@@ -171,7 +171,7 @@
       headers = {}
       params  = { grant_type: "client_credentials" }
 
-      post "/oauth/token", params: params, headers: headers
+      post token_endpoint_url, params: params, headers: headers
 
       expect(response.status).to eq(401)
 
@@ -192,12 +192,12 @@
       headers = authorization client.uid, client.secret
       params  = { grant_type: "client_credentials" }
 
-      post "/oauth/token", params: params, headers: headers
+      post token_endpoint_url, params: params, headers: headers
       expect(json_response).to include("access_token" => Doorkeeper::AccessToken.first.token)
 
       token = Doorkeeper::AccessToken.first
 
-      post "/oauth/token", params: params, headers: headers
+      post token_endpoint_url, params: params, headers: headers
       expect(json_response).to include("access_token" => Doorkeeper::AccessToken.last.token)
 
       expect(token.reload).to be_revoked
@@ -216,7 +216,7 @@
         headers = authorization client.uid, client.secret
         params  = { grant_type: "client_credentials" }
 
-        post "/oauth/token", params: params, headers: headers
+        post token_endpoint_url, params: params, headers: headers
 
         expect(json_response).to match(
           "error" => "invalid_token_reuse",