From 492d20398681f7d38adac5dc1d3cfb77079e8bcf Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Sat, 9 Jan 2016 23:33:57 +0100 Subject: [PATCH] Split out token `if` tests to trigger `before_create`. When running passing condition assertions in the same test the user had already been saved at that point. Split out so we have a not yet persisted user. Rename condition tests to improve clarity a bit. --- activerecord/test/cases/secure_token_test.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/activerecord/test/cases/secure_token_test.rb b/activerecord/test/cases/secure_token_test.rb index ff0072d59c..239b975d82 100644 --- a/activerecord/test/cases/secure_token_test.rb +++ b/activerecord/test/cases/secure_token_test.rb @@ -30,13 +30,17 @@ def test_token_value_not_overwritten_when_present assert_equal @user.token, "custom-secure-token" end - def test_token_with_if_condition_checks_condition_on_save + 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 -- GitLab