doorkeeper-mongodb 5.2.1 → 5.2.2

data/spec/grape/grape_integration_spec.rb

@@ -60,7 +60,7 @@ module GrapeApp
   end
 end
 
-describe "Grape integration" do
+RSpec.describe "Grape integration" do
   include Rack::Test::Methods
 
   def app

data/spec/helpers/doorkeeper/dashboard_helper_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Doorkeeper::DashboardHelper do
+RSpec.describe Doorkeeper::DashboardHelper do
   describe "#doorkeeper_errors_for" do
     let(:object) { double errors: { method: messages } }
     let(:messages) { ["first message", "second message"] }

data/spec/lib/config_spec.rb

@@ -2,8 +2,8 @@
 
 require "spec_helper"
 
-describe Doorkeeper, "configuration" do
-  subject { Doorkeeper.config }
+RSpec.describe Doorkeeper::Config do
+  subject(:config) { Doorkeeper.config }
 
   describe "resource_owner_authenticator" do
     it "sets the block that is accessible via authenticate_resource_owner" do
@@ -70,7 +70,7 @@ describe Doorkeeper, "configuration" do
   describe "admin_authenticator" do
     it "sets the block that is accessible via authenticate_admin" do
       default_behaviour = "default behaviour"
-      allow(Doorkeeper::Config).to receive(:head).and_return(default_behaviour)
+      allow(described_class).to receive(:head).and_return(default_behaviour)
 
       Doorkeeper.configure do
         orm DOORKEEPER_ORM
@@ -79,7 +79,7 @@ describe Doorkeeper, "configuration" do
       expect(subject.authenticate_admin.call({})).to eq(default_behaviour)
     end
 
-    it "sets the block that is accessible via authenticate_admin" do
+    it "could be customized with a block" do
       block = proc {}
       Doorkeeper.configure do
         orm DOORKEEPER_ORM
@@ -195,7 +195,7 @@ describe Doorkeeper, "configuration" do
       expect(subject.token_grant_types).not_to include "refresh_token"
     end
 
-    context "is enabled" do
+    context "when enabled" do
       before do
         Doorkeeper.configure do
           orm DOORKEEPER_ORM
@@ -216,6 +216,7 @@ describe Doorkeeper, "configuration" do
 
     it "can change the value" do
       Doorkeeper.configure do
+        orm DOORKEEPER_ORM
         token_reuse_limit 90
       end
 
@@ -226,6 +227,7 @@ describe Doorkeeper, "configuration" do
       expect(Rails.logger).to receive(:warn).with(/will be set to default 100/)
 
       Doorkeeper.configure do
+        orm DOORKEEPER_ORM
         reuse_access_token
         token_reuse_limit 110
       end
@@ -501,7 +503,7 @@ describe Doorkeeper, "configuration" do
   end
 
   describe "base_controller" do
-    context "default" do
+    context "when default value set" do
       it { expect(Doorkeeper.configuration.base_controller).to be_an_instance_of(Proc) }
 
       it "resolves to a ApplicationController::Base in default mode" do
@@ -511,6 +513,7 @@ describe Doorkeeper, "configuration" do
 
       it "resolves to a ApplicationController::API in api_only mode" do
         Doorkeeper.configure do
+          orm DOORKEEPER_ORM
           api_only
         end
 
@@ -519,7 +522,7 @@ describe Doorkeeper, "configuration" do
       end
     end
 
-    context "custom" do
+    context "when custom value set" do
       before do
         Doorkeeper.configure do
           orm DOORKEEPER_ORM
@@ -532,11 +535,11 @@ describe Doorkeeper, "configuration" do
   end
 
   describe "base_metal_controller" do
-    context "default" do
+    context "when default value set" do
       it { expect(Doorkeeper.config.base_metal_controller).to eq("ActionController::API") }
     end
 
-    context "custom" do
+    context "when custom value set" do
       before do
         Doorkeeper.configure do
           orm DOORKEEPER_ORM
@@ -561,9 +564,7 @@ describe Doorkeeper, "configuration" do
       end
 
       it "establishes connection for Doorkeeper models based on options" do
-        models.each do |model|
-          expect(model).to receive(:establish_connection)
-        end
+        expect(models).to all(receive(:establish_connection))
 
         expect(Kernel).to receive(:warn).with(
           /\[DOORKEEPER\] active_record_options has been deprecated and will soon be removed/,
@@ -679,6 +680,7 @@ describe Doorkeeper, "configuration" do
     it "is set to render by default" do
       expect(Doorkeeper.config.handle_auth_errors).to eq(:render)
     end
+
     it "can change the value" do
       Doorkeeper.configure do
         orm DOORKEEPER_ORM
@@ -697,6 +699,7 @@ describe Doorkeeper, "configuration" do
     context "when provided" do
       before do
         Doorkeeper.configure do
+          orm DOORKEEPER_ORM
           hash_token_secrets
         end
       end
@@ -711,6 +714,7 @@ describe Doorkeeper, "configuration" do
       it "raises an exception" do
         expect do
           Doorkeeper.configure do
+            orm DOORKEEPER_ORM
             hash_token_secrets using: "does not exist"
           end
         end.to raise_error(NameError)
@@ -721,6 +725,7 @@ describe Doorkeeper, "configuration" do
       it "raises an exception" do
         expect do
           Doorkeeper.configure do
+            orm DOORKEEPER_ORM
             hash_token_secrets using: "Doorkeeper::SecretStoring::BCrypt"
           end
         end.to raise_error(
@@ -733,6 +738,7 @@ describe Doorkeeper, "configuration" do
     context "when provided with fallback" do
       before do
         Doorkeeper.configure do
+          orm DOORKEEPER_ORM
           hash_token_secrets fallback: :plain
         end
       end
@@ -748,6 +754,7 @@ describe Doorkeeper, "configuration" do
         expect(Rails.logger).to receive(:warn).with(/reuse_access_token will be disabled/)
 
         Doorkeeper.configure do
+          orm DOORKEEPER_ORM
           reuse_access_token
           hash_token_secrets
         end
@@ -766,6 +773,7 @@ describe Doorkeeper, "configuration" do
     context "when provided" do
       before do
         Doorkeeper.configure do
+          orm DOORKEEPER_ORM
           hash_application_secrets
         end
       end
@@ -780,6 +788,7 @@ describe Doorkeeper, "configuration" do
       it "raises an exception" do
         expect do
           Doorkeeper.configure do
+            orm DOORKEEPER_ORM
             hash_application_secrets using: "does not exist"
           end
         end.to raise_error(NameError)
@@ -789,6 +798,7 @@ describe Doorkeeper, "configuration" do
     context "when provided with fallback" do
       before do
         Doorkeeper.configure do
+          orm DOORKEEPER_ORM
           hash_application_secrets fallback: :plain
         end
       end
@@ -806,6 +816,7 @@ describe Doorkeeper, "configuration" do
         "[DOORKEEPER] native_redirect_uri has been deprecated and will soon be removed",
       )
       Doorkeeper.configure do
+        orm DOORKEEPER_ORM
         native_redirect_uri "urn:ietf:wg:oauth:2.0:oob"
       end
     end

data/spec/lib/doorkeeper_spec.rb

@@ -2,17 +2,17 @@
 
 require "spec_helper"
 
-describe Doorkeeper do
+RSpec.describe Doorkeeper do
   describe "#authenticate" do
     let(:request) { double }
 
     it "calls OAuth::Token#authenticate" do
-      token_strategies = Doorkeeper.config.access_token_methods
+      token_strategies = described_class.config.access_token_methods
 
       expect(Doorkeeper::OAuth::Token).to receive(:authenticate)
         .with(request, *token_strategies)
 
-      Doorkeeper.authenticate(request)
+      described_class.authenticate(request)
     end
 
     it "accepts custom token strategies" do
@@ -21,7 +21,7 @@ describe Doorkeeper do
       expect(Doorkeeper::OAuth::Token).to receive(:authenticate)
         .with(request, *token_strategies)
 
-      Doorkeeper.authenticate(request, token_strategies)
+      described_class.authenticate(request, token_strategies)
     end
   end
 end

data/spec/lib/models/expirable_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Expirable" do
+RSpec.describe Doorkeeper::Models::Expirable do
   subject do
     Class.new do
       include Doorkeeper::Models::Expirable
@@ -13,7 +13,7 @@ describe "Expirable" do
     allow(subject).to receive(:created_at).and_return(1.minute.ago)
   end
 
-  describe :expired? do
+  describe "#expired?" do
     it "is not expired if time has not passed" do
       allow(subject).to receive(:expires_in).and_return(2.minutes)
       expect(subject).not_to be_expired
@@ -30,30 +30,30 @@ describe "Expirable" do
     end
   end
 
-  describe :expires_in_seconds do
-    it "should return the amount of time remaining until the token is expired" do
+  describe "#expires_in_seconds" do
+    it "returns the amount of time remaining until the token is expired" do
       allow(subject).to receive(:expires_in).and_return(2.minutes)
       expect(subject.expires_in_seconds).to eq(60)
     end
 
-    it "should return 0 when expired" do
+    it "returns 0 when expired" do
       allow(subject).to receive(:expires_in).and_return(30.seconds)
       expect(subject.expires_in_seconds).to eq(0)
     end
 
-    it "should return nil when expires_in is nil" do
+    it "returns nil when expires_in is nil" do
       allow(subject).to receive(:expires_in).and_return(nil)
       expect(subject.expires_in_seconds).to be_nil
     end
   end
 
-  describe :expires_at do
-    it "should return the expiration time of the token" do
+  describe "#expires_at" do
+    it "returns the expiration time of the token" do
       allow(subject).to receive(:expires_in).and_return(2.minutes)
       expect(subject.expires_at).to be_a(Time)
     end
 
-    it "should return nil when expires_in is nil" do
+    it "returns nil when expires_in is nil" do
       allow(subject).to receive(:expires_in).and_return(nil)
       expect(subject.expires_at).to be_nil
     end

data/spec/lib/models/reusable_spec.rb

@@ -2,14 +2,14 @@
 
 require "spec_helper"
 
-describe "Reusable" do
+RSpec.describe Doorkeeper::Models::Reusable do
   subject do
     Class.new do
       include Doorkeeper::Models::Reusable
     end.new
   end
 
-  describe :reusable? do
+  describe "#reusable?" do
     it "is reusable if its expires_in is nil" do
       allow(subject).to receive(:expired?).and_return(false)
       allow(subject).to receive(:expires_in).and_return(nil)

data/spec/lib/models/revocable_spec.rb

@@ -2,14 +2,14 @@
 
 require "spec_helper"
 
-describe "Revocable" do
+RSpec.describe Doorkeeper::Models::Revocable do
   subject do
     Class.new do
       include Doorkeeper::Models::Revocable
     end.new
   end
 
-  describe :revoke do
+  describe "#revoke" do
     it "updates :revoked_at attribute with current time" do
       utc = double utc: double
       clock = double now: utc
@@ -18,7 +18,7 @@ describe "Revocable" do
     end
   end
 
-  describe :revoked? do
+  describe "#revoked?" do
     it "is revoked if :revoked_at has passed" do
       allow(subject).to receive(:revoked_at).and_return(Time.now.utc - 1000)
       expect(subject).to be_revoked
@@ -35,7 +35,7 @@ describe "Revocable" do
     end
   end
 
-  describe :revoke_previous_refresh_token! do
+  describe "#revoke_previous_refresh_token!" do
     it "revokes the previous token if exists and resets the `previous_refresh_token` attribute" do
       previous_token = FactoryBot.create(
         :access_token,
@@ -46,9 +46,6 @@ describe "Revocable" do
         previous_refresh_token: previous_token.refresh_token,
       )
 
-      expect_any_instance_of(
-        Doorkeeper::AccessToken,
-      ).to receive(:revoke).and_call_original
       current_token.revoke_previous_refresh_token!
 
       expect(current_token.previous_refresh_token).to be_empty

data/spec/lib/models/scopes_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Doorkeeper::Models::Scopes" do
+RSpec.describe Doorkeeper::Models::Scopes do
   subject do
     Class.new(Struct.new(:scopes)) do
       include Doorkeeper::Models::Scopes
@@ -13,7 +13,7 @@ describe "Doorkeeper::Models::Scopes" do
     subject[:scopes] = "public admin"
   end
 
-  describe :scopes do
+  describe "#scopes" do
     it "is a `Scopes` class" do
       expect(subject.scopes).to be_a(Doorkeeper::OAuth::Scopes)
     end
@@ -23,7 +23,7 @@ describe "Doorkeeper::Models::Scopes" do
     end
   end
 
-  describe :scopes= do
+  describe "#scopes=" do
     it "accepts String" do
       subject.scopes = "private admin"
       expect(subject.scopes_string).to eq("private admin")
@@ -43,18 +43,18 @@ describe "Doorkeeper::Models::Scopes" do
     end
   end
 
-  describe :scopes_string do
+  describe "#scopes_string" do
     it "is a `Scopes` class" do
       expect(subject.scopes_string).to eq("public admin")
     end
   end
 
-  describe :includes_scope? do
-    it "should return true if at least one scope is included" do
+  describe "#includes_scope?" do
+    it "returns true if at least one scope is included" do
       expect(subject.includes_scope?("public", "private")).to be true
     end
 
-    it "should return false if no scopes are included" do
+    it "returns false if no scopes are included" do
       expect(subject.includes_scope?("teacher", "student")).to be false
     end
   end

data/spec/lib/models/secret_storable_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "SecretStorable" do
+RSpec.describe Doorkeeper::Models::SecretStorable do
   let(:clazz) do
     Class.new do
       include Doorkeeper::Models::SecretStorable
@@ -22,7 +22,7 @@ describe "SecretStorable" do
   end
   let(:strategy) { clazz.secret_strategy }
 
-  describe :find_by_plaintext_token do
+  describe ".find_by_plaintext_token" do
     subject { clazz.send(:find_by_plaintext_token, "attr", "input") }
 
     it "forwards to the secret_strategy" do
@@ -54,8 +54,9 @@ describe "SecretStorable" do
     end
   end
 
-  describe :find_by_fallback_token do
+  describe ".find_by_fallback_token" do
     subject { clazz.send(:find_by_fallback_token, "attr", "input") }
+
     let(:fallback) { double(::Doorkeeper::SecretStoring::Plain) }
 
     it "returns nil if none defined" do
@@ -63,12 +64,12 @@ describe "SecretStorable" do
       expect(subject).to eq nil
     end
 
-    context "if a fallback strategy is defined" do
+    context "when a fallback strategy is defined" do
       before do
         allow(clazz).to receive(:fallback_secret_strategy).and_return(fallback)
       end
 
-      context "if a resource is defined" do
+      context "when resource is defined" do
         let(:resource) { double("Token model") }
 
         it "calls the strategy for lookup" do
@@ -98,7 +99,7 @@ describe "SecretStorable" do
         end
       end
 
-      context "if a resource is not defined" do
+      context "when resource is not defined" do
         before do
           allow(clazz).to receive(:fallback_secret_strategy).and_return(fallback)
         end
@@ -121,13 +122,13 @@ describe "SecretStorable" do
     end
   end
 
-  describe :secret_strategy do
+  describe ".secret_strategy" do
     it "defaults to plain strategy" do
       expect(strategy).to eq Doorkeeper::SecretStoring::Plain
     end
   end
 
-  describe :fallback_secret_strategy do
+  describe ".fallback_secret_strategy" do
     it "defaults to nil" do
       expect(clazz.fallback_secret_strategy).to eq nil
     end