added a few more tests and removed redundant check in admin and user controllers (#58)

Author: dasolyoon

app/controllers/admins_controller.rb

@@ -1,9 +1,7 @@
 class AdminsController < ApplicationController
 
   skip_before_filter :authenticate, :only => ['new', 'create']
-  before_filter :validate_admin, :except => ['new', 'create']
-  before_filter :set_admin, :except => ['new', 'create']
-
+  before_filter :validate_admin, :set_admin, :except => ['new', 'create']
 
   def new
     @admin = Admin.new
@@ -63,12 +61,6 @@ def validate_admin
 
   def set_admin
     @admin = Admin.find_by_id session[:user_id]
-    if @admin.nil?
-      session[:user_id] = nil
-      session[:is_admin] = false
-      return redirect_to '/'
-    end
-      
   end
 
   def admin_params

app/controllers/team_controller.rb

@@ -21,15 +21,15 @@ def unsubmit
   def edit
     @user_to_remove = User.find_by_id(params[:unwanted_user])
     @user_to_remove.leave_team
-    @team.withdraw_submission
     notice = ""
 
     if @user.is_a? Admin and @team.approved
       @team.withdraw_approval
     elsif @team.submitted
       notice = " Your team's submission has been withdrawn."
     end
-    
+
+    @team.withdraw_submission
     return redirect_to without_team_path if @user_to_remove == @user
     return redirect_to team_path(@team.id), notice: "Removed #{@user_to_remove.name} from team." + notice
   end

app/controllers/users_controller.rb

@@ -65,10 +65,6 @@ def update
   private
   def set_user
     @user = User.find_by_id session[:user_id]
-    if @user.nil?
-      session[:user_id] = nil
-      return redirect_to '/'
-    end
   end
 
   def user_params

features/redirect.feature

@@ -8,8 +8,11 @@ Feature: go to the correct page
     Given the following users exist
      | name   |       email                    | password   | team_passcode | major           | sid  |
   	 | Jorge  | legueoflegends667@hotmail.com  | password1  | 0             | Football Player | 999  |
- 	 | Sahai  | eecs666@hotmail.com            | mypassword | penguindrool  | EECS            | 000  |
- 	 | Copy   | anotheremail@yahoo.com         | anotherpsw | ok            | CS              | 001  |
+   	 | Sahai  | eecs666@hotmail.com            | mypassword | penguindrool  | EECS            | 000  |
+   	 | Copy   | anotheremail@yahoo.com         | anotherpsw | ok            | CS              | 001  |
+    And the following admins exist
+      | name | email                  | password |
+  	  | Bob  | supreme_ruler@aol.com  | ilikcats |
 
     And I am on the login page
 
@@ -83,4 +86,4 @@ Feature: go to the correct page
 
   Scenario: Only an admin can access that specific admin's page
     When I go to the 999_admin page
-    Then I should be on the login page
+    Then I should be on the login page

spec/controllers/admins_controller_spec.rb

@@ -9,8 +9,20 @@
 
     #admins_controller = class_double("AdminsController")
     #admins_controller.team_list_email #BREAKS
-    
-    
+  end
+  
+  describe "session has information for an admin that does not exist" do
+    it "should not show the page for a deleted account" do
+      Admin.create!({:name => "admin", :email => "[email protected]", :password => "123"})
+      session[:user_id] = 1
+      session[:is_admin] = true
+      get :show, {:id => 1}
+      response.should render_template(:show)
+  
+      Admin.find_by_id(1).destroy!
+      get :show, {:id => 1}
+      response.should redirect_to(login_path)
+    end
   end
 
 

spec/controllers/users_controller_spec.rb

@@ -1,10 +1,18 @@
 require 'spec_helper'
 
 RSpec.describe UsersController, type: :controller do
-
-  describe "a successful new login" do
-    
-    
+  
+  describe "session has information for a user that does not exist" do
+    it "should not show the page for a deleted account" do
+      User.create!({ :name => "John", :major => "English", :sid => "111", :email => "[email protected]", :password => "132619"})
+      session[:user_id] = 1
+      post :start_team
+      response.should redirect_to(team_path(1))
+  
+      User.find_by_id(1).destroy!
+      post :start_team
+      response.should redirect_to(login_path)
+    end
   end