doorkeeper 2.1.4 → 2.2.0

data/spec/requests/protected_resources/metal_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper_integration'
 
-feature 'ActionController::Metal API' do
-  background do
+describe 'ActionController::Metal API' do
+  before do
     @client   = FactoryGirl.create(:application)
     @resource = User.create!(name: 'Joe', password: 'sekret')
     @token    = client_is_authorized(@client, @resource)
   end
 
-  scenario 'client requests protected resource with valid token' do
+  it 'client requests protected resource with valid token' do
     get "/metal.json?access_token=#{@token.token}"
     should_have_json 'ok', true
   end

data/spec/requests/protected_resources/private_api_spec.rb

@@ -40,6 +40,17 @@ feature 'Private API' do
     expect(page.body).to have_content('index')
   end
 
+  scenario 'access token with no default scopes' do
+    Doorkeeper.configuration.instance_eval {
+      @default_scopes = Doorkeeper::OAuth::Scopes.from_array([:public])
+      @scopes = default_scopes + optional_scopes
+    }
+    @token.update_attribute :scopes, 'dummy'
+    with_access_token_header @token.token
+    visit '/full_protected_resources'
+    response_status_should_be 403
+  end
+
   scenario 'access token with no allowed scopes' do
     @token.update_attribute :scopes, nil
     with_access_token_header @token.token

data/spec/routing/custom_controller_routes_spec.rb

@@ -42,7 +42,7 @@ describe 'Custom controller for routes' do
   end
 
   it 'POST /space/oauth/revoke routes to tokens controller' do
-    post('/space/oauth/revoke').should route_to('custom_authorizations#revoke')
+    expect(post('/space/oauth/revoke')).to route_to('custom_authorizations#revoke')
   end
 
   it 'GET /space/oauth/applications routes to applications controller' do
@@ -68,5 +68,4 @@ describe 'Custom controller for routes' do
   it 'GET /outer_space/oauth/token_info is not routable' do
     expect(get('/outer_space/oauth/token/info')).not_to be_routable
   end
-
 end

data/spec/routing/default_routes_spec.rb

@@ -18,7 +18,7 @@ describe 'Default routes' do
   end
 
   it 'POST /oauth/revoke routes to tokens controller' do
-    post('/oauth/revoke').should route_to('doorkeeper/tokens#revoke')
+    expect(post('/oauth/revoke')).to route_to('doorkeeper/tokens#revoke')
   end
 
   it 'GET /oauth/applications routes to applications controller' do
@@ -32,5 +32,4 @@ describe 'Default routes' do
   it 'GET /oauth/token/info route to authorzed tokeninfo controller' do
     expect(get('/oauth/token/info')).to route_to('doorkeeper/token_info#show')
   end
-
 end

data/spec/routing/scoped_routes_spec.rb

@@ -28,5 +28,4 @@ describe 'Scoped routes' do
   it 'GET /scope/token/info route to authorzed tokeninfo controller' do
     expect(get('/scope/token/info')).to route_to('doorkeeper/token_info#show')
   end
-
 end

data/spec/spec_helper_integration.rb

@@ -11,10 +11,10 @@ require 'capybara/rspec'
 require 'rspec/active_model/mocks'
 require 'dummy/config/environment'
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'generator_spec/test_case'
 require 'timecop'
 require 'database_cleaner'
+require 'pry'
 
 Rails.logger.info "====> Doorkeeper.orm = #{Doorkeeper.configuration.orm.inspect}"
 if Doorkeeper.configuration.orm == :active_record
@@ -40,6 +40,8 @@ RSpec.configure do |config|
 
   config.infer_base_class_for_anonymous_controllers = false
 
+  config.include RSpec::Rails::RequestExampleGroup, type: :request
+
   config.before do
     DatabaseCleaner.start
     Doorkeeper.configure { orm DOORKEEPER_ORM }

data/spec/support/helpers/access_token_request_helper.rb

@@ -8,4 +8,4 @@ module AccessTokenRequestHelper
   end
 end
 
-RSpec.configuration.send :include, AccessTokenRequestHelper, type: :request
+RSpec.configuration.send :include, AccessTokenRequestHelper

data/spec/support/helpers/authorization_request_helper.rb

@@ -38,4 +38,4 @@ module AuthorizationRequestHelper
   end
 end
 
-RSpec.configuration.send :include, AuthorizationRequestHelper, type: :request
+RSpec.configuration.send :include, AuthorizationRequestHelper

data/spec/support/helpers/config_helper.rb

@@ -6,4 +6,4 @@ module ConfigHelper
   end
 end
 
-RSpec.configuration.send :include, ConfigHelper, type: :request
+RSpec.configuration.send :include, ConfigHelper

data/spec/support/helpers/model_helper.rb

@@ -42,4 +42,4 @@ module ModelHelper
   end
 end
 
-RSpec.configuration.send :include, ModelHelper, type: :request
+RSpec.configuration.send :include, ModelHelper

data/spec/support/helpers/request_spec_helper.rb

@@ -73,4 +73,4 @@ module RequestSpecHelper
   end
 end
 
-RSpec.configuration.send :include, RequestSpecHelper, type: :request
+RSpec.configuration.send :include, RequestSpecHelper

data/spec/support/helpers/url_helper.rb

@@ -52,4 +52,4 @@ module UrlHelper
   end
 end
 
-RSpec.configuration.send :include, UrlHelper, type: :request
+RSpec.configuration.send :include, UrlHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +180,7 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
+- NEWS.md
 - README.md
 - RELEASING.md
 - Rakefile