Commit f9eecc8c

@@ -8,7 +8,7 @@ class PasswordsController < ApplicationController
   def update
     user = current_user
     if user.change_password(params[:user][:password], params[:user][:password_confirmation])
-      sign_in @user, :bypass => true
+      #sign_in user, :bypass => true
       flash[:notice] = "Your password has been updated successfully!"
       render :index
     else

@@ -17,8 +17,8 @@ describe AvatarsController do
           Avatar.last.avatar.should_not be_blank
         end
 
-        it "should redirect to the profile page" do
-          response.should redirect_to avatar_path(user)
+        it "should redirect to the avatar page" do
+          response.should redirect_to edit_avatar_path(user)
         end
 
         it "should display a flash notice" do

@@ -20,7 +20,7 @@ describe PasswordsController do
         before { put :update, :id => user.id, :user => { :password => 'foobar', :password_confirmation => 'barfoo' } }
 
         it "should display an error on the page" do
-          flash[:alert].should == I18n.t(:passwords_do_not_match)
+          flash[:error].should == I18n.t(:passwords_do_not_match)
         end
 
         it "should render the show template" do

@@ -128,12 +128,12 @@ describe User do
 
     let(:results) { User.all }
 
-    it "should load the person who signed up first first" do
-      results[0].should == first_person
+    it "should load the person who signed up first last" do
+      results[1].should == first_person
     end
 
-    it "should load the person who signed up next second" do
-      results[1].should == second_person
+    it "should load the person who signed up next first" do
+      results[0].should == second_person
     end
   end