Remove login_as from specs. That made more specs pass, though not all…

… are passing yet. [#19]

spec/controllers/events_controller_spec.rb

@@ -2,7 +2,7 @@
 
 describe EventsController, "index" do
   before(:each) do
-    login_as User.make
+    UserSession.create User.make
   end
 
   it "should be successful" do
@@ -151,7 +151,7 @@
 
   it "should list events if given a valid feed_key" do
     @user = User.make
-    login_as @user
+    UserSession.create @user
     calendar = Calendar.make # @user will be subscribed to
     @events = (1..5).map{Event.make(:calendar => calendar)}
     User.stub!(:find_by_feed_key).and_return(@user)
@@ -163,7 +163,7 @@
 
 describe EventsController, 'index.pdf' do
   before(:each) do
-    login_as User.make
+    UserSession.create User.make
     controller.stub!(:login_required).and_return(true)
     controller.stub!(:current_objects).and_return([mock_model(Event, :null_object => true)])
   end
@@ -192,7 +192,7 @@
 describe EventsController, "change_status" do
   before(:each) do
     @user = User.make
-    login_as @user
+    UserSession.create @user
   end
 
   it "should change attendance status for current user if called with a non-nil event id" do
@@ -222,14 +222,13 @@
 
 describe EventsController, "new" do
   before(:each) do
-    login_as User.make
+    @session = UserSession.create User.make
   end
 
   it "should require login" do
     get :new
     response.should be_success
-    login_as nil
-    controller.stub!(:login_required).and_return(nil)
+    @session.destroy
     get :new
     response.body.should be_blank # not sure why this works and nothing else does...
   end
@@ -269,7 +268,7 @@
 
 describe EventsController, "create" do
   before(:each) do
-    login_as User.make
+    UserSession.create User.make
   end
 
   it "should save an Event object" do
@@ -289,7 +288,7 @@
   before(:each) do
     @event = Event.make
     @admin = admin_user(@event.calendar)
-    login_as @admin
+    UserSession.create @admin
   end
 
   it "should redirect to list with an error if the user does not own the event and is not an admin" do
@@ -373,7 +372,7 @@
 
 describe EventsController, "show" do
   before(:each) do
-    login_as User.make
+    UserSession.create User.make
     controller.stub!(:login_required).and_return(true)
   end
 
@@ -404,14 +403,14 @@
   end
 
   it "should not work from non-admin account" do
-    login_as User.make
+    UserSession.create User.make
     @event.should_not_receive(:hide)
     post 'delete', :id => @id
     flash[:error].should_not be_nil
   end
 
   it "should work from admin account" do
-    login_as admin_user(@event.calendar)
+    UserSession.create admin_user(@event.calendar)
     Event.should_receive(:find).with(@id.to_i).and_return(@event)
     @event.should_receive(:hide)
     post 'delete', :id => @id
@@ -422,7 +421,7 @@
 
 describe EventsController, "map" do
   before(:each) do
-    login_as User.make
+    UserSession.create User.make
     @one = Event.make
   end
 
@@ -467,7 +466,7 @@
 describe EventsController, "export" do
   before(:each) do
     user = User.make
-    login_as user
+    UserSession.create user
     @my_event = Event.make
     Event.should_receive(:find).with(@my_event.id.to_i).and_return(@my_event)
   end

spec/controllers/user_sessions_controller_spec.rb

@@ -15,7 +15,7 @@
   end
 
   it 'logs out' do
-    login_as User.make
+    UserSession.create User.make
     get :destroy
     session[:user_id].should be_nil
     response.should be_redirect
@@ -34,7 +34,7 @@
   end
 
   it 'deletes token on logout' do
-    login_as User.make
+    UserSession.create User.make
     get :destroy
     response.cookies["auth_token"].should be_blank
   end

spec/controllers/users_controller_spec.rb

@@ -72,7 +72,7 @@ def create_user(options = {})
 describe UsersController, "edit" do
  before(:each) do
     @user = User.make
-    login_as @user
+    UserSession.create @user
     get :edit
   end
 
@@ -103,7 +103,7 @@ def create_user(options = {})
     @user.errors.should_not be_empty
 
     @user = User.make
-    login_as @user
+    UserSession.create @user
     get :edit
     my_attr = @user.attributes
     my_attr[:password] = nil

spec/views/events/_event.html.haml_spec.rb

@@ -8,15 +8,15 @@
   before(:each) do
     @event = Event.make(:description => 'Testing use of *Markdown*.')
     @user = User.make
-    login_as @user
+    UserSession.create @user
   end
 
   it "should contain edit and delete links for the event, if the current user is an admin" do
     admin = User.make do |u|
       u.permissions.destroy_all
       u.permissions.make(:admin, :calendar => @event.calendar)
     end
-    login_as admin
+    UserSession.create admin
 
     render_view
     edit_url = url_for(:controller => 'events', :action => 'edit', :id => @event.id, :escape => false)

spec/views/events/index.html.haml_spec.rb

@@ -14,7 +14,7 @@ def name_selector(string)
     assigns[:events] = @events
     @user = User.make
     assigns[:current_user] = @user
-    login_as @user
+    UserSession.create @user
   end
 
  it "should have a date limiting form" do

spec/views/events/new.html.haml_spec.rb

@@ -2,14 +2,14 @@
 
 describe "/events/new" do
   before(:each) do
-    login_as User.make # just for Calendar callback
+    UserSession.create User.make # just for Calendar callback
     c = Calendar.make
     user = User.make do |u|
       u.permissions.make do |p|
         p.calendar = c
       end
     end
-    login_as user
+    UserSession.create user
     assigns[:current_object] = Event.make
     render 'events/new'
   end
@@ -69,7 +69,7 @@
 
 describe "/events/new (multiple calendars)" do
   before(:each) do
-    login_as User.make
+    UserSession.create User.make
     @one = Calendar.make(:id => 1, :name => 'Calendar 1')
     @two = Calendar.make(:id => 2, :name => 'Calendar 2')
     assigns[:current_object] = Event.make(:date => Time.now, :calendar => @one)
@@ -79,7 +79,7 @@
     @quentin = User.make do |u|
       [@one, @two].each{|c| u.permissions.make(:calendar => c)}
     end
-    login_as(@quentin)
+    UserSession.create(@quentin)
     render '/events/new'
     response.should have_tag('select#event_calendar_id')
   end
@@ -88,7 +88,7 @@
     @jim = User.make do |u|
       u.permissions.make(:calendar => @one)
     end
-    login_as(@jim)
+    UserSession.create(@jim)
     render '/events/new'
     response.should_not have_tag('select#event_calendar_id')
     response.should have_tag("input[type=hidden][value=#{@one.id}]#event_calendar_id")