devise_token_auth 0.1.43 → 0.2.0

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/test/dummy/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   # when using multiple models, controllers will default to the first available
   # devise mapping. routes for subsequent devise mappings will need to defined

data/test/dummy/config/spring.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Spring.application_root = './test/dummy'

data/test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include MigrationDatabaseHelper
 
 class DeviseTokenAuthCreateUsers < ActiveRecord::Migration[4.2]

data/test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include MigrationDatabaseHelper
 
 class DeviseTokenAuthCreateMangs < ActiveRecord::Migration[4.2]

data/test/dummy/db/migrate/20140829044006_add_operating_thetan_to_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddOperatingThetanToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :operating_thetan, :integer

data/test/dummy/db/migrate/20140916224624_add_favorite_color_to_mangs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddFavoriteColorToMangs < ActiveRecord::Migration[4.2]
   def change
     add_column :mangs, :favorite_color, :string

data/test/dummy/db/migrate/20140928231203_devise_token_auth_create_evil_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include MigrationDatabaseHelper
 
 class DeviseTokenAuthCreateEvilUsers < ActiveRecord::Migration[4.2]

data/test/dummy/db/migrate/20141222035835_devise_token_auth_create_only_email_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include MigrationDatabaseHelper
 
 class DeviseTokenAuthCreateOnlyEmailUsers < ActiveRecord::Migration[4.2]

data/test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include MigrationDatabaseHelper
 
 class DeviseTokenAuthCreateUnregisterableUsers < ActiveRecord::Migration[4.2]

data/test/dummy/db/migrate/20150409095712_devise_token_auth_create_nice_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include MigrationDatabaseHelper
 
 class DeviseTokenAuthCreateNiceUsers < ActiveRecord::Migration[4.2]

data/test/dummy/db/migrate/20150708104536_devise_token_auth_create_unconfirmable_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include MigrationDatabaseHelper
 
 class DeviseTokenAuthCreateUnconfirmableUsers < ActiveRecord::Migration[4.2]

data/test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include MigrationDatabaseHelper
 
 class DeviseTokenAuthCreateScopedUsers < ActiveRecord::Migration[4.2]

data/test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include MigrationDatabaseHelper
 
 class DeviseTokenAuthCreateLockableUsers < ActiveRecord::Migration[4.2]

data/test/dummy/lib/migration_database_helper.rb

@@ -1,3 +1,17 @@
+# frozen_string_literal: true
+
+# polyfill Rails >= 5 versioned migrations
+
+unless ActiveRecord::Migration.respond_to?(:[])
+  module ActiveRecord
+    class Migration
+      def self.[](_version)
+        self
+      end
+    end
+  end
+end
+
 module MigrationDatabaseHelper
   def json_supported_database?
     (postgres? && postgres_correct_version?) || (mysql? && mysql_correct_version?)
@@ -26,4 +40,4 @@ module MigrationDatabaseHelper
   def database_version
     ActiveRecord::Base.connection.select_value('SELECT VERSION()')
   end
-end
+end

data/test/dummy/tmp/generators/app/models/user.rb

@@ -1,9 +1,9 @@
             class User < ApplicationRecord
-  # Include default devise modules.
-  devise :database_authenticatable, :registerable,
-          :recoverable, :rememberable, :trackable, :validatable,
-          :confirmable, :omniauthable
-  include DeviseTokenAuth::Concerns::User
+            # Include default devise modules.
+            devise :database_authenticatable, :registerable,
+                    :recoverable, :rememberable, :trackable, :validatable,
+                    :confirmable, :omniauthable
+            include DeviseTokenAuth::Concerns::User
 
               def whatever
                 puts 'whatever'

data/test/dummy/tmp/generators/config/initializers/devise_token_auth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 DeviseTokenAuth.setup do |config|
   # By default the authorization headers will change after each request. The
   # client is responsible for keeping track of the changing tokens. Change

data/test/dummy/tmp/generators/db/migrate/{20171014052631_devise_token_auth_create_users.rb → 20180805205504_devise_token_auth_create_users.rb}

@@ -1,5 +1,6 @@
 class DeviseTokenAuthCreateUsers < ActiveRecord::Migration[5.1]
   def change
+    
     create_table(:users) do |t|
       ## Required
       t.string :provider, :null => false, :default => "email"

data/test/integration/navigation_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class NavigationTest < ActionDispatch::IntegrationTest

data/test/lib/devise_token_auth/url_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class DeviseTokenAuth::UrlTest < ActiveSupport::TestCase

data/test/lib/generators/devise_token_auth/install_generator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'fileutils'
 require 'generators/devise_token_auth/install_generator'

data/test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb

@@ -0,0 +1,194 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+require 'fileutils'
+require 'generators/devise_token_auth/install_generator'
+
+module DeviseTokenAuth
+  class InstallGeneratorTest < Rails::Generators::TestCase
+    tests InstallGenerator
+    destination Rails.root.join('tmp/generators')
+
+    # The namespaced user model for testing
+    let(:user_class) { "Azpire::V1::HumanResource::User" }
+    let(:namespace_path) { user_class.underscore }
+    let(:table_name) { user_class.pluralize.underscore.gsub("/","_") }
+
+    describe 'user model with namespace, clean install' do
+      setup :prepare_destination
+
+      before do
+        run_generator %W(#{user_class} auth)
+      end
+
+      test 'user model (with namespace) is created, concern is included' do
+        assert_file "app/models/#{namespace_path}.rb" do |model|
+          assert_match(/include DeviseTokenAuth::Concerns::User/, model)
+        end
+      end
+
+      test 'initializer is created' do
+        assert_file 'config/initializers/devise_token_auth.rb'
+      end
+
+      test 'migration is created for user model with namespace' do
+        assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb"
+      end
+
+      test 'migration file for user model with namespace contains rails version' do
+        if Rails::VERSION::MAJOR >= 5
+          assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}/
+        else
+          assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb"
+        end
+      end
+
+      test 'subsequent runs raise no errors' do
+        run_generator %W(#{user_class} auth)
+      end
+    end
+
+    describe 'existing user model' do
+      setup :prepare_destination
+
+      before do
+        @dir = File.join(destination_root, "app", "models")
+
+        @fname = File.join(@dir, "user.rb")
+
+        # make dir if not exists
+        FileUtils.mkdir_p(@dir)
+
+        # account for rails version 5
+        active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
+
+        @f = File.open(@fname, 'w') {|f|
+          f.write <<-RUBY
+            class User < #{active_record_needle}
+
+              def whatever
+                puts 'whatever'
+              end
+            end
+          RUBY
+        }
+
+        run_generator
+      end
+
+      test 'user concern is injected into existing model' do
+        assert_file 'app/models/user.rb' do |model|
+          assert_match(/include DeviseTokenAuth::Concerns::User/, model)
+        end
+      end
+
+      test 'subsequent runs do not modify file' do
+        run_generator
+        assert_file 'app/models/user.rb' do |model|
+          matches = model.scan(/include DeviseTokenAuth::Concerns::User/m).size
+          assert_equal 1, matches
+        end
+      end
+    end
+
+
+    describe 'routes' do
+      setup :prepare_destination
+
+      before do
+        @dir = File.join(destination_root, "config")
+
+        @fname = File.join(@dir, "routes.rb")
+
+        # make dir if not exists
+        FileUtils.mkdir_p(@dir)
+
+        @f = File.open(@fname, 'w') {|f|
+          f.write <<-RUBY
+            Rails.application.routes.draw do
+              patch '/chong', to: 'bong#index'
+            end
+          RUBY
+        }
+
+        run_generator %W(#{user_class} auth)
+      end
+
+      test 'route method for user model with namespace is appended to routes file' do
+        assert_file 'config/routes.rb' do |routes|
+          assert_match(/mount_devise_token_auth_for '#{user_class}', at: 'auth'/, routes)
+        end
+      end
+
+      test 'subsequent runs do not modify file' do
+        run_generator %W(#{user_class} auth)
+        assert_file 'config/routes.rb' do |routes|
+          matches = routes.scan(/mount_devise_token_auth_for '#{user_class}', at: 'auth'/m).size
+          assert_equal 1, matches
+        end
+      end
+
+      describe 'subsequent models' do
+        before do
+          run_generator %w(Mang mangs)
+        end
+
+        test 'migration is created' do
+          assert_migration 'db/migrate/devise_token_auth_create_mangs.rb'
+        end
+
+        test 'route method is appended to routes file' do
+          assert_file 'config/routes.rb' do |routes|
+            assert_match(/mount_devise_token_auth_for 'Mang', at: 'mangs'/, routes)
+          end
+        end
+
+        test 'devise_for block is appended to routes file' do
+          assert_file 'config/routes.rb' do |routes|
+            assert_match(/as :mang do/, routes)
+            assert_match(/# Define routes for Mang within this block./, routes)
+          end
+        end
+      end
+    end
+
+    describe 'application controller' do
+      setup :prepare_destination
+
+      before do
+        @dir = File.join(destination_root, "app", "controllers")
+
+        @fname = File.join(@dir, "application_controller.rb")
+
+        # make dir if not exists
+        FileUtils.mkdir_p(@dir)
+
+        @f = File.open(@fname, 'w') {|f|
+          f.write <<-RUBY
+            class ApplicationController < ActionController::Base
+              def whatever
+                'whatever'
+              end
+            end
+          RUBY
+        }
+
+        run_generator %W(#{user_class} auth)
+      end
+
+      test 'controller concern is appended to application controller' do
+        assert_file 'app/controllers/application_controller.rb' do |controller|
+          assert_match(/include DeviseTokenAuth::Concerns::SetUserByToken/, controller)
+        end
+      end
+
+      test 'subsequent runs do not modify file' do
+        run_generator %W(#{user_class} auth)
+        assert_file 'app/controllers/application_controller.rb' do |controller|
+          matches = controller.scan(/include DeviseTokenAuth::Concerns::SetUserByToken/m).size
+          assert_equal 1, matches
+        end
+      end
+    end
+  end
+end

data/test/lib/generators/devise_token_auth/install_views_generator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'fileutils'
 require 'generators/devise_token_auth/install_views_generator'

data/test/models/only_email_user_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class OnlyEmailUserTest < ActiveSupport::TestCase

data/test/models/user_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
@@ -94,7 +96,7 @@ class UserTest < ActiveSupport::TestCase
       test 'should properly indicate whether token is current' do
         assert @resource.token_is_current?(@token, @client_id)
         # we want to update the expiry without forcing a cleanup (see below)
-        @resource.tokens[@client_id]['expiry'] = Time.now.to_i - 10.seconds
+        @resource.tokens[@client_id]['expiry'] = Time.zone.now.to_i - 10.seconds
         refute @resource.token_is_current?(@token, @client_id)
       end
     end
@@ -121,13 +123,13 @@ class UserTest < ActiveSupport::TestCase
       test 'works per user' do
         assert @resource.token_is_current?(@token_global, @client_id_global)
 
-        time = Time.now.to_i
-        expiry_global = @resource.tokens[@client_id_global]['expiry']
+        time = Time.zone.now.to_i
+        expiry_global = @resource.tokens[@client_id_global]['expiry'] || @resource.tokens[@client_id_global][:expiry]
 
         assert expiry_global > time + DeviseTokenAuth.token_lifespan - 5.seconds
         assert expiry_global < time + DeviseTokenAuth.token_lifespan + 5.seconds
 
-        expiry_specific = @resource.tokens[@client_id_specific]['expiry']
+        expiry_specific = @resource.tokens[@client_id_specific]['expiry'] || @resource.tokens[@client_id_specific][:expiry]
         assert expiry_specific > time + 55.seconds
         assert expiry_specific < time + 65.seconds
       end

data/test/test_helper.rb

@@ -1,9 +1,6 @@
-require 'simplecov'
+# frozen_string_literal: true
 
-# SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-#   SimpleCov::Formatter::HTMLFormatter,
-#   CodeClimate::TestReporter::Formatter
-# ]
+require 'simplecov'
 
 SimpleCov.start 'rails'
 
@@ -12,13 +9,7 @@ ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rails/test_help'
 require 'minitest/rails'
-
-# To add Capybara feature tests add `gem "minitest-rails-capybara"`
-# to the test group in the Gemfile and uncomment the following:
-# require "minitest/rails/capybara"
-
-# Uncomment for awesome colorful output
-# require "minitest/pride"
+require 'mocha/minitest'
 
 ActiveSupport::TestCase.fixture_path = File.expand_path('../fixtures', __FILE__)
 ActionDispatch::IntegrationTest.fixture_path = File.expand_path('../fixtures', __FILE__)
@@ -45,14 +36,14 @@ class ActiveSupport::TestCase
 
   def age_token(user, client_id)
     if user.tokens[client_id]
-      user.tokens[client_id]['updated_at'] = Time.now - (DeviseTokenAuth.batch_request_buffer_throttle + 10.seconds)
+      user.tokens[client_id]['updated_at'] = Time.zone.now - (DeviseTokenAuth.batch_request_buffer_throttle + 10.seconds)
       user.save!
     end
   end
 
   def expire_token(user, client_id)
     if user.tokens[client_id]
-      user.tokens[client_id]['expiry'] = (Time.now - (DeviseTokenAuth.token_lifespan.to_f + 10.seconds)).to_i
+      user.tokens[client_id]['expiry'] = (Time.zone.now - (DeviseTokenAuth.token_lifespan.to_f + 10.seconds)).to_i
       user.save!
     end
   end
@@ -75,3 +66,28 @@ class ActionController::TestCase
     @request.env['devise.mapping'] = Devise.mappings[:user]
   end
 end
+
+# TODO: remove it when support for Rails < 5 has been dropped
+module Rails
+  module Controller
+    module Testing
+      module Integration
+        %w[get post patch put head delete get_via_redirect post_via_redirect].each do |method|
+          define_method(method) do |path_or_action, **args|
+            if Rails::VERSION::MAJOR >= 5
+              super path_or_action, args
+            else
+              super path_or_action, args[:params], args[:headers]
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+module ActionController
+  class TestCase
+    include Rails::Controller::Testing::Integration
+  end
+end