doorkeeper-mongodb 5.2.1 → 5.2.3

data/spec/lib/oauth/refresh_token_request_spec.rb

@@ -2,7 +2,9 @@
 
 require "spec_helper"
 
-describe Doorkeeper::OAuth::RefreshTokenRequest do
+RSpec.describe Doorkeeper::OAuth::RefreshTokenRequest do
+  subject { described_class.new(server, refresh_token, credentials) }
+
   let(:server) do
     double :server, access_token_expires_in: 2.minutes
   end
@@ -19,8 +21,6 @@ describe Doorkeeper::OAuth::RefreshTokenRequest do
     allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(false)
   end
 
-  subject { described_class.new(server, refresh_token, credentials) }
-
   it "issues a new token for the client" do
     expect { subject.authorize }.to change { client.reload.access_tokens.count }.by(1)
     # #sort_by used for MongoDB ORM extensions for valid ordering
@@ -38,7 +38,7 @@ describe Doorkeeper::OAuth::RefreshTokenRequest do
   end
 
   it "revokes the previous token" do
-    expect { subject.authorize }.to change { refresh_token.revoked? }.from(false).to(true)
+    expect { subject.authorize }.to change(refresh_token, :revoked?).from(false).to(true)
   end
 
   it "calls configured request callback methods" do
@@ -87,7 +87,7 @@ describe Doorkeeper::OAuth::RefreshTokenRequest do
     expect(subject).to be_valid
   end
 
-  context "refresh tokens expire on access token use" do
+  context "when refresh tokens expire on access token use" do
     before do
       allow(Doorkeeper::AccessToken).to receive(:refresh_token_revoked_on_use?).and_return(true)
     end
@@ -110,17 +110,19 @@ describe Doorkeeper::OAuth::RefreshTokenRequest do
     end
   end
 
-  context "clientless access tokens" do
-    let!(:refresh_token) { FactoryBot.create(:clientless_access_token, use_refresh_token: true) }
-
+  context "with clientless access tokens" do
     subject { described_class.new server, refresh_token, nil }
 
+    let!(:refresh_token) { FactoryBot.create(:clientless_access_token, use_refresh_token: true) }
+
     it "issues a new token without a client" do
       expect { subject.authorize }.to change { Doorkeeper::AccessToken.count }.by(1)
     end
   end
 
   context "with scopes" do
+    subject { described_class.new server, refresh_token, credentials, parameters }
+
     let(:refresh_token) do
       FactoryBot.create :access_token,
                         use_refresh_token: true,
@@ -128,8 +130,6 @@ describe Doorkeeper::OAuth::RefreshTokenRequest do
     end
     let(:parameters) { {} }
 
-    subject { described_class.new server, refresh_token, credentials, parameters }
-
     it "transfers scopes from the old token to the new token" do
       subject.authorize
       expect(Doorkeeper::AccessToken.last.scopes).to eq(%i[public write])

data/spec/lib/oauth/scopes_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Doorkeeper::OAuth::Scopes do
+RSpec.describe Doorkeeper::OAuth::Scopes do
   describe "#add" do
     it "allows you to add scopes with symbols" do
       subject.add :public
@@ -27,28 +27,28 @@ describe Doorkeeper::OAuth::Scopes do
     end
 
     it "returns true if scope with given name is present" do
-      expect(subject.exists?("public")).to be_truthy
+      expect(subject).to exist("public")
     end
 
     it "returns false if scope with given name does not exist" do
-      expect(subject.exists?("other")).to be_falsey
+      expect(subject).not_to exist("other")
     end
 
     it "handles symbols" do
-      expect(subject.exists?(:public)).to be_truthy
-      expect(subject.exists?(:other)).to be_falsey
+      expect(subject).to exist(:public)
+      expect(subject).not_to exist(:other)
     end
   end
 
   describe ".from_string" do
-    let(:string) { "public write" }
-
     subject { described_class.from_string(string) }
 
+    let(:string) { "public write" }
+
     it { expect(subject).to be_a(described_class) }
 
     describe "#all" do
-      it "should be an array of the expected scopes" do
+      it "is an array of the expected scopes" do
         scopes_array = subject.all
         expect(scopes_array.size).to eq(2)
         expect(scopes_array).to include("public")
@@ -120,27 +120,27 @@ describe Doorkeeper::OAuth::Scopes do
     subject { described_class.from_string("public admin") }
 
     it "returns true when at least one scope is included" do
-      expect(subject.has_scopes?(described_class.from_string("public"))).to be_truthy
+      expect(subject).to have_scopes(described_class.from_string("public"))
     end
 
     it "returns true when all scopes are included" do
-      expect(subject.has_scopes?(described_class.from_string("public admin"))).to be_truthy
+      expect(subject).to have_scopes(described_class.from_string("public admin"))
     end
 
     it "is true if all scopes are included in any order" do
-      expect(subject.has_scopes?(described_class.from_string("admin public"))).to be_truthy
+      expect(subject).to have_scopes(described_class.from_string("admin public"))
     end
 
     it "is false if no scopes are included" do
-      expect(subject.has_scopes?(described_class.from_string("notexistent"))).to be_falsey
+      expect(subject).not_to have_scopes(described_class.from_string("notexistent"))
     end
 
     it "returns false when any scope is not included" do
-      expect(subject.has_scopes?(described_class.from_string("public nope"))).to be_falsey
+      expect(subject).not_to have_scopes(described_class.from_string("public nope"))
     end
 
     it "is false if no scopes are included even for existing ones" do
-      expect(subject.has_scopes?(described_class.from_string("public admin notexistent"))).to be_falsey
+      expect(subject).not_to have_scopes(described_class.from_string("public admin notexistent"))
     end
   end
 end

data/spec/lib/oauth/token_request_spec.rb

@@ -2,7 +2,11 @@
 
 require "spec_helper"
 
-describe Doorkeeper::OAuth::TokenRequest do
+RSpec.describe Doorkeeper::OAuth::TokenRequest do
+  subject do
+    described_class.new(pre_auth, owner)
+  end
+
   let :application do
     FactoryBot.create(:application, scopes: "public")
   end
@@ -29,10 +33,6 @@ describe Doorkeeper::OAuth::TokenRequest do
     FactoryBot.create(:doorkeeper_testing_user)
   end
 
-  subject do
-    described_class.new(pre_auth, owner)
-  end
-
   it "creates an access token" do
     expect do
       subject.authorize
@@ -61,7 +61,7 @@ describe Doorkeeper::OAuth::TokenRequest do
         end
       end
 
-      it "should use the custom ttl" do
+      it "uses the custom ttl" do
         subject.authorize
         token = Doorkeeper::AccessToken.first
         expect(token.expires_in).to eq(1234)
@@ -79,7 +79,7 @@ describe Doorkeeper::OAuth::TokenRequest do
         end
       end
 
-      it "should fallback to access_token_expires_in" do
+      it "fallbacks to access_token_expires_in" do
         subject.authorize
         token = Doorkeeper::AccessToken.first
         expect(token.expires_in).to eq(654)
@@ -97,7 +97,7 @@ describe Doorkeeper::OAuth::TokenRequest do
         end
       end
 
-      it "should fallback to access_token_expires_in" do
+      it "fallbacks to access_token_expires_in" do
         subject.authorize
         token = Doorkeeper::AccessToken.first
         expect(token.expires_in).to be_nil
@@ -105,7 +105,7 @@ describe Doorkeeper::OAuth::TokenRequest do
     end
   end
 
-  context "token reuse" do
+  context "when reuse_access_token enabled" do
     it "creates a new token if there are no matching tokens" do
       allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
       expect do

data/spec/lib/oauth/token_response_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Doorkeeper::OAuth::TokenResponse do
+RSpec.describe Doorkeeper::OAuth::TokenResponse do
   subject { described_class.new(double.as_null_object) }
 
   it "includes access token response headers" do
@@ -16,6 +16,8 @@ describe Doorkeeper::OAuth::TokenResponse do
   end
 
   describe ".body" do
+    subject { described_class.new(access_token).body }
+
     let(:access_token) do
       double :access_token,
              plaintext_token: "some-token",
@@ -27,8 +29,6 @@ describe Doorkeeper::OAuth::TokenResponse do
              created_at: 0
     end
 
-    subject { described_class.new(access_token).body }
-
     it "includes :access_token" do
       expect(subject["access_token"]).to eq("some-token")
     end
@@ -57,6 +57,8 @@ describe Doorkeeper::OAuth::TokenResponse do
   end
 
   describe ".body filters out empty values" do
+    subject { described_class.new(access_token).body }
+
     let(:access_token) do
       double :access_token,
              plaintext_token: "some-token",
@@ -67,8 +69,6 @@ describe Doorkeeper::OAuth::TokenResponse do
              created_at: 0
     end
 
-    subject { described_class.new(access_token).body }
-
     it "includes :expires_in" do
       expect(subject["expires_in"]).to be_nil
     end

data/spec/lib/oauth/token_spec.rb

@@ -9,7 +9,7 @@ module Doorkeeper
   end
 end
 
-describe Doorkeeper::OAuth::Token do
+RSpec.describe Doorkeeper::OAuth::Token do
   describe ".from_request" do
     let(:request) { double.as_null_object }
 
@@ -96,8 +96,8 @@ describe Doorkeeper::OAuth::Token do
   end
 
   describe ".authenticate" do
-    context "refresh tokens are disabled (default)" do
-      context "refresh tokens are enabled" do
+    context "when refresh tokens are disabled (default)" do
+      context "when refresh tokens are enabled" do
         it "does not revoke previous refresh_token if token was found" do
           token = ->(_r) { "token" }
           expect(
@@ -115,7 +115,7 @@ describe Doorkeeper::OAuth::Token do
       end
     end
 
-    context "token hashing is enabled" do
+    context "when token hashing is enabled" do
       include_context "with token hashing enabled"
 
       let(:hashed_token) { hashed_or_plain_token_func.call("token") }
@@ -129,7 +129,7 @@ describe Doorkeeper::OAuth::Token do
       end
     end
 
-    context "refresh tokens are enabled" do
+    context "when refresh tokens are enabled" do
       before do
         Doorkeeper.configure do
           orm DOORKEEPER_ORM

data/spec/lib/option_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Doorkeeper, "configuration option DSL" do
+RSpec.describe Doorkeeper::Config::Option do
   class Extension
     def self.configure(&block)
       @config = Config::Builder.new(Config.new, &block).build

data/spec/lib/request/strategy_spec.rb

@@ -2,53 +2,50 @@
 
 require "spec_helper"
 
-module Doorkeeper
-  module Request
-    describe Strategy do
-      let(:server) { double }
-      subject(:strategy) { Strategy.new(server) }
-
-      describe :initialize do
-        it "sets the server attribute" do
-          expect(strategy.server).to eq server
-        end
-      end
-
-      describe :request do
-        it "requires an implementation" do
-          expect { strategy.request }.to raise_exception NotImplementedError
-        end
-      end
+RSpec.describe Doorkeeper::Request::Strategy do
+  subject(:strategy) { described_class.new(server) }
 
-      describe "a sample Strategy subclass" do
-        let(:fake_request) { double }
+  let(:server) { double }
 
-        let(:strategy_class) do
-          subclass = Class.new(Strategy) do
-            class << self
-              attr_accessor :fake_request
-            end
+  describe "#initialize" do
+    it "sets the server attribute" do
+      expect(strategy.server).to eq server
+    end
+  end
 
-            def request
-              self.class.fake_request
-            end
-          end
+  describe "#request" do
+    it "requires an implementation" do
+      expect { strategy.request }.to raise_exception NotImplementedError
+    end
+  end
 
-          subclass.fake_request = fake_request
-          subclass
-        end
+  describe "a sample Strategy subclass" do
+    subject(:strategy) { strategy_class.new(server) }
 
-        subject(:strategy) { strategy_class.new(server) }
+    let(:fake_request) { double }
 
-        it "provides a request implementation" do
-          expect(strategy.request).to eq fake_request
+    let(:strategy_class) do
+      subclass = Class.new(described_class) do
+        class << self
+          attr_accessor :fake_request
         end
 
-        it "authorizes the request" do
-          expect(fake_request).to receive :authorize
-          strategy.authorize
+        def request
+          self.class.fake_request
         end
       end
+
+      subclass.fake_request = fake_request
+      subclass
+    end
+
+    it "provides a request implementation" do
+      expect(strategy.request).to eq fake_request
+    end
+
+    it "authorizes the request" do
+      expect(fake_request).to receive :authorize
+      strategy.authorize
     end
   end
 end

data/spec/lib/secret_storing/base_spec.rb

@@ -2,10 +2,11 @@
 
 require "spec_helper"
 
-describe ::Doorkeeper::SecretStoring::Base do
-  let(:instance) { double("instance", token: "foo") }
+RSpec.describe ::Doorkeeper::SecretStoring::Base do
   subject { described_class }
 
+  let(:instance) { double("instance", token: "foo") }
+
   describe "#transform_secret" do
     it "raises" do
       expect { subject.transform_secret("foo") }.to raise_error(NotImplementedError)

data/spec/lib/secret_storing/bcrypt_spec.rb

@@ -3,8 +3,9 @@
 require "spec_helper"
 require "bcrypt"
 
-describe ::Doorkeeper::SecretStoring::BCrypt do
+RSpec.describe ::Doorkeeper::SecretStoring::BCrypt do
   subject { described_class }
+
   let(:instance) { double("instance", token: "foo") }
 
   describe "#transform_secret" do

data/spec/lib/secret_storing/plain_spec.rb

@@ -2,8 +2,9 @@
 
 require "spec_helper"
 
-describe ::Doorkeeper::SecretStoring::Plain do
+RSpec.describe ::Doorkeeper::SecretStoring::Plain do
   subject { described_class }
+
   let(:instance) { double("instance", token: "foo") }
 
   describe "#transform_secret" do

data/spec/lib/secret_storing/sha256_hash_spec.rb

@@ -2,8 +2,9 @@
 
 require "spec_helper"
 
-describe ::Doorkeeper::SecretStoring::Sha256Hash do
+RSpec.describe ::Doorkeeper::SecretStoring::Sha256Hash do
   subject { described_class }
+
   let(:instance) { double("instance") }
 
   let(:hash_function) do

data/spec/models/doorkeeper/access_grant_spec.rb

@@ -2,11 +2,7 @@
 
 require "spec_helper"
 
-describe Doorkeeper::AccessGrant do
-  let(:resource_owner) { FactoryBot.create(:resource_owner) }
-  let(:client) { FactoryBot.build_stubbed(:application) }
-  let(:clazz) { Doorkeeper::AccessGrant }
-
+RSpec.describe Doorkeeper::AccessGrant do
   subject do
     FactoryBot.build(
       :access_grant,
@@ -16,6 +12,10 @@ describe Doorkeeper::AccessGrant do
     )
   end
 
+  let(:resource_owner) { FactoryBot.create(:resource_owner) }
+  let(:client) { FactoryBot.build_stubbed(:application) }
+  let(:clazz) { described_class }
+
   it { expect(subject).to be_valid }
 
   it_behaves_like "an accessible token"
@@ -31,6 +31,7 @@ describe Doorkeeper::AccessGrant do
                         resource_owner_id: resource_owner.id,
                         resource_owner_type: resource_owner.class.name
     end
+
     include_context "with token hashing enabled"
 
     it "holds a volatile plaintext token when created" do
@@ -143,10 +144,7 @@ describe Doorkeeper::AccessGrant do
       FactoryBot.create :access_grant, default_attributes
 
       described_class.revoke_all_for(application.id, resource_owner)
-
-      described_class.all.each do |token|
-        expect(token).to be_revoked
-      end
+      expect(described_class.all).to all(be_revoked)
     end
 
     it "matches application" do

data/spec/models/doorkeeper/access_token_spec.rb

@@ -27,6 +27,7 @@ RSpec.describe Doorkeeper::AccessToken do
 
     context "with hashing enabled" do
       let(:token) { FactoryBot.create :access_token }
+
       include_context "with token hashing enabled"
 
       it "holds a volatile plaintext token when created" do
@@ -385,14 +386,15 @@ RSpec.describe Doorkeeper::AccessToken do
       end
       let(:access_token1) { FactoryBot.create :access_token, default_attributes }
 
-      context "the second token has the same owner and same app" do
+      context "when the second token has the same owner and same app" do
         let(:access_token2) { FactoryBot.create :access_token, default_attributes }
+
         it "success" do
-          expect(access_token1.same_credential?(access_token2)).to be_truthy
+          expect(access_token1).to be_same_credential(access_token2)
         end
       end
 
-      context "the second token has same owner and different app" do
+      context "when the second token has same owner and different app" do
         let(:other_application) { FactoryBot.create :application }
         let(:access_token2) do
           FactoryBot.create :access_token,
@@ -401,12 +403,12 @@ RSpec.describe Doorkeeper::AccessToken do
                             resource_owner_type: resource_owner.class.name
         end
 
-        it "fail" do
-          expect(access_token1.same_credential?(access_token2)).to be_falsey
+        it "fails" do
+          expect(access_token1).not_to be_same_credential(access_token2)
         end
       end
 
-      context "the second token has different owner and different app" do
+      context "when the second token has different owner and different app" do
         let(:other_application) { FactoryBot.create :application }
         let(:access_token2) do
           FactoryBot.create :access_token,
@@ -414,50 +416,50 @@ RSpec.describe Doorkeeper::AccessToken do
                             resource_owner_id: resource_owner.id + 1
         end
 
-        it "fail" do
-          expect(access_token1.same_credential?(access_token2)).to be_falsey
+        it "fails" do
+          expect(access_token1).not_to be_same_credential(access_token2)
         end
       end
 
-      context "the second token has different owner and same app" do
+      context "when the second token has different owner and same app" do
         let(:access_token2) do
           FactoryBot.create :access_token,
                             application: application,
                             resource_owner_id: resource_owner.id + 1
         end
 
-        it "fail" do
-          expect(access_token1.same_credential?(access_token2)).to be_falsey
+        it "fails" do
+          expect(access_token1).not_to be_same_credential(access_token2)
         end
       end
     end
   end
 
   describe "#acceptable?" do
-    context "a token that is not accessible" do
+    context "when token is not accessible" do
       let(:token) { FactoryBot.create(:access_token, created_at: 6.hours.ago) }
 
-      it "should return false" do
+      it "returns false" do
         expect(token.acceptable?(nil)).to be false
       end
     end
 
-    context "a token that has the incorrect scopes" do
+    context "when token has the incorrect scopes" do
       let(:token) { FactoryBot.create(:access_token) }
 
-      it "should return false" do
+      it "returns false" do
         expect(token.acceptable?(["public"])).to be false
       end
     end
 
-    context "a token is acceptable with the correct scopes" do
+    context "when token is acceptable with the correct scopes" do
       let(:token) do
         token = FactoryBot.create(:access_token)
         token[:scopes] = "public"
         token
       end
 
-      it "should return true" do
+      it "returns true" do
         expect(token.acceptable?(["public"])).to be true
       end
     end
@@ -477,9 +479,7 @@ RSpec.describe Doorkeeper::AccessToken do
     it "revokes all tokens for given application and resource owner" do
       FactoryBot.create :access_token, default_attributes
       described_class.revoke_all_for application.id, resource_owner
-      described_class.all.each do |token|
-        expect(token).to be_revoked
-      end
+      expect(described_class.all).to all(be_revoked)
     end
 
     it "matches application" do
@@ -529,12 +529,6 @@ RSpec.describe Doorkeeper::AccessToken do
       expect(last_token).to eq(token)
     end
 
-    it "accepts resource owner as object" do
-      token = FactoryBot.create :access_token, default_attributes
-      last_token = described_class.matching_token_for(application, resource_owner, scopes)
-      expect(last_token).to eq(token)
-    end
-
     it "accepts nil as resource owner" do
       token = FactoryBot.create :access_token,
                                 default_attributes.merge(resource_owner_id: nil, resource_owner_type: nil)