Merge branch 'following-users'

Author: mhartl

test/integration/password_resets_test.rb

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

test/integration/users_login_test.rb

@@ -12,6 +12,7 @@ def setup
     post login_path, params: { session: { email:    @user.email,
                                           password: "invalid" } }
     assert_not is_logged_in?
+    assert_response :unprocessable_entity
     assert_template 'sessions/new'
     assert_not flash.empty?
     get root_path
@@ -53,4 +54,4 @@ def setup
     log_in_as(@user, remember_me: '0')
     assert cookies[:remember_token].blank?
   end
-end
+end

test/integration/users_signup_test.rb

@@ -14,6 +14,7 @@ def setup
                                          password:              "foo",
                                          password_confirmation: "bar" } }
     end
+    assert_response :unprocessable_entity
     assert_template 'users/new'
     assert_select 'div#error_explanation'
     assert_select 'div.field_with_errors'