as_user 0.0.3 → 0.0.4

data/test/dummy/tmp/pids/server.pid

@@ -1 +1 @@
-22602
+10866

data/test/factories/users.rb

@@ -2,10 +2,10 @@
 FactoryGirl.define do
   factory :user do
     sequence :email do |n|
-      "email#{n}@example.com"
+      "email_#{n}@example.com"
     end
     sequence :name do |n|
-      "name#{n}"
+      "name_#{n}"
     end
     password "password"
     password_confirmation "password"

data/test/functional/as_user/abouts_controller_test.rb

@@ -14,3 +14,4 @@ module AsUser
     end
   end
 end
+

data/test/functional/as_user/sessions_controller_test.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 
 module AsUser
   class SessionsControllerTest < ActionController::TestCase
+    include SessionsHelper
+
     setup do
     end
 
@@ -19,21 +21,28 @@ module AsUser
       assert_select "[name=?]","session[password]"
     end
 
-    test "sign in then sign out" do
+    test "sign in then sign out using name" do
+    end
+
+    test "sign in then sign out using email" do
       user = FactoryGirl.create(:user)
-      post :create, session: {email: user.email, password: user.password}
-      assert_redirected_to user
+      response = post :create, session: {email: user.email, password: user.password}
+      assert_equal 302, response.status
+      assert session[:user_id]
+      assert current_user
 
-      delete :destroy
+      response = delete :destroy
+      assert_equal 302, response.status
       assert_nil session[:user_id]
-      assert_redirected_to root_path
+      assert_nil current_user
       assert_equal "signed out.", flash[:notice]
     end
 
     test "sign in with invalid user" do
       post :create, session: {email: "a", password: "xxx"}
       assert_template :new
-      assert_equal "Invalid email/password combination", flash[:error]
+      assert_nil current_user
+      assert_equal "Invalid name(or email)/password combination", flash[:error]
     end
 
   end

data/test/functional/as_user/users_controller_test.rb

@@ -30,11 +30,6 @@ module AsUser
       get :edit, id: @user
       assert_response :success
       assert_not_nil assigns(:user)
-      assert_select "form"
-      assert_select "[name=?]", "user[email]"
-      assert_select "[name=?]", "user[name]"
-      assert_select "[name=?]", "user[password]",false
-      assert_select "[name=?]", "user[password_confirmation]",false
     end
   
     test "should get edit password" do
@@ -45,22 +40,11 @@ module AsUser
       get :edit_password, id: @user
       assert_response :success
       assert_not_nil assigns(:user)
-      assert_select "form"
-      assert_select "[name=?]", "user[email]",false
-      assert_select "[name=?]", "user[name]",false
-      assert_select "[name=?]", "user[password]"
-      assert_select "[name=?]", "user[password_confirmation]"
     end
   
     test "should get new" do
       get :new
       assert_response :success
-      assert_select "form"
-      assert_select "#user_email"
-      assert_select "[name=?]","utf8"
-      assert_select "[name=?]", "user[email]"
-      assert_select "[name=?]", "user[password]"
-      assert_select "[name=?]", "user[password_confirmation]"
     end
   
     test "should create user" do
@@ -107,22 +91,26 @@ module AsUser
       assert_equal 'User was successfully updated.', flash[:notice]
     end
   
-    test "should destroy user" do
+    test "can only destroy the singed_in user " do
       @user_for_destroy = FactoryGirl.create(:user)
       @user_for_stay = FactoryGirl.create(:user)
+      # can not destroy before login
       assert_no_difference('User.count') do
         delete :destroy, id: @user_for_destroy
       end
+
+      # login
       sign_in @user_for_destroy
+
+      # can not destroy other user
       assert_no_difference('User.count') do
         delete :destroy, id: @user_for_stay
       end
-      assert_redirected_to root_path
+
+      # can destroy myself
       assert_difference('User.count', -1) do
         delete :destroy, id: @user_for_destroy
       end
-  
-      assert_redirected_to users_path
     end
   end
 end