Merge branch 'following-users'

Author: mhartl

test/integration/password_resets_test.rb

@@ -4,11 +4,10 @@ class PasswordResets < ActionDispatch::IntegrationTest
 
   def setup
     ActionMailer::Base.deliveries.clear
-    @user = users(:michael)
   end
 end
 
-class PasswordResetsTest < PasswordResets
+class ForgotPasswordFormTest < PasswordResets
 
   test "password reset path" do
     get new_password_reset_path
@@ -18,81 +17,82 @@ class PasswordResetsTest < PasswordResets
 
   test "reset path with invalid email" do
     post password_resets_path, params: { password_reset: { email: "" } }
-    assert_not flash.empty?
     assert_response :unprocessable_entity
+    assert_not flash.empty?
     assert_template 'password_resets/new'
   end
 end
 
-class PasswordForm < PasswordResets
+class PasswordResetForm < PasswordResets
 
   def setup
     super
+    @user = users(:michael)
     post password_resets_path,
          params: { password_reset: { email: @user.email } }
-    @actual_user = assigns(:user)
+    @reset_user = assigns(:user)
   end
 end
 
-class PasswordFormTest < PasswordForm
+class PasswordFormTest < PasswordResetForm
 
   test "reset with valid email" do
-    assert_not_equal @user.reset_digest, @user.reload.reset_digest
+    assert_not_equal @user.reset_digest, @reset_user.reset_digest
     assert_equal 1, ActionMailer::Base.deliveries.size
     assert_not flash.empty?
     assert_redirected_to root_url
   end
 
   test "reset with wrong email" do
-    get edit_password_reset_path(@actual_user.reset_token, email: "")
+    get edit_password_reset_path(@reset_user.reset_token, email: "")
     assert_redirected_to root_url
   end
 
   test "reset with inactive user" do
-    @actual_user.toggle!(:activated)
-    get edit_password_reset_path(@actual_user.reset_token,
-                                 email: @actual_user.email)
+    @reset_user.toggle!(:activated)
+    get edit_password_reset_path(@reset_user.reset_token,
+                                 email: @reset_user.email)
     assert_redirected_to root_url
   end
 
   test "reset with right email but wrong token" do
-    get edit_password_reset_path('wrong token', email: @actual_user.email)
+    get edit_password_reset_path('wrong token', email: @reset_user.email)
     assert_redirected_to root_url
   end
 
   test "reset with right email and right token" do
-    get edit_password_reset_path(@actual_user.reset_token,
-                                 email: @actual_user.email)
+    get edit_password_reset_path(@reset_user.reset_token,
+                                 email: @reset_user.email)
     assert_template 'password_resets/edit'
-    assert_select "input[name=email][type=hidden][value=?]", @actual_user.email
+    assert_select "input[name=email][type=hidden][value=?]", @reset_user.email
   end
 end
 
-class PasswordUpdateTest < PasswordForm
+class PasswordUpdateTest < PasswordResetForm
 
   test "update with invalid password and confirmation" do
-    patch password_reset_path(@actual_user.reset_token),
-          params: { email: @actual_user.email,
+    patch password_reset_path(@reset_user.reset_token),
+          params: { email: @reset_user.email,
                     user: { password:              "foobaz",
                             password_confirmation: "barquux" } }
     assert_select 'div#error_explanation'
   end
 
   test "update with empty password" do
-    patch password_reset_path(@actual_user.reset_token),
-          params: { email: @actual_user.email,
+    patch password_reset_path(@reset_user.reset_token),
+          params: { email: @reset_user.email,
                     user: { password:              "",
                             password_confirmation: "" } }
     assert_select 'div#error_explanation'
   end
 
   test "update with valid password and confirmation" do
-    patch password_reset_path(@actual_user.reset_token),
-          params: { email: @actual_user.email,
+    patch password_reset_path(@reset_user.reset_token),
+          params: { email: @reset_user.email,
                     user: { password:              "foobaz",
                             password_confirmation: "foobaz" } }
     assert is_logged_in?
     assert_not flash.empty?
-    assert_redirected_to @actual_user
+    assert_redirected_to @reset_user
   end
 end