Commit 4b06847a

@@ -5,7 +5,6 @@ class ApplicationController < ActionController::Base
   before_filter :load_categories
   before_filter :load_tutorials
   before_filter :load_users
-  before_filter :load_user
   before_filter :configure_permitted_parameters, if: :devise_controller?
 
   private
@@ -27,10 +26,6 @@ class ApplicationController < ActionController::Base
     @top_members = User.order(:creations_count => :desc).limit(3)
   end
 
-  def load_user
-    @user = current_user if current_user
-  end
-
   protected
 
   def configure_permitted_parameters

@@ -6,9 +6,9 @@ class PasswordsController < ApplicationController
   end
 
   def update
-    user = current_user
-    if user.change_password(params[:user][:password], params[:user][:password_confirmation])
-      sign_in(user, :bypass => true) unless Rails.env.test?
+    @user = current_user
+    if @user.change_password(params[:user][:password], params[:user][:password_confirmation])
+      sign_in(@user, :bypass => true) unless Rails.env.test?
       flash[:notice] = t('passwords.updated')
       render :index
     else

@@ -3,7 +3,7 @@
     <ul class="nav nav-tabs">
       <li class="<%= selected == :basic_info ? "active" : "" %>"><%= link_to "Settings", settings_path %></li>
       <li class="<%= selected == :password ? "active" : "" %>"><%= link_to "Password", pwd_path %></li>
-      <li class="<%= selected == :picture ? "active" : "" %>"><%= link_to "Picture", edit_avatar_path(@user) %></li>
+      <li class="<%= selected == :picture ? "active" : "" %>"><%= link_to "Picture", edit_avatar_path(current_user) %></li>
       <li class="<%= selected == :creations ? "active" : "" %>"><%= link_to "Creations", mine_creations_path %></li>
       <li class="<%= selected == :favorites ? "active" : "" %>"><%= link_to "Favorites", profiles_favorites_path %></li>
     </ul>

@@ -3,8 +3,8 @@ require "spec_helper"
 describe SettingsController do
   describe :index do
     it "should load the current user" do
-      user = build(:user)
-      controller.stub(:current_user).and_return(user)
+      user = create(:user)
+      http_login(user)
       get :index
       assigns(:user).should == user
     end