From 865d7d18cbf69f81372648c6ed8d7114de09f26a Mon Sep 17 00:00:00 2001 From: maxwell Date: Sun, 13 Jun 2010 20:00:31 -0700 Subject: [PATCH] user login now drops to a dashboard page --- app/views/users/index.html.haml | 8 ++++---- spec/controllers/users_controller_spec.rb | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml index 7d8171db7..352fec214 100644 --- a/app/views/users/index.html.haml +++ b/app/views/users/index.html.haml @@ -1,10 +1,10 @@ -- title "Users" +- title "Dashboard" %table %tr + %th User %th Password - for user in @users %tr - %td= user.password - -%p= link_to "New User", new_user_path + %td= user.email + %td= user.encrypted_password diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index a22d30ea4..03690c972 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -2,8 +2,9 @@ require File.dirname(__FILE__) + '/../spec_helper' describe UsersController do render_views + #fixtures here? it 'should, after logging in redirect to the dashboard page' do - pending + puts "where is rafi" end end