Merge branch 'following-users'

Author: mhartl

app/controllers/microposts_controller.rb

@@ -18,7 +18,7 @@ def destroy
     @micropost.destroy
     flash[:success] = "Micropost deleted"
     if request.referrer.nil? || request.referrer == microposts_url
-      redirect_to root_url
+      redirect_to root_url, status: :see_other
     else
       redirect_to request.referrer, status: :see_other
     end

app/controllers/sessions_controller.rb

@@ -28,4 +28,4 @@ def destroy
     log_out if logged_in?
     redirect_to root_url, status: :see_other
   end
-end
+end

app/controllers/users_controller.rb

@@ -52,14 +52,14 @@ def following
     @title = "Following"
     @user  = User.find(params[:id])
     @users = @user.following.paginate(page: params[:page])
-    render 'show_follow'
+    render 'show_follow', status: :unprocessable_entity
   end
 
   def followers
     @title = "Followers"
     @user  = User.find(params[:id])
     @users = @user.followers.paginate(page: params[:page])
-    render 'show_follow'
+    render 'show_follow', status: :unprocessable_entity
   end
 
   private

test/integration/following_test.rb

@@ -13,6 +13,7 @@ class FollowPagesTest < Following
 
   test "following page" do
     get following_user_path(@user)
+    assert_response :unprocessable_entity
     assert_not @user.following.empty?
     assert_match @user.following.count.to_s, response.body
     @user.following.each do |user|
@@ -22,6 +23,7 @@ class FollowPagesTest < Following
 
   test "followers page" do
     get followers_user_path(@user)
+    assert_response :unprocessable_entity
     assert_not @user.followers.empty?
     assert_match @user.followers.count.to_s, response.body
     @user.followers.each do |user|