devise_token_auth 1.0.0 → 1.1.4

data/test/lib/devise_token_auth/url_test.rb

@@ -4,10 +4,10 @@ require 'test_helper'
 
 class DeviseTokenAuth::UrlTest < ActiveSupport::TestCase
   describe 'DeviseTokenAuth::Url#generate' do
-    test 'URI fragment should appear at the end of URL' do
+    test 'URI fragment should appear at the end of URL with repeat of query params' do
       params = { client_id: 123 }
       url = 'http://example.com#fragment'
-      assert_equal DeviseTokenAuth::Url.send(:generate, url, params), 'http://example.com?client_id=123#fragment'
+      assert_equal DeviseTokenAuth::Url.send(:generate, url, params), 'http://example.com?client_id=123#fragment?client_id=123'
     end
 
     describe 'with existing query params' do

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

@@ -2,11 +2,13 @@
 
 require 'test_helper'
 require 'fileutils'
-require 'generators/devise_token_auth/install_generator'
+require 'generators/devise_token_auth/install_generator' if DEVISE_TOKEN_AUTH_ORM == :active_record
+require 'generators/devise_token_auth/install_mongoid_generator' if DEVISE_TOKEN_AUTH_ORM == :mongoid
 
 module DeviseTokenAuth
   class InstallGeneratorTest < Rails::Generators::TestCase
-    tests InstallGenerator
+    tests InstallGenerator        if DEVISE_TOKEN_AUTH_ORM == :active_record
+    tests InstallMongoidGenerator if DEVISE_TOKEN_AUTH_ORM == :mongoid
     destination Rails.root.join('tmp/generators')
 
     describe 'default values, clean install' do
@@ -26,28 +28,30 @@ module DeviseTokenAuth
         assert_file 'config/initializers/devise_token_auth.rb'
       end
 
-      test 'migration is created' do
-        assert_migration 'db/migrate/devise_token_auth_create_users.rb'
+      test 'subsequent runs raise no errors' do
+        run_generator
       end
 
-      test 'migration file contains rails version' do
-        if Rails::VERSION::MAJOR >= 5
-          assert_migration 'db/migrate/devise_token_auth_create_users.rb', /#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}/
-        else
+      if DEVISE_TOKEN_AUTH_ORM == :active_record
+        test 'migration is created' do
           assert_migration 'db/migrate/devise_token_auth_create_users.rb'
         end
-      end
 
-      test 'subsequent runs raise no errors' do
-        run_generator
-      end
+        test 'migration file contains rails version' do
+          if Rails::VERSION::MAJOR >= 5
+            assert_migration 'db/migrate/devise_token_auth_create_users.rb', /#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}/
+          else
+            assert_migration 'db/migrate/devise_token_auth_create_users.rb'
+          end
+        end
 
-      test 'add primary key type with rails 5 when specified in rails generator' do
-        run_generator %w[--primary_key_type=uuid --force]
-        if Rails::VERSION::MAJOR >= 5
-          assert_migration 'db/migrate/devise_token_auth_create_users.rb', /create_table\(:users, id: :uuid\) do/
-        else
-          assert_migration 'db/migrate/devise_token_auth_create_users.rb', /create_table\(:users\) do/
+        test 'add primary key type with rails 5 when specified in rails generator' do
+          run_generator %w[--primary_key_type=uuid --force]
+          if Rails::VERSION::MAJOR >= 5
+            assert_migration 'db/migrate/devise_token_auth_create_users.rb', /create_table\(:users, id: :uuid\) do/
+          else
+            assert_migration 'db/migrate/devise_token_auth_create_users.rb', /create_table\(:users\) do/
+          end
         end
       end
     end
@@ -63,18 +67,32 @@ module DeviseTokenAuth
         # make dir if not exists
         FileUtils.mkdir_p(@dir)
 
-        # account for rails version 5
-        active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
+        case DEVISE_TOKEN_AUTH_ORM
+        when :active_record
+          # account for rails version 5
+          active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
 
-        @f = File.open(@fname, 'w') do |f|
-          f.write <<-RUBY
-            class User < #{active_record_needle}
+          @f = File.open(@fname, 'w') do |f|
+            f.write <<-RUBY
+              class User < #{active_record_needle}
 
-              def whatever
-                puts 'whatever'
+                def whatever
+                  puts 'whatever'
+                end
               end
-            end
-          RUBY
+            RUBY
+          end
+        when :mongoid
+          @f = File.open(@fname, 'w') do |f|
+            f.write <<-'RUBY'
+              class User
+
+                def whatever
+                  puts 'whatever'
+                end
+              end
+            RUBY
+          end
         end
 
         run_generator
@@ -136,10 +154,6 @@ module DeviseTokenAuth
           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)
@@ -152,6 +166,12 @@ module DeviseTokenAuth
             assert_match(/# Define routes for Mang within this block./, routes)
           end
         end
+
+        if DEVISE_TOKEN_AUTH_ORM == :active_record
+          test 'migration is created' do
+            assert_migration 'db/migrate/devise_token_auth_create_mangs.rb'
+          end
+        end
       end
     end
 

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

@@ -2,11 +2,13 @@
 
 require 'test_helper'
 require 'fileutils'
-require 'generators/devise_token_auth/install_generator'
+require 'generators/devise_token_auth/install_generator' if DEVISE_TOKEN_AUTH_ORM == :active_record
+require 'generators/devise_token_auth/install_mongoid_generator' if DEVISE_TOKEN_AUTH_ORM == :mongoid
 
 module DeviseTokenAuth
   class InstallGeneratorTest < Rails::Generators::TestCase
-    tests InstallGenerator
+    tests InstallGenerator        if DEVISE_TOKEN_AUTH_ORM == :active_record
+    tests InstallMongoidGenerator if DEVISE_TOKEN_AUTH_ORM == :mongoid
     destination Rails.root.join('tmp/generators')
 
     # The namespaced user model for testing
@@ -31,28 +33,30 @@ module DeviseTokenAuth
         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"
+      test 'subsequent runs raise no errors' do
+        run_generator %W[#{user_class} auth]
       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
+      if DEVISE_TOKEN_AUTH_ORM == :active_record
+        test 'migration is created for user model with namespace' do
           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
+        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 'add primary key type with rails 5 when specified in rails generator' do
-        run_generator %W[#{user_class} auth --primary_key_type=uuid --force]
-        if Rails::VERSION::MAJOR >= 5
-          assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /create_table\(:#{table_name}, id: :uuid\) do/
-        else
-          assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /create_table\(:#{table_name}\) do/
+        test 'add primary key type with rails 5 when specified in rails generator' do
+          run_generator %W[#{user_class} auth --primary_key_type=uuid --force]
+          if Rails::VERSION::MAJOR >= 5
+            assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /create_table\(:#{table_name}, id: :uuid\) do/
+          else
+            assert_migration "db/migrate/devise_token_auth_create_#{table_name}.rb", /create_table\(:#{table_name}\) do/
+          end
         end
       end
     end
@@ -68,18 +72,32 @@ module DeviseTokenAuth
         # make dir if not exists
         FileUtils.mkdir_p(@dir)
 
-        # account for rails version 5
-        active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
+        case DEVISE_TOKEN_AUTH_ORM
+        when :active_record
+          # account for rails version 5
+          active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
 
-        @f = File.open(@fname, 'w') do |f|
-          f.write <<-RUBY
-            class User < #{active_record_needle}
+          @f = File.open(@fname, 'w') do |f|
+            f.write <<-RUBY
+              class User < #{active_record_needle}
 
-              def whatever
-                puts 'whatever'
+                def whatever
+                  puts 'whatever'
+                end
               end
-            end
-          RUBY
+            RUBY
+          end
+        when :mongoid
+          @f = File.open(@fname, 'w') do |f|
+            f.write <<-'RUBY'
+              class User
+
+                def whatever
+                  puts 'whatever'
+                end
+              end
+            RUBY
+          end
         end
 
         run_generator
@@ -141,10 +159,6 @@ module DeviseTokenAuth
           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)
@@ -157,6 +171,12 @@ module DeviseTokenAuth
             assert_match(/# Define routes for Mang within this block./, routes)
           end
         end
+
+        if DEVISE_TOKEN_AUTH_ORM == :active_record
+          test 'migration is created' do
+            assert_migration 'db/migrate/devise_token_auth_create_mangs.rb'
+          end
+        end
       end
     end
 

data/test/models/concerns/mongoid_support_test.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+if DEVISE_TOKEN_AUTH_ORM == :mongoid
+  class DeviseTokenAuth::Concerns::MongoidSupportTest < ActiveSupport::TestCase
+    describe DeviseTokenAuth::Concerns::MongoidSupport do
+      before do
+        @user = create(:user)
+      end
+
+      describe '#as_json' do
+        test 'should be defined' do
+          assert @user.methods.include?(:as_json)
+        end
+
+        test 'should except _id attribute' do
+          refute @user.as_json.key?('_id')
+        end
+
+        test 'should return with id attribute' do
+          assert_equal @user._id.to_s, @user.as_json['id']
+        end
+
+        test 'should accept options' do
+          refute @user.as_json(except: [:created_at]).key?('created_at')
+        end
+      end
+    end
+  end
+end

data/test/models/concerns/tokens_serialization_test.rb

@@ -0,0 +1,70 @@
+require 'test_helper'
+
+if DEVISE_TOKEN_AUTH_ORM == :active_record
+  describe 'DeviseTokenAuth::Concerns::TokensSerialization' do
+    let(:ts) { DeviseTokenAuth::Concerns::TokensSerialization }
+    let(:user) { FactoryBot.create(:user) }
+    let(:tokens) do
+      # Сreate all possible token's attributes combinations
+      user.create_token
+      2.times { user.create_new_auth_token(user.tokens.first[0]) }
+      user.create_new_auth_token
+      user.create_token
+
+      user.tokens
+    end
+    let(:json) { JSON.generate(tokens) }
+
+    it 'is defined' do
+      assert_equal(ts.present?, true)
+      assert_kind_of(Module, ts)
+    end
+
+    describe '.load(json)' do
+      let(:default) { {} }
+
+      it 'is defined' do
+        assert_respond_to(ts, :load)
+      end
+
+      it 'handles nil' do
+        assert_equal(ts.load(nil), default)
+      end
+
+      it 'handles string' do
+        assert_equal(ts.load(json), JSON.parse(json))
+      end
+
+      it 'returns object of undesirable class' do
+        assert_equal(ts.load([]), [])
+      end
+    end
+
+    describe '.dump(object)' do
+      let(:default) { 'null' }
+
+      it 'is defined' do
+        assert_respond_to(ts, :dump)
+      end
+
+      it 'handles nil' do
+        assert_equal(ts.dump(nil), default)
+      end
+
+      it 'handles empty hash' do
+        assert_equal(ts.dump({}), '{}')
+      end
+
+      it 'deserialize tokens' do
+        assert_equal(ts.dump(tokens), json)
+      end
+
+      it 'removes nil values' do
+        new_tokens = tokens.dup
+        new_tokens[new_tokens.first[0]][:kos] = nil
+
+        assert_equal(ts.dump(tokens), ts.dump(new_tokens))
+      end
+    end
+  end
+end

data/test/models/confirmable_user_test.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class ConfirmableUserTest < ActiveSupport::TestCase
+  describe ConfirmableUser do
+    describe 'creation' do
+      test 'email should be saved' do
+        @resource = create(:confirmable_user)
+        assert @resource.email.present?
+      end
+    end
+
+    describe 'updating email' do
+      test 'new email should be saved to unconfirmed_email' do
+        @resource = create(:confirmable_user, email: 'old_address@example.com')
+        @resource.update(email: 'new_address@example.com')
+        assert @resource.unconfirmed_email == 'new_address@example.com'
+      end
+
+      test 'old email should be kept in email' do
+        @resource = create(:confirmable_user, email: 'old_address@example.com')
+        @resource.update(email: 'new_address@example.com')
+        assert @resource.email == 'old_address@example.com'
+      end
+
+      test 'confirmation_token should be changed' do
+        @resource = create(:confirmable_user, email: 'old_address@example.com')
+        old_token = @resource.confirmation_token
+        @resource.update(email: 'new_address@example.com')
+        assert @resource.confirmation_token != old_token
+      end
+    end
+  end
+end

data/test/models/only_email_user_test.rb

@@ -4,14 +4,6 @@ require 'test_helper'
 
 class OnlyEmailUserTest < ActiveSupport::TestCase
   describe OnlyEmailUser do
-    test 'trackable is disabled' do
-      refute OnlyEmailUser.method_defined?(:sign_in_count)
-      refute OnlyEmailUser.method_defined?(:current_sign_in_at)
-      refute OnlyEmailUser.method_defined?(:last_sign_in_at)
-      refute OnlyEmailUser.method_defined?(:current_sign_in_ip)
-      refute OnlyEmailUser.method_defined?(:last_sign_in_ip)
-    end
-
     test 'confirmable is disabled' do
       refute OnlyEmailUser.method_defined?(:confirmation_token)
       refute OnlyEmailUser.method_defined?(:confirmed_at)

data/test/models/user_test.rb

@@ -44,7 +44,7 @@ class UserTest < ActiveSupport::TestCase
         @resource = build(:user, user_attributes)
 
         refute @resource.save
-        assert @resource.errors.messages[:email] == [I18n.t('errors.messages.taken')]
+        assert @resource.errors.messages[:email].first.include? 'taken'
         assert @resource.errors.messages[:email].none? { |e| e =~ /translation missing/ }
       end
     end
@@ -76,38 +76,6 @@ class UserTest < ActiveSupport::TestCase
       end
     end
 
-    describe 'user specific token lifespan' do
-      before do
-        @resource = create(:user, :confirmed)
-
-        auth_headers = @resource.create_new_auth_token
-        @token_global     = auth_headers['access-token']
-        @client_id_global = auth_headers['client']
-
-        def @resource.token_lifespan
-          1.minute
-        end
-
-        auth_headers = @resource.create_new_auth_token
-        @token_specific     = auth_headers['access-token']
-        @client_id_specific = auth_headers['client']
-      end
-
-      test 'works per user' do
-        assert @resource.token_is_current?(@token_global, @client_id_global)
-
-        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'] || @resource.tokens[@client_id_specific][:expiry]
-        assert expiry_specific > time + 55.seconds
-        assert expiry_specific < time + 65.seconds
-      end
-    end
-
     describe 'expired tokens are destroyed on save' do
       before do
         @resource = create(:user, :confirmed)