doorkeeper 5.1.0.rc2 → 5.1.0

data/spec/generators/install_generator_spec.rb

@@ -1,34 +1,36 @@
-require 'spec_helper'
-require 'generators/doorkeeper/install_generator'
+# frozen_string_literal: true
 
-describe 'Doorkeeper::InstallGenerator' do
+require "spec_helper"
+require "generators/doorkeeper/install_generator"
+
+describe "Doorkeeper::InstallGenerator" do
   include GeneratorSpec::TestCase
 
   tests Doorkeeper::InstallGenerator
-  destination ::File.expand_path('../tmp/dummy', __FILE__)
+  destination ::File.expand_path("../tmp/dummy", __FILE__)
 
-  describe 'after running the generator' do
+  describe "after running the generator" do
     before :each do
       prepare_destination
-      FileUtils.mkdir(::File.expand_path('config', Pathname(destination_root)))
-      FileUtils.mkdir(::File.expand_path('db', Pathname(destination_root)))
+      FileUtils.mkdir(::File.expand_path("config", Pathname(destination_root)))
+      FileUtils.mkdir(::File.expand_path("db", Pathname(destination_root)))
       FileUtils.copy_file(
-        ::File.expand_path('../templates/routes.rb', __FILE__),
-        ::File.expand_path('config/routes.rb', Pathname.new(destination_root))
+        ::File.expand_path("../templates/routes.rb", __FILE__),
+        ::File.expand_path("config/routes.rb", Pathname.new(destination_root))
       )
       run_generator
     end
 
-    it 'creates an initializer file' do
-      assert_file 'config/initializers/doorkeeper.rb'
+    it "creates an initializer file" do
+      assert_file "config/initializers/doorkeeper.rb"
     end
 
-    it 'copies the locale file' do
-      assert_file 'config/locales/doorkeeper.en.yml'
+    it "copies the locale file" do
+      assert_file "config/locales/doorkeeper.en.yml"
     end
 
-    it 'adds sample route' do
-      assert_file 'config/routes.rb', /use_doorkeeper/
+    it "adds sample route" do
+      assert_file "config/routes.rb", /use_doorkeeper/
     end
   end
 end

data/spec/generators/migration_generator_spec.rb

@@ -1,40 +1,27 @@
-require 'spec_helper'
-require 'generators/doorkeeper/migration_generator'
+# frozen_string_literal: true
 
-describe 'Doorkeeper::MigrationGenerator' do
+require "spec_helper"
+require "generators/doorkeeper/migration_generator"
+
+describe "Doorkeeper::MigrationGenerator" do
   include GeneratorSpec::TestCase
 
   tests Doorkeeper::MigrationGenerator
-  destination ::File.expand_path('../tmp/dummy', __FILE__)
+  destination ::File.expand_path("../tmp/dummy", __FILE__)
 
-  describe 'after running the generator' do
+  describe "after running the generator" do
     before :each do
       prepare_destination
     end
 
-    context 'pre Rails 5.0.0' do
-      it 'creates a migration with no version specifier' do
-        stub_const('ActiveRecord::VERSION::MAJOR', 4)
-        stub_const('ActiveRecord::VERSION::MINOR', 2)
-
-        run_generator
-
-        assert_migration 'db/migrate/create_doorkeeper_tables.rb' do |migration|
-          assert migration.include?("ActiveRecord::Migration\n")
-        end
-      end
-    end
-
-    context 'post Rails 5.0.0' do
-      it 'creates a migration with a version specifier' do
-        stub_const('ActiveRecord::VERSION::MAJOR', 5)
-        stub_const('ActiveRecord::VERSION::MINOR', 0)
+    it "creates a migration with a version specifier" do
+      stub_const("ActiveRecord::VERSION::MAJOR", 5)
+      stub_const("ActiveRecord::VERSION::MINOR", 0)
 
-        run_generator
+      run_generator
 
-        assert_migration 'db/migrate/create_doorkeeper_tables.rb' do |migration|
-          assert migration.include?("ActiveRecord::Migration[5.0]\n")
-        end
+      assert_migration "db/migrate/create_doorkeeper_tables.rb" do |migration|
+        assert migration.include?("ActiveRecord::Migration[5.0]\n")
       end
     end
   end

data/spec/generators/pkce_generator_spec.rb

@@ -1,42 +1,27 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'generators/doorkeeper/pkce_generator'
+require "spec_helper"
+require "generators/doorkeeper/pkce_generator"
 
-describe 'Doorkeeper::PkceGenerator' do
+describe "Doorkeeper::PkceGenerator" do
   include GeneratorSpec::TestCase
 
   tests Doorkeeper::PkceGenerator
-  destination ::File.expand_path('../tmp/dummy', __FILE__)
+  destination ::File.expand_path("../tmp/dummy", __FILE__)
 
-  describe 'after running the generator' do
+  describe "after running the generator" do
     before :each do
       prepare_destination
     end
 
-    context 'pre Rails 5.0.0' do
-      it 'creates a migration with no version specifier' do
-        stub_const("ActiveRecord::VERSION::MAJOR", 4)
-        stub_const("ActiveRecord::VERSION::MINOR", 2)
+    it "creates a migration with a version specifier" do
+      stub_const("ActiveRecord::VERSION::MAJOR", 5)
+      stub_const("ActiveRecord::VERSION::MINOR", 0)
 
-        run_generator
+      run_generator
 
-        assert_migration 'db/migrate/enable_pkce.rb' do |migration|
-          assert migration.include?("ActiveRecord::Migration\n")
-        end
-      end
-    end
-
-    context 'post Rails 5.0.0' do
-      it 'creates a migration with a version specifier' do
-        stub_const("ActiveRecord::VERSION::MAJOR", 5)
-        stub_const("ActiveRecord::VERSION::MINOR", 0)
-
-        run_generator
-
-        assert_migration 'db/migrate/enable_pkce.rb' do |migration|
-          assert migration.include?("ActiveRecord::Migration[5.0]\n")
-        end
+      assert_migration "db/migrate/enable_pkce.rb" do |migration|
+        assert migration.include?("ActiveRecord::Migration[5.0]\n")
       end
     end
   end

data/spec/generators/previous_refresh_token_generator_spec.rb

@@ -1,13 +1,15 @@
-require 'spec_helper'
-require 'generators/doorkeeper/previous_refresh_token_generator'
+# frozen_string_literal: true
 
-describe 'Doorkeeper::PreviousRefreshTokenGenerator' do
+require "spec_helper"
+require "generators/doorkeeper/previous_refresh_token_generator"
+
+describe "Doorkeeper::PreviousRefreshTokenGenerator" do
   include GeneratorSpec::TestCase
 
   tests Doorkeeper::PreviousRefreshTokenGenerator
-  destination ::File.expand_path('../tmp/dummy', __FILE__)
+  destination ::File.expand_path("../tmp/dummy", __FILE__)
 
-  describe 'after running the generator' do
+  describe "after running the generator" do
     before :each do
       prepare_destination
 
@@ -16,41 +18,26 @@ describe 'Doorkeeper::PreviousRefreshTokenGenerator' do
       )
     end
 
-    context 'pre Rails 5.0.0' do
-      it 'creates a migration with no version specifier' do
-        stub_const('ActiveRecord::VERSION::MAJOR', 4)
-        stub_const('ActiveRecord::VERSION::MINOR', 2)
-
-        run_generator
-
-        assert_migration 'db/migrate/add_previous_refresh_token_to_access_tokens.rb' do |migration|
-          assert migration.include?("ActiveRecord::Migration\n")
-        end
-      end
-    end
-
-    context 'post Rails 5.0.0' do
-      it 'creates a migration with a version specifier' do
-        stub_const('ActiveRecord::VERSION::MAJOR', 5)
-        stub_const('ActiveRecord::VERSION::MINOR', 0)
+    it "creates a migration with a version specifier" do
+      stub_const("ActiveRecord::VERSION::MAJOR", 5)
+      stub_const("ActiveRecord::VERSION::MINOR", 0)
 
-        run_generator
+      run_generator
 
-        assert_migration 'db/migrate/add_previous_refresh_token_to_access_tokens.rb' do |migration|
-          assert migration.include?("ActiveRecord::Migration[5.0]\n")
-        end
+      assert_migration "db/migrate/add_previous_refresh_token_to_access_tokens.rb" do |migration|
+        assert migration.include?("ActiveRecord::Migration[5.0]\n")
       end
     end
 
-    context 'already exist' do
-      it 'does not create a migration' do
+    context "already exist" do
+      it "does not create a migration" do
         allow_any_instance_of(Doorkeeper::PreviousRefreshTokenGenerator).to(
           receive(:no_previous_refresh_token_column?).and_call_original
         )
 
         run_generator
 
-        assert_no_migration 'db/migrate/add_previous_refresh_token_to_access_tokens.rb'
+        assert_no_migration "db/migrate/add_previous_refresh_token_to_access_tokens.rb"
       end
     end
   end

data/spec/generators/templates/routes.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
 end

data/spec/generators/views_generator_spec.rb

@@ -1,27 +1,29 @@
-require 'spec_helper'
-require 'generators/doorkeeper/views_generator'
+# frozen_string_literal: true
+
+require "spec_helper"
+require "generators/doorkeeper/views_generator"
 
 describe Doorkeeper::Generators::ViewsGenerator do
   include GeneratorSpec::TestCase
 
   tests Doorkeeper::Generators::ViewsGenerator
-  destination File.expand_path('tmp/dummy', __dir__)
+  destination File.expand_path("tmp/dummy", __dir__)
 
   before :each do
     prepare_destination
   end
 
-  it 'create all views' do
+  it "create all views" do
     run_generator
-    assert_file 'app/views/doorkeeper/applications/_form.html.erb'
-    assert_file 'app/views/doorkeeper/applications/edit.html.erb'
-    assert_file 'app/views/doorkeeper/applications/index.html.erb'
-    assert_file 'app/views/doorkeeper/applications/new.html.erb'
-    assert_file 'app/views/doorkeeper/applications/show.html.erb'
+    assert_file "app/views/doorkeeper/applications/_form.html.erb"
+    assert_file "app/views/doorkeeper/applications/edit.html.erb"
+    assert_file "app/views/doorkeeper/applications/index.html.erb"
+    assert_file "app/views/doorkeeper/applications/new.html.erb"
+    assert_file "app/views/doorkeeper/applications/show.html.erb"
 
-    assert_file 'app/views/doorkeeper/authorizations/error.html.erb'
-    assert_file 'app/views/doorkeeper/authorizations/new.html.erb'
+    assert_file "app/views/doorkeeper/authorizations/error.html.erb"
+    assert_file "app/views/doorkeeper/authorizations/new.html.erb"
 
-    assert_file 'app/views/doorkeeper/authorized_applications/index.html.erb'
+    assert_file "app/views/doorkeeper/authorized_applications/index.html.erb"
   end
 end

data/spec/grape/grape_integration_spec.rb

@@ -1,12 +1,14 @@
-require 'spec_helper'
-require 'grape'
-require 'rack/test'
-require 'doorkeeper/grape/helpers'
+# frozen_string_literal: true
+
+require "spec_helper"
+require "grape"
+require "rack/test"
+require "doorkeeper/grape/helpers"
 
 # Test Grape API application
 module GrapeApp
   class API < Grape::API
-    version 'v1', using: :path
+    version "v1", using: :path
     format :json
     prefix :api
 
@@ -17,7 +19,7 @@ module GrapeApp
         doorkeeper_authorize!
       end
 
-      desc 'Protected resource, requires token.'
+      desc "Protected resource, requires token."
 
       get :status do
         { token: doorkeeper_token.token }
@@ -29,10 +31,10 @@ module GrapeApp
         doorkeeper_authorize!
       end
 
-      desc 'Protected resource, requires token with scopes (defined in endpoint).'
+      desc "Protected resource, requires token with scopes (defined in endpoint)."
 
       get :status, scopes: [:admin] do
-        { response: 'OK' }
+        { response: "OK" }
       end
     end
 
@@ -41,10 +43,10 @@ module GrapeApp
         doorkeeper_authorize! :admin
       end
 
-      desc 'Protected resource, requires token with scopes (defined in helper).'
+      desc "Protected resource, requires token with scopes (defined in helper)."
 
       get :status do
-        { response: 'OK' }
+        { response: "OK" }
       end
     end
 
@@ -52,13 +54,13 @@ module GrapeApp
       desc "Public resource, no token required."
 
       get :status do
-        { response: 'OK' }
+        { response: "OK" }
       end
     end
   end
 end
 
-describe 'Grape integration' do
+describe "Grape integration" do
   include Rack::Test::Methods
 
   def app
@@ -70,66 +72,66 @@ describe 'Grape integration' do
   end
 
   let(:client) { FactoryBot.create(:application) }
-  let(:resource) { FactoryBot.create(:doorkeeper_testing_user, name: 'Joe', password: 'sekret') }
+  let(:resource) { FactoryBot.create(:doorkeeper_testing_user, name: "Joe", password: "sekret") }
   let(:access_token) { client_is_authorized(client, resource) }
 
-  context 'with valid Access Token' do
-    it 'successfully requests protected resource' do
+  context "with valid Access Token" do
+    it "successfully requests protected resource" do
       get "api/v1/protected/status.json?access_token=#{access_token.token}"
 
       expect(last_response).to be_successful
 
-      expect(json_body['token']).to eq(access_token.token)
+      expect(json_body["token"]).to eq(access_token.token)
     end
 
-    it 'successfully requests protected resource with token that has required scopes (Grape endpoint)' do
-      access_token = client_is_authorized(client, resource, scopes: 'admin')
+    it "successfully requests protected resource with token that has required scopes (Grape endpoint)" do
+      access_token = client_is_authorized(client, resource, scopes: "admin")
 
       get "api/v1/protected_with_endpoint_scopes/status.json?access_token=#{access_token.token}"
 
       expect(last_response).to be_successful
-      expect(json_body).to have_key('response')
+      expect(json_body).to have_key("response")
     end
 
-    it 'successfully requests protected resource with token that has required scopes (Doorkeeper helper)' do
-      access_token = client_is_authorized(client, resource, scopes: 'admin')
+    it "successfully requests protected resource with token that has required scopes (Doorkeeper helper)" do
+      access_token = client_is_authorized(client, resource, scopes: "admin")
 
       get "api/v1/protected_with_helper_scopes/status.json?access_token=#{access_token.token}"
 
       expect(last_response).to be_successful
-      expect(json_body).to have_key('response')
+      expect(json_body).to have_key("response")
     end
 
-    it 'successfully requests public resource' do
+    it "successfully requests public resource" do
       get "api/v1/public/status.json"
 
       expect(last_response).to be_successful
-      expect(json_body).to have_key('response')
+      expect(json_body).to have_key("response")
     end
   end
 
-  context 'with invalid Access Token' do
-    it 'fails without access token' do
+  context "with invalid Access Token" do
+    it "fails without access token" do
       get "api/v1/protected/status.json"
 
       expect(last_response).not_to be_successful
-      expect(json_body).to have_key('error')
+      expect(json_body).to have_key("error")
     end
 
-    it 'fails for access token without scopes' do
+    it "fails for access token without scopes" do
       get "api/v1/protected_with_endpoint_scopes/status.json?access_token=#{access_token.token}"
 
       expect(last_response).not_to be_successful
-      expect(json_body).to have_key('error')
+      expect(json_body).to have_key("error")
     end
 
-    it 'fails for access token with invalid scopes' do
-      access_token = client_is_authorized(client, resource, scopes: 'read write')
+    it "fails for access token with invalid scopes" do
+      access_token = client_is_authorized(client, resource, scopes: "read write")
 
       get "api/v1/protected_with_endpoint_scopes/status.json?access_token=#{access_token.token}"
 
       expect(last_response).not_to be_successful
-      expect(json_body).to have_key('error')
+      expect(json_body).to have_key("error")
     end
   end
 end

data/spec/helpers/doorkeeper/dashboard_helper_spec.rb

@@ -1,12 +1,14 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 describe Doorkeeper::DashboardHelper do
-  describe '#doorkeeper_errors_for' do
+  describe "#doorkeeper_errors_for" do
     let(:object) { double errors: { method: messages } }
-    let(:messages) { ['first message', 'second message'] }
+    let(:messages) { ["first message", "second message"] }
 
-    context 'when object has errors' do
-      it 'returns error messages' do
+    context "when object has errors" do
+      it "returns error messages" do
         messages.each do |message|
           expect(helper.doorkeeper_errors_for(object, :method)).to include(
             message.capitalize
@@ -15,8 +17,8 @@ describe Doorkeeper::DashboardHelper do
       end
     end
 
-    context 'when object has no errors' do
-      it 'returns nil' do
+    context "when object has no errors" do
+      it "returns nil" do
         expect(helper.doorkeeper_errors_for(object, :amonter_method)).to be_nil
       end
     end