doorkeeper-mongodb 5.2.1 → 5.2.2

data/spec/requests/applications/applications_request_spec.rb

@@ -2,127 +2,125 @@
 
 require "spec_helper"
 
-feature "Adding applications" do
-  context "in application form" do
-    background do
-      i_am_logged_in
-      visit "/oauth/applications/new"
-    end
+feature "Adding applications in application form" do
+  background do
+    i_am_logged_in
+    visit "/oauth/applications/new"
+  end
 
-    scenario "adding a valid app" do
-      fill_in "doorkeeper_application[name]", with: "My Application"
-      fill_in "doorkeeper_application[redirect_uri]",
-              with: "https://example.com"
+  scenario "adding a valid app" do
+    fill_in "doorkeeper_application[name]", with: "My Application"
+    fill_in "doorkeeper_application[redirect_uri]",
+            with: "https://example.com"
 
-      click_button "Submit"
-      i_should_see "Application created"
-      i_should_see "My Application"
-    end
+    click_button "Submit"
+    i_should_see "Application created"
+    i_should_see "My Application"
+  end
 
-    scenario "adding invalid app" do
-      click_button "Submit"
-      i_should_see "Whoops! Check your form for possible errors"
-    end
+  scenario "adding invalid app" do
+    click_button "Submit"
+    i_should_see "Whoops! Check your form for possible errors"
+  end
 
-    scenario "adding app ignoring bad scope" do
-      config_is_set("enforce_configured_scopes", false)
+  scenario "adding app ignoring bad scope" do
+    config_is_set("enforce_configured_scopes", false)
 
-      fill_in "doorkeeper_application[name]", with: "My Application"
-      fill_in "doorkeeper_application[redirect_uri]",
-              with: "https://example.com"
-      fill_in "doorkeeper_application[scopes]", with: "blahblah"
+    fill_in "doorkeeper_application[name]", with: "My Application"
+    fill_in "doorkeeper_application[redirect_uri]",
+            with: "https://example.com"
+    fill_in "doorkeeper_application[scopes]", with: "blahblah"
 
-      click_button "Submit"
-      i_should_see "Application created"
-      i_should_see "My Application"
-    end
+    click_button "Submit"
+    i_should_see "Application created"
+    i_should_see "My Application"
+  end
 
-    scenario "adding app validating bad scope" do
-      config_is_set("enforce_configured_scopes", true)
+  scenario "adding app validating bad scope" do
+    config_is_set("enforce_configured_scopes", true)
 
-      fill_in "doorkeeper_application[name]", with: "My Application"
-      fill_in "doorkeeper_application[redirect_uri]",
-              with: "https://example.com"
-      fill_in "doorkeeper_application[scopes]", with: "blahblah"
+    fill_in "doorkeeper_application[name]", with: "My Application"
+    fill_in "doorkeeper_application[redirect_uri]",
+            with: "https://example.com"
+    fill_in "doorkeeper_application[scopes]", with: "blahblah"
 
-      click_button "Submit"
-      i_should_see "Whoops! Check your form for possible errors"
-    end
+    click_button "Submit"
+    i_should_see "Whoops! Check your form for possible errors"
+  end
 
-    scenario "adding app validating scope, blank scope is accepted" do
-      config_is_set("enforce_configured_scopes", true)
+  scenario "adding app validating scope, blank scope is accepted" do
+    config_is_set("enforce_configured_scopes", true)
 
-      fill_in "doorkeeper_application[name]", with: "My Application"
-      fill_in "doorkeeper_application[redirect_uri]",
-              with: "https://example.com"
-      fill_in "doorkeeper_application[scopes]", with: ""
+    fill_in "doorkeeper_application[name]", with: "My Application"
+    fill_in "doorkeeper_application[redirect_uri]",
+            with: "https://example.com"
+    fill_in "doorkeeper_application[scopes]", with: ""
 
-      click_button "Submit"
-      i_should_see "Application created"
-      i_should_see "My Application"
-    end
+    click_button "Submit"
+    i_should_see "Application created"
+    i_should_see "My Application"
+  end
 
-    scenario "adding app validating scope, multiple scopes configured" do
-      config_is_set("enforce_configured_scopes", true)
-      scopes = Doorkeeper::OAuth::Scopes.from_array(%w[read write admin])
-      config_is_set("optional_scopes", scopes)
+  scenario "adding app validating scope, multiple scopes configured" do
+    config_is_set("enforce_configured_scopes", true)
+    scopes = Doorkeeper::OAuth::Scopes.from_array(%w[read write admin])
+    config_is_set("optional_scopes", scopes)
 
-      fill_in "doorkeeper_application[name]", with: "My Application"
-      fill_in "doorkeeper_application[redirect_uri]",
-              with: "https://example.com"
-      fill_in "doorkeeper_application[scopes]", with: "read write"
+    fill_in "doorkeeper_application[name]", with: "My Application"
+    fill_in "doorkeeper_application[redirect_uri]",
+            with: "https://example.com"
+    fill_in "doorkeeper_application[scopes]", with: "read write"
 
-      click_button "Submit"
-      i_should_see "Application created"
-      i_should_see "My Application"
-    end
+    click_button "Submit"
+    i_should_see "Application created"
+    i_should_see "My Application"
+  end
+
+  scenario "adding app validating scope, bad scope with multiple scopes configured" do
+    config_is_set("enforce_configured_scopes", true)
+    scopes = Doorkeeper::OAuth::Scopes.from_array(%w[read write admin])
+    config_is_set("optional_scopes", scopes)
+
+    fill_in "doorkeeper_application[name]", with: "My Application"
+    fill_in "doorkeeper_application[redirect_uri]",
+            with: "https://example.com"
+    fill_in "doorkeeper_application[scopes]", with: "read blah"
+
+    click_button "Submit"
+    i_should_see "Whoops! Check your form for possible errors"
+    i_should_see Regexp.new(
+      I18n.t("activerecord.errors.models.doorkeeper/application.attributes.scopes.not_match_configured"),
+      true,
+    )
+  end
 
-    scenario "adding app validating scope, bad scope with multiple scopes configured" do
-      config_is_set("enforce_configured_scopes", true)
-      scopes = Doorkeeper::OAuth::Scopes.from_array(%w[read write admin])
-      config_is_set("optional_scopes", scopes)
+  context "with blank redirect URI" do
+    scenario "adding app with blank redirect URI when configured flows requires redirect uri" do
+      config_is_set("grant_flows", %w[authorization_code implicit client_credentials])
 
       fill_in "doorkeeper_application[name]", with: "My Application"
       fill_in "doorkeeper_application[redirect_uri]",
-              with: "https://example.com"
-      fill_in "doorkeeper_application[scopes]", with: "read blah"
+              with: ""
 
       click_button "Submit"
       i_should_see "Whoops! Check your form for possible errors"
-      i_should_see Regexp.new(
-        I18n.t("activerecord.errors.models.doorkeeper/application.attributes.scopes.not_match_configured"),
-        true,
-      )
     end
 
-    context "redirect URI" do
-      scenario "adding app with blank redirect URI when configured flows requires redirect uri" do
-        config_is_set("grant_flows", %w[authorization_code implicit client_credentials])
-
-        fill_in "doorkeeper_application[name]", with: "My Application"
-        fill_in "doorkeeper_application[redirect_uri]",
-                with: ""
+    scenario "adding app with blank redirect URI when configured flows without redirect uri" do
+      config_is_set("grant_flows", %w[client_credentials password])
 
-        click_button "Submit"
-        i_should_see "Whoops! Check your form for possible errors"
-      end
-
-      scenario "adding app with blank redirect URI when configured flows without redirect uri" do
-        config_is_set("grant_flows", %w[client_credentials password])
-
-        # Visit it once again to consider grant flows
-        visit "/oauth/applications/new"
+      # Visit it once again to consider grant flows
+      visit "/oauth/applications/new"
 
-        i_should_see I18n.t("doorkeeper.applications.help.blank_redirect_uri")
+      i_should_see I18n.t("doorkeeper.applications.help.blank_redirect_uri")
 
-        fill_in "doorkeeper_application[name]", with: "My Application"
-        fill_in "doorkeeper_application[redirect_uri]",
-                with: ""
+      fill_in "doorkeeper_application[name]", with: "My Application"
+      fill_in "doorkeeper_application[redirect_uri]",
+              with: ""
 
-        click_button "Submit"
-        i_should_see "Application created"
-        i_should_see "My Application"
-      end
+      click_button "Submit"
+      i_should_see "Application created"
+      i_should_see "My Application"
     end
   end
 end

data/spec/requests/endpoints/authorization_spec.rb

@@ -70,7 +70,7 @@ feature "Authorization endpoint" do
     end
   end
 
-  context "forgery protection enabled" do
+  context "when forgery protection enabled" do
     background do
       create_resource_owner
       sign_in

data/spec/requests/endpoints/token_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Token endpoint" do
+RSpec.describe "Token endpoint" do
   before do
     client_exists
     create_resource_owner
@@ -34,46 +34,52 @@ describe "Token endpoint" do
          },
          headers: { "HTTP_AUTHORIZATION" => basic_auth_header_for_client(@client) }
 
-    should_have_json "access_token", Doorkeeper::AccessToken.first.token
+    expect(json_response).to include("access_token" => Doorkeeper::AccessToken.first.token)
   end
 
   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)
-    should_have_json "access_token", Doorkeeper::AccessToken.first.token
-    should_not_have_json "expires_in"
+
+    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")
 
-    should_not_have_json "access_token"
-    should_have_json "error", "unsupported_grant_type"
-    should_have_json "error_description", translated_error_message("unsupported_grant_type")
+    expect(json_response).to match(
+      "error" => "unsupported_grant_type",
+      "error_description" => translated_error_message("unsupported_grant_type"),
+    )
   end
 
   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")
 
-    should_not_have_json "access_token"
-    should_have_json "error", "unsupported_grant_type"
-    should_have_json "error_description", translated_error_message("unsupported_grant_type")
+    expect(json_response).to match(
+      "error" => "unsupported_grant_type",
+      "error_description" => translated_error_message("unsupported_grant_type"),
+    )
   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")
 
-    should_not_have_json "access_token"
-    should_have_json "error", "unsupported_grant_type"
-    should_have_json "error_description", translated_error_message("unsupported_grant_type")
+    expect(json_response).to match(
+      "error" => "unsupported_grant_type",
+      "error_description" => translated_error_message("unsupported_grant_type"),
+    )
   end
 
   it "returns invalid_request if grant_type is missing" do
     post token_endpoint_url(code: @authorization.token, client: @client, grant_type: "")
 
-    should_not_have_json "access_token"
-    should_have_json "error", "invalid_request"
-    should_have_json "error_description", translated_invalid_request_error_message(:missing_param, :grant_type)
+    expect(json_response).to match(
+      "error" => "invalid_request",
+      "error_description" => translated_invalid_request_error_message(:missing_param, :grant_type),
+    )
   end
 end

data/spec/requests/flows/authorization_code_errors_spec.rb

@@ -4,6 +4,7 @@ require "spec_helper"
 
 feature "Authorization Code Flow Errors" do
   let(:client_params) { {} }
+
   background do
     default_scopes_exist :default
     config_is_set(:authenticate_resource_owner) { User.first || redirect_to("/sign_in") }
@@ -19,6 +20,7 @@ feature "Authorization Code Flow Errors" do
   context "with a client trying to xss resource owner" do
     let(:client_name) { "<div id='xss'>XSS</div>" }
     let(:client_params) { { name: client_name } }
+
     scenario "resource owner visit authorization endpoint" do
       visit authorization_endpoint_url(client: @client)
       expect(page).not_to have_css("#xss")
@@ -47,7 +49,7 @@ feature "Authorization Code Flow Errors" do
   end
 end
 
-describe "Authorization Code Flow Errors", "after authorization" do
+RSpec.describe "Authorization Code Flow Errors after authorization" do
   before do
     client_exists
     create_resource_owner
@@ -63,11 +65,12 @@ describe "Authorization Code Flow Errors", "after authorization" do
     # Second attempt with same token
     expect do
       post token_endpoint_url(code: @authorization.token, client: @client)
-    end.to_not(change { Doorkeeper::AccessToken.count })
+    end.not_to(change { Doorkeeper::AccessToken.count })
 
-    should_not_have_json "access_token"
-    should_have_json "error", "invalid_grant"
-    should_have_json "error_description", translated_error_message("invalid_grant")
+    expect(json_response).to match(
+      "error" => "invalid_grant",
+      "error_description" => translated_error_message("invalid_grant"),
+    )
   end
 
   it "returns :invalid_grant error for invalid grant code" do
@@ -75,8 +78,9 @@ describe "Authorization Code Flow Errors", "after authorization" do
 
     access_token_should_not_exist
 
-    should_not_have_json "access_token"
-    should_have_json "error", "invalid_grant"
-    should_have_json "error_description", translated_error_message("invalid_grant")
+    expect(json_response).to match(
+      "error" => "invalid_grant",
+      "error_description" => translated_error_message("invalid_grant"),
+    )
   end
 end

data/spec/requests/flows/authorization_code_spec.rb

@@ -49,11 +49,13 @@ feature "Authorization Code Flow" do
 
       access_token_should_exist_for(@client, @resource_owner)
 
-      should_not_have_json "error"
-
-      should_have_json "access_token", Doorkeeper::AccessToken.first.token
-      should_have_json "token_type", "Bearer"
-      should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+      expect(json_response).to match(
+        "access_token" => Doorkeeper::AccessToken.first.token,
+        "token_type" => "Bearer",
+        "expires_in" => 7200,
+        "scope" => "default",
+        "created_at" => an_instance_of(Integer),
+      )
     end
   end
 
@@ -124,8 +126,10 @@ feature "Authorization Code Flow" do
 
     expect(Doorkeeper::AccessToken.count).to be_zero
 
-    should_have_json "error", "invalid_request"
-    should_have_json "error_description", translated_invalid_request_error_message(:missing_param, :code)
+    expect(json_response).to match(
+      "error" => "invalid_request",
+      "error_description" => translated_invalid_request_error_message(:missing_param, :code),
+    )
   end
 
   scenario "resource owner requests an access token with authorization code" do
@@ -137,11 +141,13 @@ feature "Authorization Code Flow" do
 
     access_token_should_exist_for(@client, @resource_owner)
 
-    should_not_have_json "error"
-
-    should_have_json "access_token", Doorkeeper::AccessToken.first.token
-    should_have_json "token_type", "Bearer"
-    should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+    expect(json_response).to match(
+      "access_token" => Doorkeeper::AccessToken.first.token,
+      "token_type" => "Bearer",
+      "expires_in" => 7200,
+      "scope" => "default",
+      "created_at" => an_instance_of(Integer),
+    )
   end
 
   scenario "resource owner requests an access token with authorization code but without secret" do
@@ -156,8 +162,10 @@ feature "Authorization Code Flow" do
 
     expect(Doorkeeper::AccessToken.count).to be_zero
 
-    should_have_json "error", "invalid_client"
-    should_have_json "error_description", translated_error_message(:invalid_client)
+    expect(json_response).to match(
+      "error" => "invalid_client",
+      "error_description" => translated_error_message(:invalid_client),
+    )
   end
 
   scenario "resource owner requests an access token with authorization code but without client id" do
@@ -172,8 +180,10 @@ feature "Authorization Code Flow" do
 
     expect(Doorkeeper::AccessToken.count).to be_zero
 
-    should_have_json "error", "invalid_client"
-    should_have_json "error_description", translated_error_message(:invalid_client)
+    expect(json_response).to match(
+      "error" => "invalid_client",
+      "error_description" => translated_error_message(:invalid_client),
+    )
   end
 
   scenario "silently authorizes if matching token exists" do
@@ -192,7 +202,7 @@ feature "Authorization Code Flow" do
   end
 
   context "with PKCE" do
-    context "plain" do
+    context "when plain" do
       let(:code_challenge) { "a45a9fea-0676-477e-95b1-a40f72ac3cfb" }
       let(:code_verifier) { "a45a9fea-0676-477e-95b1-a40f72ac3cfb" }
 
@@ -216,8 +226,10 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client, code_verifier
 
-        should_have_json "error", "invalid_grant"
-        should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code and plain code challenge method" do
@@ -233,11 +245,13 @@ feature "Authorization Code Flow" do
 
         access_token_should_exist_for(@client, @resource_owner)
 
-        should_not_have_json "error"
-
-        should_have_json "access_token", Doorkeeper::AccessToken.first.token
-        should_have_json "token_type", "Bearer"
-        should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+        expect(json_response).to match(
+          "access_token" => Doorkeeper::AccessToken.first.token,
+          "token_type" => "Bearer",
+          "expires_in" => 7200,
+          "scope" => "default",
+          "created_at" => an_instance_of(Integer),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code but without code_verifier" do
@@ -251,9 +265,10 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client, nil
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_request"
-        should_have_json "error_description", translated_invalid_request_error_message(:missing_param, :code_verifier)
+        expect(json_response).to match(
+          "error" => "invalid_request",
+          "error_description" => translated_invalid_request_error_message(:missing_param, :code_verifier),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code with wrong code_verifier" do
@@ -267,13 +282,15 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client, "wrong_code_verifier"
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_grant"
-        should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).not_to include("access_token")
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
       end
     end
 
-    context "s256" do
+    context "when S256" do
       let(:code_challenge) { "Oz733NtQ0rJP8b04fgZMJMwprn6Iw8sMCT_9bR1q4tA" }
       let(:code_verifier) { "a45a9fea-0676-477e-95b1-a40f72ac3cfb" }
 
@@ -303,11 +320,13 @@ feature "Authorization Code Flow" do
 
         access_token_should_exist_for(@client, @resource_owner)
 
-        should_not_have_json "error"
-
-        should_have_json "access_token", Doorkeeper::AccessToken.first.token
-        should_have_json "token_type", "Bearer"
-        should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+        expect(json_response).to match(
+          "access_token" => Doorkeeper::AccessToken.first.token,
+          "token_type" => "Bearer",
+          "expires_in" => 7200,
+          "scope" => "default",
+          "created_at" => an_instance_of(Integer),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code and without secret" do
@@ -325,9 +344,11 @@ feature "Authorization Code Flow" do
           redirect_uri: @client.redirect_uri,
           code_verifier: code_verifier,
         )
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_client"
-        should_have_json "error_description", translated_error_message(:invalid_client)
+
+        expect(json_response).to match(
+          "error" => "invalid_client",
+          "error_description" => translated_error_message(:invalid_client),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code and without secret but is marked as not confidential" do
@@ -342,11 +363,14 @@ feature "Authorization Code Flow" do
           redirect_uri: @client.redirect_uri,
           code_verifier: code_verifier,
         )
-        should_not_have_json "error"
 
-        should_have_json "access_token", Doorkeeper::AccessToken.first.token
-        should_have_json "token_type", "Bearer"
-        should_have_json_within "expires_in", Doorkeeper::AccessToken.first.expires_in, 1
+        expect(json_response).to match(
+          "access_token" => Doorkeeper::AccessToken.first.token,
+          "token_type" => "Bearer",
+          "expires_in" => 7200,
+          "scope" => "default",
+          "created_at" => an_instance_of(Integer),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code but no code verifier" do
@@ -360,9 +384,11 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_request"
-        should_have_json "error_description", translated_invalid_request_error_message(:missing_param, :code_verifier)
+        expect(json_response).not_to include("access_token")
+        expect(json_response).to match(
+          "error" => "invalid_request",
+          "error_description" => translated_invalid_request_error_message(:missing_param, :code_verifier),
+        )
       end
 
       scenario "mobile app requests an access token with authorization code with wrong verifier" do
@@ -376,12 +402,13 @@ feature "Authorization Code Flow" do
         authorization_code = current_params["code"]
         create_access_token authorization_code, @client, "incorrect-code-verifier"
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_grant"
-        should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
       end
 
-      scenario "code_challenge_mehthod in token request is totally ignored" do
+      scenario "code_challenge_methhod in token request is totally ignored" do
         visit authorization_endpoint_url(
           client: @client,
           code_challenge: code_challenge,
@@ -397,9 +424,10 @@ feature "Authorization Code Flow" do
           code_challenge_method: "plain",
         )
 
-        should_not_have_json "access_token"
-        should_have_json "error", "invalid_grant"
-        should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
       end
 
       scenario "expects to set code_challenge_method explicitely without fallback" do
@@ -477,7 +505,7 @@ feature "Authorization Code Flow" do
 
       expect(Doorkeeper::AccessToken.count).to be(2)
 
-      should_have_json "access_token", Doorkeeper::AccessToken.last.token
+      expect(json_response).to include("access_token" => Doorkeeper::AccessToken.last.token)
     end
 
     scenario "resource owner authorizes the client with extra scopes" do
@@ -490,41 +518,42 @@ feature "Authorization Code Flow" do
 
       expect(Doorkeeper::AccessToken.count).to be(2)
 
-      should_have_json "access_token", Doorkeeper::AccessToken.last.token
+      expect(json_response).to include("access_token" => Doorkeeper::AccessToken.last.token)
       access_token_should_have_scopes :public, :write
     end
   end
-end
 
-describe "Authorization Code Flow" do
-  before do
-    Doorkeeper.configure do
-      orm DOORKEEPER_ORM
-      use_refresh_token
-    end
+  context "when two requests sent" do
+    before do
+      Doorkeeper.configure do
+        orm DOORKEEPER_ORM
+        use_refresh_token
+      end
 
-    client_exists
-  end
+      client_exists
+    end
 
-  context "issuing a refresh token" do
-    let(:resource_owner) { FactoryBot.create(:resource_owner) }
+    describe "issuing a refresh token" do
+      let(:resource_owner) { FactoryBot.create(:resource_owner) }
 
-    before do
-      authorization_code_exists application: @client,
-                                resource_owner_id: resource_owner.id,
-                                resource_owner_type: resource_owner.class.name
-    end
+      before do
+        authorization_code_exists application: @client,
+                                  resource_owner_id: resource_owner.id,
+                                  resource_owner_type: resource_owner.class.name
+      end
 
-    it "second of simultaneous client requests get an error for revoked acccess token" do
-      authorization_code = Doorkeeper::AccessGrant.first.token
-      allow_any_instance_of(Doorkeeper::AccessGrant)
-        .to receive(:revoked?).and_return(false, true)
+      it "second of simultaneous client requests get an error for revoked access token" do
+        authorization_code = Doorkeeper::AccessGrant.first.token
+        allow_any_instance_of(Doorkeeper::AccessGrant)
+          .to receive(:revoked?).and_return(false, true)
 
-      post token_endpoint_url(code: authorization_code, client: @client)
+        page.driver.post token_endpoint_url(code: authorization_code, client: @client)
 
-      should_not_have_json "access_token"
-      should_have_json "error", "invalid_grant"
-      should_have_json "error_description", translated_error_message(:invalid_grant)
+        expect(json_response).to match(
+          "error" => "invalid_grant",
+          "error_description" => translated_error_message(:invalid_grant),
+        )
+      end
     end
   end
 end