doorkeeper 1.0.0.rc2 → 1.0.0

data/spec/requests/flows/refresh_token_spec.rb

@@ -22,7 +22,7 @@ feature "Refresh Token Flow" do
       should_have_json 'access_token',  token.token
       should_have_json 'refresh_token', token.refresh_token
 
-      @authorization.reload.should be_revoked
+      expect(@authorization.reload).to be_revoked
 
       post refresh_token_endpoint_url(:client => @client, :refresh_token => token.refresh_token)
 
@@ -30,8 +30,8 @@ feature "Refresh Token Flow" do
       should_have_json 'access_token',  new_token.token
       should_have_json 'refresh_token', new_token.refresh_token
 
-      token.token.should_not         == new_token.token
-      token.refresh_token.should_not == new_token.refresh_token
+      expect(token.token).not_to         eq(new_token.token)
+      expect(token.refresh_token).not_to eq(new_token.refresh_token)
     end
   end
 
@@ -43,14 +43,14 @@ feature "Refresh Token Flow" do
     scenario "client request a token with refresh token" do
       post refresh_token_endpoint_url(:client => @client, :refresh_token => @token.refresh_token)
       should_have_json 'refresh_token', Doorkeeper::AccessToken.last.refresh_token
-      @token.reload.should be_revoked
+      expect(@token.reload).to be_revoked
     end
 
     scenario "client request a token with expired access token" do
       @token.update_column :expires_in, -100
       post refresh_token_endpoint_url(:client => @client, :refresh_token => @token.refresh_token)
       should_have_json 'refresh_token', Doorkeeper::AccessToken.last.refresh_token
-      @token.reload.should be_revoked
+      expect(@token.reload).to be_revoked
     end
 
     # TODO: verify proper error code for this (previously was invalid_grant)
@@ -82,7 +82,7 @@ feature "Refresh Token Flow" do
       post password_token_endpoint_url(:client => @client, :resource_owner => @resource_owner)
       post refresh_token_endpoint_url(:client => @client, :refresh_token => @token.refresh_token)
       should_have_json 'refresh_token', Doorkeeper::AccessToken.last.refresh_token
-      @token.reload.should be_revoked
+      expect(@token.reload).to be_revoked
     end
   end
 end

data/spec/requests/protected_resources/private_api_spec.rb

@@ -10,7 +10,7 @@ feature 'Private API' do
   scenario 'client requests protected resource with valid token' do
     with_access_token_header @token.token
     visit '/full_protected_resources'
-    page.body.should have_content("index")
+    expect(page.body).to have_content("index")
   end
 
   scenario 'client requests protected resource with disabled header authentication' do
@@ -37,7 +37,7 @@ feature 'Private API' do
     @token.update_column :expires_in, nil # never expires
     with_access_token_header @token.token
     visit '/full_protected_resources'
-    page.body.should have_content("index")
+    expect(page.body).to have_content("index")
   end
 
   scenario 'access token with no scopes' do
@@ -53,6 +53,6 @@ feature 'Private API' do
     @token.update_column :scopes, 'admin'
     with_access_token_header @token.token
     visit '/full_protected_resources/1.json'
-    page.body.should have_content("show")
+    expect(page.body).to have_content("show")
   end
 end

data/spec/routing/custom_controller_routes_spec.rb

@@ -2,67 +2,67 @@ require 'spec_helper_integration'
 
 describe 'Custom controller for routes' do
   it 'GET /space/scope/authorize routes to custom authorizations controller' do
-    get('/inner_space/scope/authorize').should route_to('custom_authorizations#new')
+    expect(get('/inner_space/scope/authorize')).to route_to('custom_authorizations#new')
   end
 
   it 'POST /space/scope/authorize routes to custom authorizations controller' do
-    post('/inner_space/scope/authorize').should route_to('custom_authorizations#create')
+    expect(post('/inner_space/scope/authorize')).to route_to('custom_authorizations#create')
   end
 
   it 'DELETE /space/scope/authorize routes to custom authorizations controller' do
-    delete('/inner_space/scope/authorize').should route_to('custom_authorizations#destroy')
+    expect(delete('/inner_space/scope/authorize')).to route_to('custom_authorizations#destroy')
   end
 
   it 'POST /space/scope/token routes to tokens controller' do
-    post('/inner_space/scope/token').should route_to('custom_authorizations#create')
+    expect(post('/inner_space/scope/token')).to route_to('custom_authorizations#create')
   end
 
   it 'GET /space/scope/applications routes to applications controller' do
-    get('/inner_space/scope/applications').should route_to('custom_authorizations#index')
+    expect(get('/inner_space/scope/applications')).to route_to('custom_authorizations#index')
   end
 
   it 'GET /space/scope/token/info routes to the token_info controller' do
-    get('/inner_space/scope/token/info').should route_to('custom_authorizations#show')
+    expect(get('/inner_space/scope/token/info')).to route_to('custom_authorizations#show')
   end
 
   it 'GET /space/oauth/authorize routes to custom authorizations controller' do
-    get('/space/oauth/authorize').should route_to('custom_authorizations#new')
+    expect(get('/space/oauth/authorize')).to route_to('custom_authorizations#new')
   end
 
   it 'POST /space/oauth/authorize routes to custom authorizations controller' do
-    post('/space/oauth/authorize').should route_to('custom_authorizations#create')
+    expect(post('/space/oauth/authorize')).to route_to('custom_authorizations#create')
   end
 
   it 'DELETE /space/oauth/authorize routes to custom authorizations controller' do
-    delete('/space/oauth/authorize').should route_to('custom_authorizations#destroy')
+    expect(delete('/space/oauth/authorize')).to route_to('custom_authorizations#destroy')
   end
 
   it 'POST /space/oauth/token routes to tokens controller' do
-    post('/space/oauth/token').should route_to('custom_authorizations#create')
+    expect(post('/space/oauth/token')).to route_to('custom_authorizations#create')
   end
 
   it 'GET /space/oauth/applications routes to applications controller' do
-    get('/space/oauth/applications').should route_to('custom_authorizations#index')
+    expect(get('/space/oauth/applications')).to route_to('custom_authorizations#index')
   end
 
   it 'GET /space/oauth/token/info routes to the token_info controller' do
-    get('/space/oauth/token/info').should route_to('custom_authorizations#show')
+    expect(get('/space/oauth/token/info')).to route_to('custom_authorizations#show')
   end
 
   it 'POST /outer_space/oauth/token is not be routable' do
-    post('/outer_space/oauth/token').should_not be_routable
+    expect(post('/outer_space/oauth/token')).not_to be_routable
   end
 
   it 'GET /outer_space/oauth/authorize routes to custom authorizations controller' do
-    get('/outer_space/oauth/authorize').should be_routable
+    expect(get('/outer_space/oauth/authorize')).to be_routable
   end
 
   it 'GET /outer_space/oauth/applications is not routable' do
-    get('/outer_space/oauth/applications').should_not be_routable
+    expect(get('/outer_space/oauth/applications')).not_to be_routable
   end
 
   it 'GET /outer_space/oauth/token_info is not routable' do
-    get('/outer_space/oauth/token/info').should_not be_routable
+    expect(get('/outer_space/oauth/token/info')).not_to be_routable
   end
 
 end

data/spec/routing/default_routes_spec.rb

@@ -2,31 +2,31 @@ require 'spec_helper_integration'
 
 describe 'Default routes' do
   it 'GET /oauth/authorize routes to authorizations controller' do
-    get('/oauth/authorize').should route_to('doorkeeper/authorizations#new')
+    expect(get('/oauth/authorize')).to route_to('doorkeeper/authorizations#new')
   end
 
   it 'POST /oauth/authorize routes to authorizations controller' do
-    post('/oauth/authorize').should route_to('doorkeeper/authorizations#create')
+    expect(post('/oauth/authorize')).to route_to('doorkeeper/authorizations#create')
   end
 
   it 'DELETE /oauth/authorize routes to authorizations controller' do
-    delete('/oauth/authorize').should route_to('doorkeeper/authorizations#destroy')
+    expect(delete('/oauth/authorize')).to route_to('doorkeeper/authorizations#destroy')
   end
 
   it 'POST /oauth/token routes to tokens controller' do
-    post('/oauth/token').should route_to('doorkeeper/tokens#create')
+    expect(post('/oauth/token')).to route_to('doorkeeper/tokens#create')
   end
 
   it 'GET /oauth/applications routes to applications controller' do
-    get('/oauth/applications').should route_to('doorkeeper/applications#index')
+    expect(get('/oauth/applications')).to route_to('doorkeeper/applications#index')
   end
 
   it 'GET /oauth/authorized_applications routes to authorized applications controller' do
-    get('/oauth/authorized_applications').should route_to('doorkeeper/authorized_applications#index')
+    expect(get('/oauth/authorized_applications')).to route_to('doorkeeper/authorized_applications#index')
   end
 
   it 'GET /oauth/token/info route to authorzed tokeninfo controller' do
-    get('/oauth/token/info').should route_to('doorkeeper/token_info#show')    
+    expect(get('/oauth/token/info')).to route_to('doorkeeper/token_info#show')    
   end
 
 end

data/spec/routing/scoped_routes_spec.rb

@@ -2,31 +2,31 @@ require 'spec_helper_integration'
 
 describe 'Scoped routes' do
   it 'GET /scope/authorize routes to authorizations controller' do
-    get('/scope/authorize').should route_to('doorkeeper/authorizations#new')
+    expect(get('/scope/authorize')).to route_to('doorkeeper/authorizations#new')
   end
 
   it 'POST /scope/authorize routes to authorizations controller' do
-    post('/scope/authorize').should route_to('doorkeeper/authorizations#create')
+    expect(post('/scope/authorize')).to route_to('doorkeeper/authorizations#create')
   end
 
   it 'DELETE /scope/authorize routes to authorizations controller' do
-    delete('/scope/authorize').should route_to('doorkeeper/authorizations#destroy')
+    expect(delete('/scope/authorize')).to route_to('doorkeeper/authorizations#destroy')
   end
 
   it 'POST /scope/token routes to tokens controller' do
-    post('/scope/token').should route_to('doorkeeper/tokens#create')
+    expect(post('/scope/token')).to route_to('doorkeeper/tokens#create')
   end
 
   it 'GET /scope/applications routes to applications controller' do
-    get('/scope/applications').should route_to('doorkeeper/applications#index')
+    expect(get('/scope/applications')).to route_to('doorkeeper/applications#index')
   end
 
   it 'GET /scope/authorized_applications routes to authorized applications controller' do
-    get('/scope/authorized_applications').should route_to('doorkeeper/authorized_applications#index')
+    expect(get('/scope/authorized_applications')).to route_to('doorkeeper/authorized_applications#index')
   end
 
   it 'GET /scope/token/info route to authorzed tokeninfo controller' do
-    get('/scope/token/info').should route_to('doorkeeper/token_info#show')
+    expect(get('/scope/token/info')).to route_to('doorkeeper/token_info#show')
   end
 
 end

data/spec/support/helpers/authorization_request_helper.rb

@@ -17,15 +17,15 @@ module AuthorizationRequestHelper
   end
 
   def client_should_be_authorized(client)
-    client.should have(1).access_grants
+    expect(client).to have(1).access_grants
   end
 
   def client_should_not_be_authorized(client)
-    client.should have(0).access_grants
+    expect(client.size).to eq(0)
   end
 
   def i_should_be_on_client_callback(client)
-    client.redirect_uri.should == "#{current_uri.scheme}://#{current_uri.host}#{current_uri.path}"
+    expect(client.redirect_uri).to eq("#{current_uri.scheme}://#{current_uri.host}#{current_uri.path}")
   end
 end
 

data/spec/support/helpers/model_helper.rb

@@ -13,32 +13,32 @@ module ModelHelper
 
   def access_grant_should_exist_for(client, resource_owner)
     grant = Doorkeeper::AccessGrant.first
-    grant.application.should == client
+    expect(grant.application).to eq(client)
     grant.resource_owner_id  == resource_owner.id
   end
 
   def access_token_should_exist_for(client, resource_owner)
     grant = Doorkeeper::AccessToken.first
-    grant.application.should == client
+    expect(grant.application).to eq(client)
     grant.resource_owner_id  == resource_owner.id
   end
 
   def access_grant_should_not_exist
-    Doorkeeper::AccessGrant.all.should be_empty
+    expect(Doorkeeper::AccessGrant.all).to be_empty
   end
 
   def access_token_should_not_exist
-    Doorkeeper::AccessToken.all.should be_empty
+    expect(Doorkeeper::AccessToken.all).to be_empty
   end
 
   def access_grant_should_have_scopes(*args)
     grant = Doorkeeper::AccessGrant.first
-    grant.scopes.should == Doorkeeper::OAuth::Scopes.from_array(args)
+    expect(grant.scopes).to eq(Doorkeeper::OAuth::Scopes.from_array(args))
   end
 
   def access_token_should_have_scopes(*args)
     grant = Doorkeeper::AccessToken.first
-    grant.scopes.should == Doorkeeper::OAuth::Scopes.from_array(args)
+    expect(grant.scopes).to eq(Doorkeeper::OAuth::Scopes.from_array(args))
   end
 end
 

data/spec/support/helpers/request_spec_helper.rb

@@ -1,22 +1,22 @@
 module RequestSpecHelper
   def i_should_see(content)
-    page.should have_content(content)
+    expect(page).to have_content(content)
   end
 
   def i_should_not_see(content)
-    page.should have_no_content(content)
+    expect(page).to have_no_content(content)
   end
 
   def i_should_be_on(path)
-    current_path.should eq(path)
+    expect(current_path).to eq(path)
   end
 
   def url_should_have_param(param, value)
-    current_params[param].should == value
+    expect(current_params[param]).to eq(value)
   end
 
   def url_should_not_have_param(param)
-    current_params.should_not have_key(param)
+    expect(current_params).not_to have_key(param)
   end
 
   def current_params
@@ -28,7 +28,7 @@ module RequestSpecHelper
   end
 
   def should_have_header(header, value)
-    headers[header].should == value
+    expect(headers[header]).to eq(value)
   end
 
   def with_access_token_header(token)
@@ -44,11 +44,11 @@ module RequestSpecHelper
   end
 
   def should_have_json(key, value)
-    JSON.parse(response.body).fetch(key).should == value
+    expect(JSON.parse(response.body).fetch(key)).to eq(value)
   end
 
   def should_not_have_json(key)
-    JSON.parse(response.body).should_not have_key(key)
+    expect(JSON.parse(response.body)).not_to have_key(key)
   end
 
   def sign_in
@@ -65,7 +65,7 @@ module RequestSpecHelper
   end
 
   def response_status_should_be(status)
-    page.driver.response.status.to_i.should == status
+    expect(page.driver.response.status.to_i).to eq(status)
   end
 end
 

data/spec/support/shared/controllers_shared_context.rb

@@ -8,7 +8,7 @@ shared_context "valid token", :token => :valid do
   end
 
   before :each do
-    Doorkeeper::AccessToken.stub(:authenticate).with(token_string).and_return(token)
+    allow(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string).and_return(token)
   end
 end
 
@@ -22,20 +22,20 @@ shared_context "invalid token", :token => :invalid do
   end
 
   before :each do
-    Doorkeeper::AccessToken.stub(:authenticate).with(token_string).and_return(token)
+    allow(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string).and_return(token)
   end
 end
 
 shared_context "authenticated resource owner" do
   before do
     user = double(:resource, :id => 1)
-    Doorkeeper.configuration.stub(:authenticate_resource_owner) { proc do user end }
+    allow(Doorkeeper.configuration).to receive(:authenticate_resource_owner) { proc do user end }
   end
 end
 
 shared_context "not authenticated resource owner" do
   before do
-    Doorkeeper.configuration.stub(:authenticate_resource_owner) { proc do redirect_to '/' end }
+    allow(Doorkeeper.configuration).to receive(:authenticate_resource_owner) { proc do redirect_to '/' end }
   end
 end
 
@@ -45,7 +45,7 @@ shared_context "valid authorization request" do
   end
 
   before do
-    controller.stub(:authorization) { authorization }
+    allow(controller).to receive(:authorization) { authorization }
   end
 end
 
@@ -55,6 +55,6 @@ shared_context "invalid authorization request" do
   end
 
   before do
-    controller.stub(:authorization) { authorization }
+    allow(controller).to receive(:authorization) { authorization }
   end
 end

data/spec/support/shared/models_shared_examples.rb

@@ -1,12 +1,12 @@
 shared_examples "an accessible token" do
   describe :accessible? do
     it "is accessible if token is not expired" do
-      subject.stub :expired? => false
+      allow(subject).to receive(:expired?).and_return(false)
       should be_accessible
     end
 
     it "is not accessible if token is expired" do
-      subject.stub :expired? => true
+      allow(subject).to receive(:expired?).and_return(true)
       should_not be_accessible
     end
   end
@@ -17,12 +17,12 @@ shared_examples "a revocable token" do
     before { subject.save! }
 
     it "is accessible if token is not revoked" do
-      subject.should be_accessible
+      expect(subject).to be_accessible
     end
 
     it "is not accessible if token is revoked" do
       subject.revoke
-      subject.should_not be_accessible
+      expect(subject).not_to be_accessible
     end
   end
 end
@@ -33,7 +33,7 @@ shared_examples "an unique token" do
       tokens = []
       3.times do
         token = FactoryGirl.create(factory_name).token
-        tokens.should_not include(token)
+        expect(tokens).not_to include(token)
       end
     end
 
@@ -45,7 +45,7 @@ shared_examples "an unique token" do
       token1 = FactoryGirl.create factory_name
       token2 = FactoryGirl.create factory_name
       token2.token = token1.token
-      token2.should_not be_valid
+      expect(token2).not_to be_valid
     end
 
     it 'expects database to throw an error when tokens are the same' do