User pagination spec fix.

Nick Recobra
1 parent 6191e44e
Showing 1 changed file with 5 additions and 4 deletions Show diff stats
spec/controllers/users_controller_spec.rb
@@ -77,15 +77,16 @@ describe UsersController do
  
   context 'Signed in as an admin' do
     before do
-      sign_in Factory(:admin)
+      @user = Factory(:admin)
+      sign_in @user
     end
  
     context "GET /users" do
       it 'paginates all users' do
-        users = 3.times.inject(WillPaginate::Collection.new(1,30)) {|page,_| page << Factory.build(:user)}
-        User.should_receive(:paginate).and_return(users)
+        @user.update_attribute :per_page, 2
+        users = 3.times { Factory(:user) }
         get :index
-        assigns(:users).should == users
+        assigns(:users).size.should == 2
       end
     end
...	...	@@ -77,15 +77,16 @@ describe UsersController do
77	77
78	78	context 'Signed in as an admin' do
79	79	before do
80		- sign_in Factory(:admin)
	80	+ @user = Factory(:admin)
	81	+ sign_in @user
81	82	end
82	83
83	84	context "GET /users" do
84	85	it 'paginates all users' do
85		- users = 3.times.inject(WillPaginate::Collection.new(1,30)) {\|page,_\| page << Factory.build(:user)}
86		- User.should_receive(:paginate).and_return(users)
	86	+ @user.update_attribute :per_page, 2
	87	+ users = 3.times { Factory(:user) }
87	88	get :index
88		- assigns(:users).should == users
	89	+ assigns(:users).size.should == 2
89	90	end
90	91	end
91	92
...	...