Merge branch 'following-users'

Author: mhartl

test/integration/users_login_test.rb

@@ -1,14 +1,20 @@
 require "test_helper"
 
-class UsersLoginTest < ActionDispatch::IntegrationTest
+class UsersLogin < ActionDispatch::IntegrationTest
 
   def setup
     @user = users(:michael)
   end
+end
 
-  test "login with valid email/invalid password" do
+class InvalidPasswordTest < UsersLogin
+
+  test "login path" do
     get login_path
     assert_template 'sessions/new'
+  end
+
+  test "login with valid email/invalid password" do
     post login_path, params: { session: { email:    @user.email,
                                           password: "invalid" } }
     assert_not is_logged_in?
@@ -18,30 +24,64 @@ def setup
     get root_path
     assert flash.empty?
   end
+end
 
-  test "login with valid information followed by logout" do
-    get login_path
+class ValidLogin < UsersLogin
+
+  def setup
+    super
     post login_path, params: { session: { email:    @user.email,
                                           password: 'password' } }
+  end
+end
+
+class ValidLoginTest < ValidLogin
+
+  test "valid login" do
     assert is_logged_in?
     assert_redirected_to @user
+  end
+
+  test "redirect after login" do
     follow_redirect!
     assert_template 'users/show'
     assert_select "a[href=?]", login_path, count: 0
     assert_select "a[href=?]", logout_path
     assert_select "a[href=?]", user_path(@user)
+  end
+end
+
+class Logout < ValidLogin
+
+  def setup
+    super
     delete logout_path
+  end
+end
+
+class LogoutTest < Logout
+
+  test "successful logout" do
     assert_not is_logged_in?
     assert_response :see_other
     assert_redirected_to root_url
-    # Simulate a user clicking logout in a second window.
-    delete logout_path
+  end
+
+  test "redirect after logout" do
     follow_redirect!
     assert_select "a[href=?]", login_path
     assert_select "a[href=?]", logout_path,      count: 0
     assert_select "a[href=?]", user_path(@user), count: 0
   end
 
+  test "should still work after logout in second window" do
+    delete logout_path
+    assert_redirected_to root_url
+  end
+end
+
+class RememberingTest < UsersLogin
+
   test "login with remembering" do
     log_in_as(@user, remember_me: '1')
     assert_not cookies[:remember_token].blank?

test/integration/users_signup_test.rb

@@ -1,13 +1,15 @@
 require "test_helper"
 
-class UsersSignupTest < ActionDispatch::IntegrationTest
+class UsersSignup < ActionDispatch::IntegrationTest
 
   def setup
     ActionMailer::Base.deliveries.clear
   end
+end
+
+class UsersSignupTest < UsersSignup
 
   test "invalid signup information" do
-    get signup_path
     assert_no_difference 'User.count' do
       post users_path, params: { user: { name:  "",
                                          email: "user@invalid",
@@ -21,28 +23,49 @@ def setup
   end
 
   test "valid signup information with account activation" do
-    get signup_path
     assert_difference 'User.count', 1 do
       post users_path, params: { user: { name:  "Example User",
                                          email: "[email protected]",
                                          password:              "password",
                                          password_confirmation: "password" } }
     end
     assert_equal 1, ActionMailer::Base.deliveries.size
-    user = assigns(:user)
-    assert_not user.activated?
-    # Try to log in before activation.
-    log_in_as(user)
+  end
+end
+
+class AccountActivationTest < UsersSignup
+
+  def setup
+    super
+    post users_path, params: { user: { name:  "Example User",
+                                       email: "[email protected]",
+                                       password:              "password",
+                                       password_confirmation: "password" } }
+    @user = assigns(:user)
+  end
+
+  test "should not be activated" do
+    assert_not @user.activated?
+  end
+
+  test "should not be able to log in before account activation" do
+    log_in_as(@user)
     assert_not is_logged_in?
-    # Invalid activation token
-    get edit_account_activation_path("invalid token", email: user.email)
+  end
+
+  test "should not be able to log in with invalid activation token" do
+    get edit_account_activation_path("invalid token", email: @user.email)
     assert_not is_logged_in?
-    # Valid token, wrong email
-    get edit_account_activation_path(user.activation_token, email: 'wrong')
+  end
+
+  test "should not be able to log in with invalid email" do
+    get edit_account_activation_path(@user.activation_token, email: 'wrong')
     assert_not is_logged_in?
-    # Valid activation token
-    get edit_account_activation_path(user.activation_token, email: user.email)
-    assert user.reload.activated?
+  end
+
+  test "should log in successfully with valid activation token and email" do
+    get edit_account_activation_path(@user.activation_token, email: @user.email)
+    assert @user.reload.activated?
     follow_redirect!
     assert_template 'users/show'
     assert is_logged_in?