aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-05 12:31:37 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-05 12:31:37 -0300
commitd972537faa3bfb609e3343cfbf09aa660943878f (patch)
tree189d362d7969de2906d6cd36500ff07b7a6c62dc
parentd26e788ff22754f58f5c022e66a53866644e40c9 (diff)
parent2f05036cdd3fc6d6335ede05a2efa5971fe19e47 (diff)
downloadrails-d972537faa3bfb609e3343cfbf09aa660943878f.tar.gz
rails-d972537faa3bfb609e3343cfbf09aa660943878f.tar.bz2
rails-d972537faa3bfb609e3343cfbf09aa660943878f.zip
Merge pull request #18344 from jonatack/patch-1
Clean up secure_token_test
-rw-r--r--activerecord/test/cases/secure_token_test.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/test/cases/secure_token_test.rb b/activerecord/test/cases/secure_token_test.rb
index 400fce8c6e..dc12b528dc 100644
--- a/activerecord/test/cases/secure_token_test.rb
+++ b/activerecord/test/cases/secure_token_test.rb
@@ -6,13 +6,13 @@ class SecureTokenTest < ActiveRecord::TestCase
@user = User.new
end
- test "assing unique token values" do
+ def test_token_values_are_generated_for_specified_attributes_and_persisted_on_save
@user.save
assert_not_nil @user.token
assert_not_nil @user.auth_token
end
- test "regenerate the secure key for the attribute" do
+ def test_regenerating_the_secure_token
@user.save
old_token = @user.token
old_auth_token = @user.auth_token
@@ -23,15 +23,15 @@ class SecureTokenTest < ActiveRecord::TestCase
assert_not_equal @user.auth_token, old_auth_token
end
- test "raise and exception when with 10 attemps is reached" do
+ def test_raise_after_ten_unsuccessful_attempts_to_generate_a_unique_token
User.stubs(:exists?).returns(*Array.new(10, true))
assert_raises(RuntimeError) do
@user.save
end
end
- test "assing unique token after 9 attemps reached" do
- User.stubs(:exists?).returns(*Array.new(10){ |i| i == 9 ? false : true})
+ def test_return_unique_token_after_nine_unsuccessful_attempts
+ User.stubs(:exists?).returns(*Array.new(10) { |i| i == 9 ? false : true })
@user.save
assert_not_nil @user.token
assert_not_nil @user.auth_token