doorkeeper 1.0.0.rc2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae8cc51afce1ad54ec55111bb85b4600ca71cb56
-  data.tar.gz: b7428fa37924af29c5966314c80bcc128da798f4
+  metadata.gz: d6d9a384a7eea2de2b4c25ea45fa6143aa23f8e6
+  data.tar.gz: 6401bda0dec405b1acdf9fd0cd4db42ada6f7f97
 SHA512:
-  metadata.gz: 1134ce61d519eb471479aa670f14ff152628a899a645d4538aea709a23d9a0214558539ff10b66648a206ffc180d745c822a8603800389b3a1b62b8c1719721a
-  data.tar.gz: 3224e98b3c233acd314699d83aa722f4cf27540e53fdbed9f64e98fff041d55da3f0678496c3bc921a12621e0c709d63cce6e38308dbb008ba9cae0615e70c67
+  metadata.gz: d61715593d0cd03aa6c7f32c62fcbdb3d924f410c5635a8cc97d6510fb09b48b508417fe70f9dccbcf1d0d20be8c12c86a37085b5a448bbb0c71203f015640cb
+  data.tar.gz: 9f10eb154a27dbcc558672f8add080aaa79380a3fe4ec807ef28c33f51679c84f5cc7be7debe019e0f9d21d70ed88656cacbed47e2019943cc72229d01c54bb6

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 1.0.0.rc2
+## 1.0.0
 
 - bug (spec)
   - [#228] token response `expires_in` value is now in seconds, relative to
@@ -25,6 +25,7 @@
   - Removes jQuery dependency [fixes #300] [PR #312 is related]
   - [#294] Client uid and secret will be generated only if not present.
   - [#316] Test warnings addressed.
+  - [#338] Rspec 3 syntax.
 
 ## 0.7.4
 

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = '1.0.0.rc2'
+  VERSION = '1.0.0'
 end

data/spec/controllers/applications_controller_spec.rb

@@ -4,7 +4,7 @@ module Doorkeeper
   describe ApplicationsController do
     context "when admin is not authenticated" do
       before do
-        Doorkeeper.configuration.stub(:authenticate_admin => proc do
+        allow(Doorkeeper.configuration).to receive(:authenticate_admin).and_return(proc do
           redirect_to main_app.root_url
         end)
       end
@@ -25,7 +25,7 @@ module Doorkeeper
 
     context "when admin is authenticated" do
       before do
-        Doorkeeper.configuration.stub(authenticate_admin: ->(arg) { true })
+        allow(Doorkeeper.configuration).to receive(:authenticate_admin).and_return(->(arg) { true })
       end
 
       it "creates application" do
@@ -43,7 +43,7 @@ module Doorkeeper
           uid: '1A2B3C4D',
           secret: '1A2B3C4D' }
 
-        application.reload.uid.should_not eq '1A2B3C4D'
+        expect(application.reload.uid).not_to eq '1A2B3C4D'
       end
 
       it "updates application" do
@@ -51,7 +51,7 @@ module Doorkeeper
         put :update, id: application.id, application: {
           name: 'Example',
           redirect_uri: 'http://example.com' }
-        application.reload.name.should eq 'Example'
+        expect(application.reload.name).to eq 'Example'
       end
     end
 

data/spec/controllers/authorizations_controller_spec.rb

@@ -16,7 +16,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
   let(:user)   { User.create!(:name => "Joe", :password => "sekret") }
 
   before do
-    controller.stub :current_resource_owner => user
+    allow(controller).to receive(:current_resource_owner).and_return(user)
   end
 
   describe "POST #create" do
@@ -100,35 +100,35 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
 
   describe "GET #new with skip_authorization true" do
     before do
-      Doorkeeper.configuration.stub(:skip_authorization => proc do
+      allow(Doorkeeper.configuration).to receive(:skip_authorization).and_return(proc do
           true
         end)
       get :new, :client_id => client.uid, :response_type => "token", :redirect_uri => client.redirect_uri
     end
 
     it "should redirect immediately" do
-      response.should be_redirect
-      response.location.should =~ %r[^#{client.redirect_uri}]
+      expect(response).to be_redirect
+      expect(response.location).to match(%r[^#{client.redirect_uri}])
     end
 
     it "should issue a token" do
-      Doorkeeper::AccessToken.count.should be 1
+      expect(Doorkeeper::AccessToken.count).to be 1
     end
 
     it "includes token type in fragment" do
-      fragments("token_type").should == "bearer"
+      expect(fragments("token_type")).to eq("bearer")
     end
 
     it "includes token expiration in fragment" do
-      fragments("expires_in").to_i.should == 2.hours.to_i
+      expect(fragments("expires_in").to_i).to eq(2.hours.to_i)
     end
 
     it "issues the token for the current client" do
-      Doorkeeper::AccessToken.first.application_id.should == client.id
+      expect(Doorkeeper::AccessToken.first.application_id).to eq(client.id)
     end
 
     it "issues the token for the current resource owner" do
-      Doorkeeper::AccessToken.first.resource_owner_id.should == user.id
+      expect(Doorkeeper::AccessToken.first.resource_owner_id).to eq(user.id)
     end
   end
 

data/spec/controllers/protected_resources_controller_spec.rb

@@ -79,29 +79,29 @@ describe "Doorkeeper_for helper" do
     let(:token_string) { "1A2BC3" }
 
     it "access_token param" do
-      Doorkeeper::AccessToken.should_receive(:authenticate).with(token_string)
+      expect(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string)
       get :index, :access_token => token_string
     end
 
     it "bearer_token param" do
-      Doorkeeper::AccessToken.should_receive(:authenticate).with(token_string)
+      expect(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string)
       get :index, :bearer_token => token_string
     end
 
     it "Authorization header" do
-      Doorkeeper::AccessToken.should_receive(:authenticate).with(token_string)
+      expect(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string)
       request.env["HTTP_AUTHORIZATION"] = "Bearer #{token_string}"
       get :index
     end
 
     it "different kind of Authorization header" do
-      Doorkeeper::AccessToken.should_not_receive(:authenticate)
+      expect(Doorkeeper::AccessToken).not_to receive(:authenticate)
       request.env["HTTP_AUTHORIZATION"] = "Basic #{Base64.encode64("foo:bar")}"
       get :index
     end
 
     it "doesn't change Authorization header value" do
-      Doorkeeper::AccessToken.should_receive(:authenticate).exactly(2).times
+      expect(Doorkeeper::AccessToken).to receive(:authenticate).exactly(2).times
       request.env["HTTP_AUTHORIZATION"] = "Bearer #{token_string}"
       get :index
       controller.send(:remove_instance_variable, :@token)
@@ -172,14 +172,14 @@ describe "Doorkeeper_for helper" do
 
     it "allows if the token has particular scopes" do
       token = double(Doorkeeper::AccessToken, :accessible? => true, :scopes => ['write', 'public'])
-      Doorkeeper::AccessToken.should_receive(:authenticate).with(token_string).and_return(token)
+      expect(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string).and_return(token)
       get :index, :access_token => token_string
       expect(response).to be_success
     end
 
     it "does not allow if the token does not include given scope" do
       token = double(Doorkeeper::AccessToken, :accessible? => true, :scopes => ['public'], :revoked? => false, :expired? => false)
-      Doorkeeper::AccessToken.should_receive(:authenticate).with(token_string).and_return(token)
+      expect(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string).and_return(token)
       get :index, :access_token => token_string
       expect(response.status).to eq 401
       expect(response.header["WWW-Authenticate"]).to match(/^Bearer/)
@@ -195,7 +195,7 @@ describe "Doorkeeper_for helper" do
 
     context "with a JSON custom render", :token => :invalid do
       before do
-        controller.should_receive(:doorkeeper_unauthorized_render_options).and_return({ :json => ActiveSupport::JSON.encode({ :error => "Unauthorized" })  } )
+        expect(controller).to receive(:doorkeeper_unauthorized_render_options).and_return({ :json => ActiveSupport::JSON.encode({ :error => "Unauthorized" })  } )
       end
 
       it "it renders a custom JSON response", :token => :invalid do
@@ -212,7 +212,7 @@ describe "Doorkeeper_for helper" do
 
     context "with a text custom render", :token => :invalid do
       before do
-        controller.should_receive(:doorkeeper_unauthorized_render_options).and_return({ :text => "Unauthorized"  } )
+        expect(controller).to receive(:doorkeeper_unauthorized_render_options).and_return({ :text => "Unauthorized"  } )
       end
 
       it "it renders a custom JSON response", :token => :invalid do
@@ -220,7 +220,7 @@ describe "Doorkeeper_for helper" do
         expect(response.status).to eq 401
         expect(response.content_type).to eq('text/html')
         expect(response.header["WWW-Authenticate"]).to match(/^Bearer/)
-        expect(response.body.should).to eq('Unauthorized')
+        expect(response.body).to eq('Unauthorized')
       end
     end
   end

data/spec/controllers/token_info_controller_spec.rb

@@ -7,7 +7,7 @@ describe Doorkeeper::TokenInfoController do
     let(:doorkeeper_token) { FactoryGirl.create(:access_token) }
 
     before(:each) do
-      controller.stub(:doorkeeper_token) { doorkeeper_token }
+      allow(controller).to receive(:doorkeeper_token) { doorkeeper_token }
     end
 
     def do_get
@@ -29,7 +29,7 @@ describe Doorkeeper::TokenInfoController do
 
     describe "invalid token response" do
       before(:each) do
-        controller.stub(:doorkeeper_token => nil)
+        allow(controller).to receive(:doorkeeper_token).and_return(nil)
       end
       it "responds with 401 when doorkeeper_token is not valid" do
         do_get
@@ -38,8 +38,8 @@ describe Doorkeeper::TokenInfoController do
       end
 
       it "responds with 401 when doorkeeper_token is invalid, expired or revoked" do
-        controller.stub(:doorkeeper_token => doorkeeper_token)
-        doorkeeper_token.stub(:accessible? => false)
+        allow(controller).to receive(:doorkeeper_token).and_return(doorkeeper_token)
+        allow(doorkeeper_token).to receive(:accessible?).and_return(false)
         do_get
         expect(response.status).to eq 401
         expect(response.headers["WWW-Authenticate"]).to match(/^Bearer/)

data/spec/controllers/tokens_controller_spec.rb

@@ -7,12 +7,12 @@ describe Doorkeeper::TokensController do
     end
 
     before do
-      controller.stub(:token) { token }
+      allow(controller).to receive(:token) { token }
     end
 
     it "returns the authorization" do
       pending 'verify need of these specs'
-      token.should_receive(:authorization)
+      expect(token).to receive(:authorization)
       post :create
     end
   end
@@ -23,12 +23,12 @@ describe Doorkeeper::TokensController do
     end
 
     before do
-      controller.stub(:token) { token }
+      allow(controller).to receive(:token) { token }
     end
 
     it "returns the error response" do
       pending 'verify need of these specs'
-      token.stub(:error_response => double(:to_json => [], :status => :unauthorized))
+      allow(token).to receive(:error_response).and_return(double(:to_json => [], :status => :unauthorized))
       post :create
       expect(response.status).to eq 401
       expect(response.headers["WWW-Authenticate"]).to match(/Bearer/)

data/spec/lib/config_spec.rb

@@ -10,7 +10,7 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         resource_owner_authenticator &block
       end
-      subject.authenticate_resource_owner.should == block
+      expect(subject.authenticate_resource_owner).to eq(block)
     end
   end
 
@@ -21,13 +21,13 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         admin_authenticator &block
       end
-      subject.authenticate_admin.should == block
+      expect(subject.authenticate_admin).to eq(block)
     end
   end
 
   describe "access_token_expires_in" do
     it "has 2 hours by default" do
-      subject.access_token_expires_in.should == 2.hours
+      expect(subject.access_token_expires_in).to eq(2.hours)
     end
 
     it "can change the value" do
@@ -35,7 +35,7 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         access_token_expires_in 4.hours
       end
-      subject.access_token_expires_in.should == 4.hours
+      expect(subject.access_token_expires_in).to eq(4.hours)
     end
 
     it "can be set to nil" do
@@ -43,7 +43,7 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         access_token_expires_in nil
       end
-      subject.access_token_expires_in.should be_nil
+      expect(subject.access_token_expires_in).to be_nil
     end
   end
 
@@ -53,7 +53,7 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         default_scopes :public
       }
-      subject.default_scopes.should include('public')
+      expect(subject.default_scopes).to include('public')
     end
 
     it 'has optional scopes' do
@@ -61,7 +61,7 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         optional_scopes :write, :update
       }
-      subject.optional_scopes.should include('write', 'update')
+      expect(subject.optional_scopes).to include('write', 'update')
     end
 
     it 'has all scopes' do
@@ -70,13 +70,13 @@ describe Doorkeeper, "configuration" do
         default_scopes  :normal
         optional_scopes :admin
       end
-      subject.scopes.should include('normal', 'admin')
+      expect(subject.scopes).to include('normal', 'admin')
     end
   end
 
   describe "use_refresh_token" do
     it "is false by default" do
-      subject.refresh_token_enabled?.should be_false
+      expect(subject.refresh_token_enabled?).to be_false
     end
 
     it "can change the value" do
@@ -84,13 +84,13 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         use_refresh_token
       }
-      subject.refresh_token_enabled?.should be_true
+      expect(subject.refresh_token_enabled?).to be_true
     end
   end
 
   describe 'client_credentials' do
     it 'has defaults order' do
-      subject.client_credentials_methods.should == [:from_basic, :from_params]
+      expect(subject.client_credentials_methods).to eq([:from_basic, :from_params])
     end
 
     it "can change the value" do
@@ -98,13 +98,13 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         client_credentials :from_digest, :from_params
       }
-      subject.client_credentials_methods.should == [:from_digest, :from_params]
+      expect(subject.client_credentials_methods).to eq([:from_digest, :from_params])
     end
   end
 
   describe 'access_token_credentials' do
     it 'has defaults order' do
-      subject.access_token_methods.should == [:from_bearer_authorization, :from_access_token_param, :from_bearer_param]
+      expect(subject.access_token_methods).to eq([:from_bearer_authorization, :from_access_token_param, :from_bearer_param])
     end
 
     it "can change the value" do
@@ -112,13 +112,13 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         access_token_methods :from_access_token_param, :from_bearer_param
       }
-      subject.access_token_methods.should == [:from_access_token_param, :from_bearer_param]
+      expect(subject.access_token_methods).to eq([:from_access_token_param, :from_bearer_param])
     end
   end
 
   describe "enable_application_owner" do
     it "is disabled by default" do
-      Doorkeeper.configuration.enable_application_owner?.should_not be_true
+      expect(Doorkeeper.configuration.enable_application_owner?).not_to be_true
     end
 
     context "when enabled without confirmation" do
@@ -129,10 +129,10 @@ describe Doorkeeper, "configuration" do
         end
       end
       it "adds support for application owner" do
-        Doorkeeper::Application.new.should respond_to :owner
+        expect(Doorkeeper::Application.new).to respond_to :owner
       end
       it "Doorkeeper.configuration.confirm_application_owner? returns false" do
-        Doorkeeper.configuration.confirm_application_owner?.should_not be_true
+        expect(Doorkeeper.configuration.confirm_application_owner?).not_to be_true
       end
     end
 
@@ -144,10 +144,10 @@ describe Doorkeeper, "configuration" do
         end
       end
       it "adds support for application owner" do
-        Doorkeeper::Application.new.should respond_to :owner
+        expect(Doorkeeper::Application.new).to respond_to :owner
       end
       it "Doorkeeper.configuration.confirm_application_owner? returns true" do
-        Doorkeeper.configuration.confirm_application_owner?.should be_true
+        expect(Doorkeeper.configuration.confirm_application_owner?).to be_true
       end
     end
 
@@ -155,7 +155,7 @@ describe Doorkeeper, "configuration" do
 
   describe "realm" do
     it "is \"Doorkeeper\" by default" do
-      Doorkeeper.configuration.realm.should == "Doorkeeper"
+      expect(Doorkeeper.configuration.realm).to eq("Doorkeeper")
     end
 
     it "can change the value" do
@@ -163,7 +163,7 @@ describe Doorkeeper, "configuration" do
         orm DOORKEEPER_ORM
         realm "Example"
       }
-      subject.realm.should == "Example"
+      expect(subject.realm).to eq("Example")
     end
   end
 

data/spec/lib/models/expirable_spec.rb

@@ -11,40 +11,40 @@ describe 'Expirable' do
   end
 
   before do
-    subject.stub :created_at => 1.minute.ago
+    allow(subject).to receive(:created_at).and_return(1.minute.ago)
   end
 
   describe :expired? do
     it "is not expired if time has not passed" do
-      subject.stub :expires_in => 2.minutes
-      subject.should_not be_expired
+      allow(subject).to receive(:expires_in).and_return(2.minutes)
+      expect(subject).not_to be_expired
     end
 
     it "is expired if time has passed" do
-      subject.stub :expires_in => 10.seconds
-      subject.should be_expired
+      allow(subject).to receive(:expires_in).and_return(10.seconds)
+      expect(subject).to be_expired
     end
 
     it "is not expired if expires_in is not set" do
-      subject.stub :expires_in => nil
-      subject.should_not be_expired
+      allow(subject).to receive(:expires_in).and_return(nil)
+      expect(subject).not_to be_expired
     end
   end
 
   describe :expires_in_seconds do
     it "should return the amount of time remaining until the token is expired" do
-      subject.stub :expires_in => 2.minutes
-      subject.expires_in_seconds.should == 60 
+      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
-      subject.stub :expires_in => 30.seconds
-      subject.expires_in_seconds.should == 0 
+      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
-      subject.stub :expires_in => nil
-      subject.expires_in_seconds.should be_nil
+      allow(subject).to receive(:expires_in).and_return(nil)
+      expect(subject.expires_in_seconds).to be_nil
     end
     
   end