From 906851f50f0048c9db189b65850c1b52e599a340 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Mon, 19 Mar 2012 01:20:31 +0000 Subject: [PATCH] Add UserControllersHelpers to assign user in session --- spec/controllers/api/application_controller_spec.rb | 4 +++- spec/controllers/api/playlists_controller_spec.rb | 4 +++- spec/controllers/home_controller_spec.rb | 4 +++- spec/controllers/playlists_controller_spec.rb | 4 +++- spec/controllers/sounds_controller_spec.rb | 4 +++- spec/controllers/tracks_controller_spec.rb | 4 +++- spec/support/user_controllers_helpers.rb | 5 +++++ 7 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 spec/support/user_controllers_helpers.rb diff --git a/spec/controllers/api/application_controller_spec.rb b/spec/controllers/api/application_controller_spec.rb index 810a940..3ce0037 100644 --- a/spec/controllers/api/application_controller_spec.rb +++ b/spec/controllers/api/application_controller_spec.rb @@ -1,8 +1,10 @@ require 'spec_helper' describe Api::ApplicationController do + include UserControllerHelpers + before do - controller.current_user = Factory.create(:user) + sign_in end context 'CORS: Cross-Origin Ressource Sharing' do diff --git a/spec/controllers/api/playlists_controller_spec.rb b/spec/controllers/api/playlists_controller_spec.rb index 7e04cd4..977a62f 100644 --- a/spec/controllers/api/playlists_controller_spec.rb +++ b/spec/controllers/api/playlists_controller_spec.rb @@ -1,8 +1,10 @@ require 'spec_helper' describe Api::PlaylistsController do + include UserControllerHelpers + before do - controller.current_user = Factory.create(:user) + sign_in end describe 'GET index' do diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb index e2c0bb8..4cef034 100644 --- a/spec/controllers/home_controller_spec.rb +++ b/spec/controllers/home_controller_spec.rb @@ -1,8 +1,10 @@ require 'spec_helper' describe HomeController do + include UserControllerHelpers + before do - controller.current_user = Factory.create(:user) + sign_in end describe 'GET index' do diff --git a/spec/controllers/playlists_controller_spec.rb b/spec/controllers/playlists_controller_spec.rb index f35db90..27ba1a9 100644 --- a/spec/controllers/playlists_controller_spec.rb +++ b/spec/controllers/playlists_controller_spec.rb @@ -1,8 +1,10 @@ require 'spec_helper' describe PlaylistsController do + include UserControllerHelpers + before do - controller.current_user = Factory.create(:user) + sign_in end describe 'GET index' do diff --git a/spec/controllers/sounds_controller_spec.rb b/spec/controllers/sounds_controller_spec.rb index 3274507..69b2129 100644 --- a/spec/controllers/sounds_controller_spec.rb +++ b/spec/controllers/sounds_controller_spec.rb @@ -1,8 +1,10 @@ require 'spec_helper' describe SoundsController do + include UserControllerHelpers + before do - controller.current_user = Factory.create(:user) + sign_in end describe 'GET show' do diff --git a/spec/controllers/tracks_controller_spec.rb b/spec/controllers/tracks_controller_spec.rb index 7e2dd92..4e3a87a 100644 --- a/spec/controllers/tracks_controller_spec.rb +++ b/spec/controllers/tracks_controller_spec.rb @@ -1,8 +1,10 @@ require 'spec_helper' describe TracksController do + include UserControllerHelpers + before do - controller.current_user = Factory.create(:user) + sign_in end describe 'GET show' do diff --git a/spec/support/user_controllers_helpers.rb b/spec/support/user_controllers_helpers.rb new file mode 100644 index 0000000..f8569f2 --- /dev/null +++ b/spec/support/user_controllers_helpers.rb @@ -0,0 +1,5 @@ +module UserControllerHelpers + def sign_in + controller.current_user = Factory.create(:user) + end +end