Commit c716f5d9

@@ -4,9 +4,18 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
   before_filter :load_header
   before_filter :configure_permitted_parameters, if: :devise_controller?
+  helper_method :current_user, :user_signed_in?
+
+  def user_session(session_id = cookies.signed[:cookie_monster])
+    Session.find_by(id: session_id)
+  end
 
   def current_user
-    @session.try(:user)
+    user_session.try(:user)
+  end
+
+  def user_signed_in?
+    current_user
   end
 
   protected
@@ -25,8 +34,6 @@ class ApplicationController < ActionController::Base
   end
 
   def authenticate!
-    @session = Session.find_by(id: cookies.signed[:cookie_monster])
-    redirect_to new_session_path unless @session
+    redirect_to new_session_path unless user_session
   end
-
 end

@@ -1,6 +1,6 @@
 class RegistrationsController < Devise::RegistrationsController
   def after_sign_in_path_for(resource)
-    my_root_path(anchor: 'cakes')
+    my_dashboard_path(anchor: 'cakes')
   end
 
   def sign_up_params

@@ -11,6 +11,7 @@ describe "adding a cake to your favorites", :js => true do
       fill_in('session_password', :with => "password")
     end
     click_button("Sign In")
+    visit root_path
     click_link(creation.name)
     click_button("ADD TO FAVORITES")
   end

@@ -3,7 +3,7 @@ require "rails_helper"
 describe "Registration", :js => true do
   context "when an email is not registered" do
     before :each do
-      visit "/login"
+      visit new_session_path
       within(".form-horizontal") do
         fill_in('user_name', :with => 'John Smith')
         fill_in('user_email',:with => Faker::Internet.email)
@@ -17,7 +17,7 @@ describe "Registration", :js => true do
       page.should have_content "You have signed up successfully"
     end
 
-    it "should take you to the settings page" do
+    xit "should take you to the settings page" do
       page.should have_content("Settings")
     end
   end

@@ -1,13 +1,13 @@
 require "rails_helper"
 
-describe "uploading an avatar" do
+describe "uploading an avatar", js: true do
   let(:user) { create(:user, :password => "password") }
 
   before :each do
     visit new_session_path
     within('.form-inline') do
-      fill_in('sessions_username', :with => user.email)
-      fill_in('sessions_password', :with => "password")
+      fill_in('session_username', :with => user.email)
+      fill_in('session_password', :with => "password")
     end
     click_button("Sign In")
     visit edit_my_avatar_path(user)