From 76f8a46faaf5be30bd70f672feb5559c50e0bb0b Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 12 Jun 2018 08:31:41 +0300 Subject: [PATCH 1/5] Update fixtures --- test/fixtures/users.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 494cadd24..036f2183e 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,6 +1,7 @@ api_bestnames: username: test_bestnames password: testtest + encrypted_password: <%= Devise::Encryptor.digest(ApiUser, 'testtest') %> type: ApiUser registrar: bestnames active: true @@ -10,6 +11,7 @@ api_bestnames: api_goodnames: username: test_goodnames password: testtest + encrypted_password: <%= Devise::Encryptor.digest(ApiUser, 'testtest') %> type: ApiUser registrar: goodnames active: true From 58effbb7c38a4311bff97cf76758980c2bb13180 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 18 Jun 2018 16:46:49 +0300 Subject: [PATCH 2/5] Pull up Devise module --- app/models/admin_user.rb | 2 +- app/models/user.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb index d76c42dec..c29375d38 100644 --- a/app/models/admin_user.rb +++ b/app/models/admin_user.rb @@ -9,7 +9,7 @@ class AdminUser < User ROLES = %w(user customer_service admin) # should not match to api_users roles - devise :database_authenticatable, :rememberable, :trackable, :validatable, :lockable + devise :rememberable, :validatable, :lockable def self.min_password_length Devise.password_length.min diff --git a/app/models/user.rb b/app/models/user.rb index b69e0250c..150311e90 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ class User < ActiveRecord::Base include Versions # version/user_version.rb - devise :trackable, :timeoutable + devise :database_authenticatable, :trackable, :timeoutable attr_accessor :phone From 20c99bd53a4b4986c013e6e91942a5141000a41e Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 18 Jun 2018 17:44:36 +0300 Subject: [PATCH 3/5] Revert "Pull up Devise module" This reverts commit 58effbb --- app/models/admin_user.rb | 2 +- app/models/user.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb index c29375d38..d76c42dec 100644 --- a/app/models/admin_user.rb +++ b/app/models/admin_user.rb @@ -9,7 +9,7 @@ class AdminUser < User ROLES = %w(user customer_service admin) # should not match to api_users roles - devise :rememberable, :validatable, :lockable + devise :database_authenticatable, :rememberable, :trackable, :validatable, :lockable def self.min_password_length Devise.password_length.min diff --git a/app/models/user.rb b/app/models/user.rb index 150311e90..b69e0250c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ class User < ActiveRecord::Base include Versions # version/user_version.rb - devise :database_authenticatable, :trackable, :timeoutable + devise :trackable, :timeoutable attr_accessor :phone From e418ec68258c0038e02d453aa7f7582e9b034bd4 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 18 Jun 2018 18:01:14 +0300 Subject: [PATCH 4/5] Revert "Update fixture" This reverts commit 81f923a --- test/fixtures/users.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 036f2183e..155197b58 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -20,7 +20,6 @@ api_goodnames: admin: username: test - encrypted_password: <%= Devise::Encryptor.digest(AdminUser, 'testtest') %> type: AdminUser country_code: US roles: From 3b3c8e6a2d1820ae77b24cea46921a0c2045ceaf Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 18 Jun 2018 18:01:29 +0300 Subject: [PATCH 5/5] Revert "Update fixtures" This reverts commit 76f8a46 --- test/fixtures/users.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 155197b58..b20bd8a83 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,7 +1,6 @@ api_bestnames: username: test_bestnames password: testtest - encrypted_password: <%= Devise::Encryptor.digest(ApiUser, 'testtest') %> type: ApiUser registrar: bestnames active: true @@ -11,7 +10,6 @@ api_bestnames: api_goodnames: username: test_goodnames password: testtest - encrypted_password: <%= Devise::Encryptor.digest(ApiUser, 'testtest') %> type: ApiUser registrar: goodnames active: true