From 183dc71b76fb2d95681fc81633bced96ba814b7e Mon Sep 17 00:00:00 2001 From: Gnat Date: Fri, 21 Dec 2012 00:30:01 +0000 Subject: [PATCH] Unconfirmed users don't show on members index page --- app/controllers/members_controller.rb | 2 +- spec/controllers/member_controller_spec.rb | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index edca03b9c..63f0ccab8 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -1,6 +1,6 @@ class MembersController < ApplicationController def index - @members = User.all + @members = User.where('confirmed_at IS NOT NULL') respond_to do |format| format.html # index.html.haml diff --git a/spec/controllers/member_controller_spec.rb b/spec/controllers/member_controller_spec.rb index e29ec2523..afeef9de7 100644 --- a/spec/controllers/member_controller_spec.rb +++ b/spec/controllers/member_controller_spec.rb @@ -2,10 +2,24 @@ require 'spec_helper' describe MembersController do - login_user + before :each do + @user1 = User.create!( + :username => "fred", + :password => "mynameisfred", + :email => "fred@example.com", + :tos_agreement => true + ) + @user2 = User.create!( + :username => "bob", + :password => "mynameisbob", + :email => "bob@example.com", + :tos_agreement => true + ) + @user1.confirm! + end describe "GET index" do - it "assigns all members as @members" do + it "assigns only confirmed members as @members" do user = User.find('fred') get :index, {} assigns(:members).should eq([user])