devise_token_auth 0.2.0 → 1.0.0.rc1

data/test/support/controllers/routes.rb

@@ -0,0 +1,43 @@
+class Module
+  include Minitest::Spec::DSL
+end
+
+module ControllerRoutesAfterBlock
+  after do
+    Rails.application.reload_routes!
+  end
+end
+
+module CustomControllersRoutes
+  include ControllerRoutesAfterBlock
+
+  before do
+    Rails.application.routes.draw do
+      mount_devise_token_auth_for 'User', at: 'nice_user_auth', controllers: {
+        registrations: 'custom/registrations',
+        confirmations: 'custom/confirmations',
+        passwords: 'custom/passwords',
+        sessions: 'custom/sessions',
+        token_validations: 'custom/token_validations',
+        omniauth_callbacks: 'custom/omniauth_callbacks'
+      }
+    end
+  end
+end
+
+module OverridesControllersRoutes
+  include ControllerRoutesAfterBlock
+
+  before do
+    Rails.application.routes.draw do
+      mount_devise_token_auth_for 'User', at: 'evil_user_auth', controllers: {
+        confirmations:      'overrides/confirmations',
+        passwords:          'overrides/passwords',
+        omniauth_callbacks: 'overrides/omniauth_callbacks',
+        registrations:      'overrides/registrations',
+        sessions:           'overrides/sessions',
+        token_validations:  'overrides/token_validations'
+      }
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,18 +1,22 @@
 # frozen_string_literal: true
 
 require 'simplecov'
-
-SimpleCov.start 'rails'
+SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+SimpleCov.start 'rails' do
+  add_filter ['.bundle', 'test', 'config']
+end
 
 ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path('../dummy/config/environment', __FILE__)
+require File.expand_path('dummy/config/environment', __dir__)
 require 'rails/test_help'
 require 'minitest/rails'
 require 'mocha/minitest'
 
-ActiveSupport::TestCase.fixture_path = File.expand_path('../fixtures', __FILE__)
-ActionDispatch::IntegrationTest.fixture_path = File.expand_path('../fixtures', __FILE__)
+FactoryBot.definition_file_paths = [File.expand_path('factories', __dir__)]
+FactoryBot.find_definitions
+
+Dir[File.join(__dir__, 'support/**', '*.rb')].each { |file| require file }
 
 # I hate the default reporter. Use ProgressReporter instead.
 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new
@@ -24,13 +28,9 @@ class ActionDispatch::IntegrationTest
 end
 
 class ActiveSupport::TestCase
-  ActiveRecord::Migration.check_pending!
+  include FactoryBot::Syntax::Methods
 
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
+  ActiveRecord::Migration.check_pending!
 
   # Add more helper methods to be used by all tests here...
 
@@ -51,7 +51,7 @@ class ActiveSupport::TestCase
   # Suppress OmniAuth logger output
   def silence_omniauth
     previous_logger = OmniAuth.config.logger
-    OmniAuth.config.logger = Logger.new("/dev/null")
+    OmniAuth.config.logger = Logger.new('/dev/null')
     yield
   ensure
     OmniAuth.config.logger = previous_logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Lynn Hurley
@@ -161,7 +161,7 @@ files:
 - lib/generators/devise_token_auth/install_views_generator.rb
 - lib/generators/devise_token_auth/templates/devise_token_auth.rb
 - lib/generators/devise_token_auth/templates/devise_token_auth_create_users.rb.erb
-- lib/generators/devise_token_auth/templates/user.rb
+- lib/generators/devise_token_auth/templates/user.rb.erb
 - lib/tasks/devise_token_auth_tasks.rake
 - test/controllers/custom/custom_confirmations_controller_test.rb
 - test/controllers/custom/custom_omniauth_callbacks_controller_test.rb
@@ -204,10 +204,8 @@ files:
 - test/dummy/app/controllers/overrides/sessions_controller.rb
 - test/dummy/app/controllers/overrides/token_validations_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/evil_user.rb
 - test/dummy/app/models/lockable_user.rb
 - test/dummy/app/models/mang.rb
-- test/dummy/app/models/nice_user.rb
 - test/dummy/app/models/only_email_user.rb
 - test/dummy/app/models/scoped_user.rb
 - test/dummy/app/models/unconfirmable_user.rb
@@ -240,10 +238,8 @@ files:
 - test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
 - test/dummy/db/migrate/20140829044006_add_operating_thetan_to_user.rb
 - test/dummy/db/migrate/20140916224624_add_favorite_color_to_mangs.rb
-- test/dummy/db/migrate/20140928231203_devise_token_auth_create_evil_users.rb
 - test/dummy/db/migrate/20141222035835_devise_token_auth_create_only_email_users.rb
 - test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb
-- test/dummy/db/migrate/20150409095712_devise_token_auth_create_nice_users.rb
 - test/dummy/db/migrate/20150708104536_devise_token_auth_create_unconfirmable_users.rb
 - test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb
 - test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb
@@ -252,13 +248,14 @@ files:
 - test/dummy/tmp/generators/app/models/user.rb
 - test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
 - test/dummy/tmp/generators/db/migrate/20180805205504_devise_token_auth_create_users.rb
-- test/integration/navigation_test.rb
+- test/factories/users.rb
 - test/lib/devise_token_auth/url_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
 - test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb
 - test/lib/generators/devise_token_auth/install_views_generator_test.rb
 - test/models/only_email_user_test.rb
 - test/models/user_test.rb
+- test/support/controllers/routes.rb
 - test/test_helper.rb
 homepage: http://github.com/lynndylanhurley/devise_token_auth
 licenses:
@@ -275,9 +272,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14.1
@@ -285,10 +282,8 @@ signing_key:
 specification_version: 4
 summary: Token based authentication for rails. Uses Devise + OmniAuth.
 test_files:
-- test/dummy/app/models/nice_user.rb
 - test/dummy/app/models/only_email_user.rb
 - test/dummy/app/models/scoped_user.rb
-- test/dummy/app/models/evil_user.rb
 - test/dummy/app/models/mang.rb
 - test/dummy/app/models/unregisterable_user.rb
 - test/dummy/app/models/lockable_user.rb
@@ -343,18 +338,17 @@ test_files:
 - test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb
 - test/dummy/db/migrate/20141222035835_devise_token_auth_create_only_email_users.rb
 - test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb
-- test/dummy/db/migrate/20140928231203_devise_token_auth_create_evil_users.rb
 - test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb
 - test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb
 - test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
-- test/dummy/db/migrate/20150409095712_devise_token_auth_create_nice_users.rb
 - test/dummy/tmp/generators/app/models/user.rb
 - test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
 - test/dummy/tmp/generators/db/migrate/20180805205504_devise_token_auth_create_users.rb
 - test/dummy/README.rdoc
-- test/integration/navigation_test.rb
 - test/models/only_email_user_test.rb
 - test/models/user_test.rb
+- test/support/controllers/routes.rb
+- test/factories/users.rb
 - test/lib/devise_token_auth/url_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
 - test/lib/generators/devise_token_auth/install_views_generator_test.rb

data/test/dummy/app/models/evil_user.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class EvilUser < ActiveRecord::Base
-  include DeviseTokenAuth::Concerns::User
-end

data/test/dummy/app/models/nice_user.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class NiceUser < ActiveRecord::Base
-  # Include default devise modules.
-  devise :database_authenticatable, :registerable,
-          :recoverable, :rememberable, :trackable, :validatable,
-          :confirmable, :omniauthable
-  include DeviseTokenAuth::Concerns::User
-end

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

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-include MigrationDatabaseHelper
-
-class DeviseTokenAuthCreateEvilUsers < ActiveRecord::Migration[4.2]
-  def change
-    create_table(:evil_users) do |t|
-      ## Database authenticatable
-      t.string :email
-      t.string :encrypted_password, :null => false, :default => ""
-
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
-      t.boolean  :allow_password_change, :default => false
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
-
-      ## Confirmable
-      t.string   :confirmation_token
-      t.datetime :confirmed_at
-      t.datetime :confirmation_sent_at
-      t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, :default => 0, :null => false # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-      ## User Info
-      t.string :name
-      t.string :nickname
-      t.string :image
-
-      ## unique oauth id
-      t.string :provider
-      t.string :uid, :null => false, :default => ""
-
-      ## Tokens
-      if json_supported_database?
-        t.json :tokens
-      else
-        t.text :tokens
-      end
-
-      ## etc.
-      t.string :favorite_color
-
-      t.timestamps
-    end
-
-    add_index :evil_users, :email
-    add_index :evil_users, [:uid, :provider],     :unique => true
-    add_index :evil_users, :reset_password_token, :unique => true
-    add_index :evil_users, :confirmation_token,   :unique => true
-    # add_index :evil_users, :unlock_token,         :unique => true
-  end
-end

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

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-include MigrationDatabaseHelper
-
-class DeviseTokenAuthCreateNiceUsers < ActiveRecord::Migration[4.2]
-  def change
-    create_table(:nice_users) do |t|
-      ## Required
-      t.string :provider, :null => false
-      t.string :uid, :null => false, :default => ""
-
-      ## Database authenticatable
-      t.string :encrypted_password, :null => false, :default => ""
-
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
-      t.boolean  :allow_password_change, :default => false
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
-
-      ## Confirmable
-      t.string   :confirmation_token
-      t.datetime :confirmed_at
-      t.datetime :confirmation_sent_at
-      t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, :default => 0, :null => false # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-      ## User Info
-      t.string :name
-      t.string :nickname
-      t.string :image
-      t.string :email
-
-      ## Tokens
-      if json_supported_database?
-        t.json :tokens
-      else
-        t.text :tokens
-      end
-
-      t.timestamps
-    end
-
-    add_index :nice_users, :email
-    add_index :nice_users, [:uid, :provider],     :unique => true
-    add_index :nice_users, :reset_password_token, :unique => true
-    # add_index :nice_users, :confirmation_token,   :unique => true
-    # add_index :nice_users, :unlock_token,         :unique => true
-  end
-end

data/test/integration/navigation_test.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class NavigationTest < ActionDispatch::IntegrationTest
-  fixtures :all
-
-  # test "the truth" do
-  #   assert true
-  # end
-end
-