diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-14 21:52:03 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-14 21:52:03 +0100 |
| commit | 1aa1cec777bfbd25eba731c7e7872642ed5e4b15 (patch) | |
| tree | 10b1138ac048195e3a6f2b98ba52770e90e2ef9f /activerecord/test | |
| parent | 434ec2371498e99d4669453b66a4b9fa08f7a9a0 (diff) | |
| download | rails-1aa1cec777bfbd25eba731c7e7872642ed5e4b15.tar.gz rails-1aa1cec777bfbd25eba731c7e7872642ed5e4b15.tar.bz2 rails-1aa1cec777bfbd25eba731c7e7872642ed5e4b15.zip | |
Revert "Merge pull request #20835 from glittershark/if-and-unless-in-secure-token"
This reverts commit 224eddfc0eeff6555ae88691306e61c7a9e8b758, reversing
changes made to 9d681fc74c6251d5f2b93fa9576c9b2113116680.
When merging the pull request, I misunderstood `has_secure_token` as declaring a model
has a token from birth and through the rest of its lifetime.
Therefore, supporting conditional creation doesn't make sense. You should never mark a
model as having a secure token if there's a time when it shouldn't have it on creation.
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/secure_token_test.rb | 14 | ||||
| -rw-r--r-- | activerecord/test/models/user.rb | 3 | ||||
| -rw-r--r-- | activerecord/test/schema/schema.rb | 1 |
3 files changed, 0 insertions, 18 deletions
diff --git a/activerecord/test/cases/secure_token_test.rb b/activerecord/test/cases/secure_token_test.rb index 239b975d82..e731443fc2 100644 --- a/activerecord/test/cases/secure_token_test.rb +++ b/activerecord/test/cases/secure_token_test.rb @@ -29,18 +29,4 @@ class SecureTokenTest < ActiveRecord::TestCase assert_equal @user.token, "custom-secure-token" end - - def test_failing_if_condition_does_not_set_token - @user.token_condition = false - @user.save - - assert_nil @user.conditional_token - end - - def test_passing_if_condition_sets_token - @user.token_condition = true - @user.save - - assert_not_nil @user.conditional_token - end end diff --git a/activerecord/test/models/user.rb b/activerecord/test/models/user.rb index a40385e047..f5dc93e994 100644 --- a/activerecord/test/models/user.rb +++ b/activerecord/test/models/user.rb @@ -1,9 +1,6 @@ class User < ActiveRecord::Base has_secure_token has_secure_token :auth_token - has_secure_token :conditional_token, if: :token_condition - - attr_accessor :token_condition end class UserWithNotification < User diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index 4a74137c00..025184f63a 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -1007,7 +1007,6 @@ ActiveRecord::Schema.define do create_table :users, force: true do |t| t.string :token t.string :auth_token - t.string :conditional_token end create_table :test_with_keyword_column_name, force: true do |t| |