fat_free_crm 0.11.3 → 0.11.4

data/spec/controllers/entities_controller_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe EntitiesController do
+
+  describe "parse_query_and_tags" do
+  
+    it "should parse empty string" do
+      str = ""
+      controller.send(:parse_query_and_tags, str).should == ['', '']
+    end
+  
+    it "should parse #tags" do
+      str = "#test"
+      controller.send(:parse_query_and_tags, str).should == ['', 'test']
+    end
+    
+    it "should parse no tags" do
+      str = "test query"
+      controller.send(:parse_query_and_tags, str).should == ['test query', '']
+    end
+    
+    it "should parse tags and query" do
+      str = "#real Billy Bones #pirate"
+      controller.send(:parse_query_and_tags, str).should == [ "Billy Bones", "real, pirate" ]
+    end
+
+    it "should parse strange characters" do
+      str = "#this is #a test !@$%^~ #parseme"
+      controller.send(:parse_query_and_tags, str).should == ['is test !@$%^~', 'this, a, parseme']
+    end
+    
+    it "should strip whitespace" do
+      str = "     test    me    "
+      controller.send(:parse_query_and_tags, str).should == ['test me', '']
+    end
+
+  end
+
+end

data/spec/controllers/home_controller_spec.rb

@@ -10,11 +10,65 @@ describe HomeController do
     end
 
     it "should get a list of activities" do
-      @activity = FactoryGirl.create(:version, :item => FactoryGirl.create(:account, :user => @current_user))
-      controller.should_receive(:get_activities).once.and_return([ @activity ])
+      activity = FactoryGirl.create(:version, :item => FactoryGirl.create(:account, :user => current_user))
+      controller.should_receive(:get_activities).once.and_return([ activity ])
+      get :index
+      assigns[:activities].should == [ activity ]
+    end
+
+    it "should not include views in the list of activities" do
+      activity = FactoryGirl.create(:version, :item => FactoryGirl.create(:account, :user => @current_user), :event => "view")
+      controller.should_receive(:get_activities).once.and_return([])
 
       get :index
-      assigns[:activities].should == [ @activity ]
+      assigns[:activities].should == []
+    end
+
+    it "should get a list of my tasks ordered by due_at" do
+      task_1 = FactoryGirl.create(:task, :name => "Your first task", :bucket => "due_asap", :assigned_to => current_user.id)
+      task_2 = FactoryGirl.create(:task, :name => "Another task for you", :bucket => "specific_time", :calendar => 5.days.from_now.to_s, :assigned_to => current_user.id)
+      task_3 = FactoryGirl.create(:task, :name => "Third Task", :bucket => "due_next_week", :assigned_to => current_user.id)
+      task_4 = FactoryGirl.create(:task, :name => "i've assigned it to myself", :user => current_user, :calendar => 20.days.from_now.to_s, :assigned_to => nil, :bucket => "specific_time")
+
+      FactoryGirl.create(:task, :name => "Someone else's Task", :user_id => current_user.id, :bucket => "due_asap", :assigned_to => FactoryGirl.create(:user).id)
+      FactoryGirl.create(:task, :name => "Not my task", :bucket => "due_asap", :assigned_to => FactoryGirl.create(:user).id)
+
+      get :index
+      assigns[:my_tasks].should == [task_1, task_2, task_3, task_4]
+    end
+
+		it "should not display completed tasks" do
+			task_1 = FactoryGirl.create(:task, :user_id => current_user.id, :name => "Your first task", :bucket => "due_asap", :assigned_to => current_user.id)
+			task_2 = FactoryGirl.create(:task, :user_id => current_user.id, :name => "Completed task", :bucket => "due_asap", :completed_at => 1.days.ago, :completed_by => current_user.id, :assigned_to => current_user.id)
+
+			get :index
+			assigns[:my_tasks].should == [task_1]
+		end
+
+    it "should get a list of my opportunities ordered by closes_on" do
+      opportunity_1 = FactoryGirl.create(:opportunity, :name => "Your first opportunity", :closes_on => 15.days.from_now, :assigned_to => current_user.id, :stage => 'proposal')
+      opportunity_2 = FactoryGirl.create(:opportunity, :name => "Another opportunity for you", :closes_on => 10.days.from_now, :assigned_to => current_user.id, :stage => 'proposal')
+      opportunity_3 = FactoryGirl.create(:opportunity, :name => "Third Opportunity", :closes_on => 5.days.from_now, :assigned_to => current_user.id, :stage => 'proposal')
+      opportunity_4 = FactoryGirl.create(:opportunity, :name => "Fourth Opportunity", :closes_on => 50.days.from_now, :assigned_to => nil, :user_id => current_user.id, :stage => 'proposal')
+
+      FactoryGirl.create(:opportunity_in_pipeline, :name => "Someone else's Opportunity", :assigned_to => FactoryGirl.create(:user).id, :stage => 'proposal')
+      FactoryGirl.create(:opportunity_in_pipeline, :name => "Not my opportunity", :assigned_to => FactoryGirl.create(:user).id, :stage => 'proposal')
+
+      get :index
+      assigns[:my_opportunities].should == [opportunity_3, opportunity_2, opportunity_1, opportunity_4]
+    end
+
+    it "should get a list of my accounts ordered by name" do
+      account_1 = FactoryGirl.create(:account, :name => "Anderson", :assigned_to => current_user.id)
+      account_2 = FactoryGirl.create(:account, :name => "Wilson", :assigned_to => current_user.id)
+      account_3 = FactoryGirl.create(:account, :name => "Triple", :assigned_to => current_user.id)
+      account_4 = FactoryGirl.create(:account, :name => "Double", :assigned_to => nil, :user_id => current_user.id)
+
+      FactoryGirl.create(:account, :name => "Someone else's Account", :assigned_to => FactoryGirl.create(:user).id)
+      FactoryGirl.create(:account, :name => "Not my account", :assigned_to => FactoryGirl.create(:user).id)
+
+      get :index
+      assigns[:my_accounts].should == [account_1, account_4, account_3, account_2]
     end
 
     it "should assign @hello and call hook" do
@@ -34,9 +88,9 @@ describe HomeController do
     end
 
     it "should assign instance variables for user preferences" do
-      @asset = FactoryGirl.create(:preference, :user => @current_user, :name => "activity_asset", :value => Base64.encode64(Marshal.dump("tasks")))
-      @user = FactoryGirl.create(:preference, :user => @current_user, :name => "activity_user", :value => Base64.encode64(Marshal.dump("Billy Bones")))
-      @duration = FactoryGirl.create(:preference, :user => @current_user, :name => "activity_duration", :value => Base64.encode64(Marshal.dump("two days")))
+      @asset = FactoryGirl.create(:preference, :user => current_user, :name => "activity_asset", :value => Base64.encode64(Marshal.dump("tasks")))
+      @user = FactoryGirl.create(:preference, :user => current_user, :name => "activity_user", :value => Base64.encode64(Marshal.dump("Billy Bones")))
+      @duration = FactoryGirl.create(:preference, :user => current_user, :name => "activity_duration", :value => Base64.encode64(Marshal.dump("two days")))
 
       xhr :get, :options
       assigns[:asset].should == "tasks"
@@ -63,13 +117,13 @@ describe HomeController do
 
     it "should save user selected options" do
       xhr :post, :redraw, :asset => "tasks", :user => "Billy Bones", :duration => "two days"
-      @current_user.pref[:activity_asset].should == "tasks"
-      @current_user.pref[:activity_user].should == "Billy Bones"
-      @current_user.pref[:activity_duration].should == "two days"
+      current_user.pref[:activity_asset].should == "tasks"
+      current_user.pref[:activity_user].should == "Billy Bones"
+      current_user.pref[:activity_duration].should == "two days"
     end
 
     it "should get a list of activities" do
-      @activity = FactoryGirl.create(:version, :item => FactoryGirl.create(:account, :user => @current_user))
+      @activity = FactoryGirl.create(:version, :item => FactoryGirl.create(:account, :user => current_user))
       controller.should_receive(:get_activities).once.and_return([ @activity ])
 
       get :index
@@ -94,6 +148,42 @@ describe HomeController do
       session[:hello].should == true
     end
   end
+  
+  describe "activity_user" do
+  
+    before(:each) do
+      @user = mock(User, :id => 1, :is_a? => true)
+      @cur_user = mock(User)
+    end
+  
+    it "should find a user by email" do
+      @cur_user.stub!(:pref).and_return(:activity_user => 'billy@example.com')
+      controller.instance_variable_set(:@current_user, @cur_user)
+      User.should_receive(:where).with(:email => 'billy@example.com').and_return([@user])
+      controller.send(:activity_user).should == 1
+    end
+    
+    it "should find a user by first name or last name" do
+      @cur_user.stub!(:pref).and_return(:activity_user => 'Billy')
+      controller.instance_variable_set(:@current_user, @cur_user)
+      User.should_receive(:where).with("upper(first_name) LIKE upper('%Billy%') OR upper(last_name) LIKE upper('%Billy%')").and_return([@user])
+      controller.send(:activity_user).should == 1
+    end
+    
+    it "should find a user by first name and last name" do
+      @cur_user.stub!(:pref).and_return(:activity_user => 'Billy Elliot')
+      controller.instance_variable_set(:@current_user, @cur_user)
+      User.should_receive(:where).with("(upper(first_name) LIKE upper('%Billy%') AND upper(last_name) LIKE upper('%Elliot%')) OR (upper(first_name) LIKE upper('%Elliot%') AND upper(last_name) LIKE upper('%Billy%'))").and_return([@user])
+      controller.send(:activity_user).should == 1
+    end
+    
+    it "should return nil when 'all_users' is specified" do
+      @cur_user.stub!(:pref).and_return(:activity_user => 'all_users')
+      controller.instance_variable_set(:@current_user, @cur_user)
+      User.should_not_receive(:where)
+      controller.send(:activity_user).should == nil
+    end
+    
+  end
 
 end
-

data/spec/controllers/tasks_controller_spec.rb

@@ -62,7 +62,7 @@ describe TasksController do
     TASK_STATUSES.each do |view|
 
       it "should expose all tasks as @tasks and render [index] template for #{view} view" do
-        @tasks = produce_tasks(@current_user, view)
+        @tasks = produce_tasks(current_user, view)
 
         get :index, :view => view
 
@@ -73,7 +73,7 @@ describe TasksController do
       end
 
       it "should render all tasks as JSON for #{view} view" do
-        @tasks = produce_tasks(@current_user, view)
+        @tasks = produce_tasks(current_user, view)
 
         request.env["HTTP_ACCEPT"] = "application/json"
         get :index, :view => view
@@ -92,7 +92,7 @@ describe TasksController do
       end
 
       it "should render all tasks as xml for #{view} view" do
-        @tasks = produce_tasks(@current_user, view)
+        @tasks = produce_tasks(current_user, view)
 
         request.env["HTTP_ACCEPT"] = "application/xml"
         get :index, :view => view
@@ -144,16 +144,14 @@ describe TasksController do
   describe "responding to GET new" do
 
     it "should expose a new task as @task and render [new] template" do
-      account = FactoryGirl.create(:account, :user => @current_user)
-      @task = FactoryGirl.build(:task, :user => @current_user, :asset => account)
+      account = FactoryGirl.create(:account, :user => current_user)
+      @task = FactoryGirl.build(:task, :user => current_user, :asset => account)
       Task.stub!(:new).and_return(@task)
-      @users = [ FactoryGirl.create(:user) ]
       @bucket = Setting.unroll(:task_bucket)[1..-1] << [ "On Specific Date...", :specific_time ]
       @category = Setting.unroll(:task_category)
 
       xhr :get, :new
       assigns[:task].should == @task
-      assigns[:users].should == @users
       assigns[:bucket].should == @bucket
       assigns[:category].should == @category
       response.should render_template("tasks/new")
@@ -192,15 +190,13 @@ describe TasksController do
   describe "responding to GET edit" do
 
     it "should expose the requested task as @task and render [edit] template" do
-      @asset = FactoryGirl.create(:account, :user => @current_user)
-      @task = FactoryGirl.create(:task, :user => @current_user, :asset => @asset)
-      @users = [ FactoryGirl.create(:user) ]
+      @asset = FactoryGirl.create(:account, :user => current_user)
+      @task = FactoryGirl.create(:task, :user => current_user, :asset => @asset)
       @bucket = Setting.unroll(:task_bucket)[1..-1] << [ "On Specific Date...", :specific_time ]
       @category = Setting.unroll(:task_category)
 
       xhr :get, :edit, :id => @task.id
       assigns[:task].should == @task
-      assigns[:users].should == @users
       assigns[:bucket].should == @bucket
       assigns[:category].should == @category
       assigns[:asset].should == @asset
@@ -208,8 +204,8 @@ describe TasksController do
     end
 
     it "should find previously open task when necessary" do
-      @task = FactoryGirl.create(:task, :user => @current_user)
-      @previous = FactoryGirl.create(:task, :id => 999, :user => @current_user)
+      @task = FactoryGirl.create(:task, :user => current_user)
+      @previous = FactoryGirl.create(:task, :id => 999, :user => current_user)
 
       xhr :get, :edit, :id => @task.id, :previous => 999
       assigns[:task].should == @task
@@ -219,7 +215,7 @@ describe TasksController do
 
     describe "(task got deleted or reassigned)" do
       it "should reload current page with the flash message if the task got deleted" do
-        @task = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => @current_user)
+        @task = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => current_user)
         @task.destroy
 
         xhr :get, :edit, :id => @task.id
@@ -238,8 +234,8 @@ describe TasksController do
 
     describe "(previous task got deleted or reassigned)" do
       before(:each) do
-        @task = FactoryGirl.create(:task, :user => @current_user)
-        @previous = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => @current_user)
+        @task = FactoryGirl.create(:task, :user => current_user)
+        @previous = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => current_user)
       end
 
       it "should notify the view if previous task got deleted" do
@@ -270,7 +266,7 @@ describe TasksController do
     describe "with valid params" do
 
       it "should expose a newly created task as @task and render [create] template" do
-        @task = FactoryGirl.build(:task, :user => @current_user)
+        @task = FactoryGirl.build(:task, :user => current_user)
         Task.stub!(:new).and_return(@task)
 
         xhr :post, :create, :task => { :name => "Hello world" }
@@ -282,7 +278,7 @@ describe TasksController do
 
       [ "", "?view=pending", "?view=assigned", "?view=completed" ].each do |view|
         it "should update tasks sidebar when [create] is being called from [/tasks#{view}] page" do
-          @task = FactoryGirl.build(:task, :user => @current_user)
+          @task = FactoryGirl.build(:task, :user => current_user)
           Task.stub!(:new).and_return(@task)
 
           request.env["HTTP_REFERER"] = "http://localhost/tasks#{view}"
@@ -295,7 +291,7 @@ describe TasksController do
     describe "with invalid params" do
 
       it "should expose a newly created but unsaved task as @lead and still render [create] template" do
-        @task = FactoryGirl.build(:task, :name => nil, :user => @current_user)
+        @task = FactoryGirl.build(:task, :name => nil, :user => current_user)
         Task.stub!(:new).and_return(@task)
 
         xhr :post, :create, :task => {}
@@ -314,7 +310,7 @@ describe TasksController do
 
     describe "with valid params" do
       it "should update the requested task, expose it as @task, and render [update] template" do
-        @task = FactoryGirl.create(:task, :name => "Hi", :user => @current_user)
+        @task = FactoryGirl.create(:task, :name => "Hi", :user => current_user)
 
         xhr :put, :update, :id => @task.id, :task => { :name => "Hello" }
         @task.reload.name.should == "Hello"
@@ -326,7 +322,7 @@ describe TasksController do
 
       [ "", "?view=pending", "?view=assigned", "?view=completed" ].each do |view|
         it "should update tasks sidebar when [update] is being called from [/tasks#{view}] page" do
-          @task = FactoryGirl.create(:task, :name => "Hi", :user => @current_user)
+          @task = FactoryGirl.create(:task, :name => "Hi", :user => current_user)
 
           request.env["HTTP_REFERER"] = "http://localhost/tasks#{view}"
           xhr :put, :update, :id => @task.id, :task => { :name => "Hello" }
@@ -337,7 +333,7 @@ describe TasksController do
 
     describe "with invalid params" do
       it "should not update the task, but still expose it as @task and render [update] template" do
-        @task = FactoryGirl.create(:task, :name => "Hi", :user => @current_user)
+        @task = FactoryGirl.create(:task, :name => "Hi", :user => current_user)
 
         xhr :put, :update, :id => @task.id, :task => { :name => nil }
         @task.reload.name.should == "Hi"
@@ -350,7 +346,7 @@ describe TasksController do
 
     describe "task got deleted or reassigned" do
       it "should reload current page with the flash message if the task got deleted" do
-        @task = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => @current_user)
+        @task = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => current_user)
         @task.destroy
 
         xhr :put, :update, :id => @task.id, :task => { :name => "Hello" }
@@ -374,7 +370,7 @@ describe TasksController do
   describe "responding to DELETE destroy" do
 
     it "should destroy the requested task and render [destroy] template" do
-      @task = FactoryGirl.create(:task, :user => @current_user)
+      @task = FactoryGirl.create(:task, :user => current_user)
 
       xhr :delete, :destroy, :id => @task.id, :bucket => "due_asap"
       assigns(:task).should == @task
@@ -385,7 +381,7 @@ describe TasksController do
 
     [ "", "?view=pending", "?view=assigned", "?view=completed" ].each do |view|
       it "should update sidebar when [destroy] is being called from [/tasks#{view}]" do
-        @task = FactoryGirl.create(:task, :user => @current_user)
+        @task = FactoryGirl.create(:task, :user => current_user)
 
         request.env["HTTP_REFERER"] = "http://localhost/tasks#{view}"
         xhr :delete, :destroy, :id => @task.id, :bucket => "due_asap"
@@ -394,7 +390,7 @@ describe TasksController do
     end
 
     it "should not update sidebar when [destroy] is being called from asset page" do
-      @task = FactoryGirl.create(:task, :user => @current_user)
+      @task = FactoryGirl.create(:task, :user => current_user)
 
       xhr :delete, :destroy, :id => @task.id
       assigns[:task_total].should == nil
@@ -402,7 +398,7 @@ describe TasksController do
 
     describe "task got deleted or reassigned" do
       it "should reload current page with the flash message if the task got deleted" do
-        @task = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => @current_user)
+        @task = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => current_user)
         @task.destroy
 
         xhr :delete, :destroy, :id => @task.id
@@ -426,7 +422,7 @@ describe TasksController do
   describe "responding to PUT complete" do
 
     it "should change task status, expose task as @task, and render [complete] template" do
-      @task = FactoryGirl.create(:task, :completed_at => nil, :user => @current_user)
+      @task = FactoryGirl.create(:task, :completed_at => nil, :user => current_user)
 
       xhr :put, :complete, :id => @task.id
       @task.reload.completed_at.should_not == nil
@@ -436,7 +432,7 @@ describe TasksController do
     end
 
     it "should change task status, expose task as @task, and render [complete] template where task.bucket = 'specific_time'" do
-      @task = FactoryGirl.create(:task, :completed_at => nil, :user => @current_user, :bucket => "specific_time", :calendar => "01/01/2010 1:00 AM")
+      @task = FactoryGirl.create(:task, :completed_at => nil, :user => current_user, :bucket => "specific_time", :calendar => "01/01/2010 1:00 AM")
 
       xhr :put, :complete, :id => @task.id
       @task.reload.completed_at.should_not == nil
@@ -446,7 +442,7 @@ describe TasksController do
     end
 
     it "should change update tasks sidebar if bucket is not empty" do
-      @task = FactoryGirl.create(:task, :completed_at => nil, :user => @current_user)
+      @task = FactoryGirl.create(:task, :completed_at => nil, :user => current_user)
 
       xhr :put, :complete, :id => @task.id, :bucket => "due_asap"
       assigns[:task_total].should be_an_instance_of(HashWithIndifferentAccess)
@@ -454,7 +450,7 @@ describe TasksController do
 
     describe "task got deleted or reassigned" do
       it "should reload current page with the flash message if the task got deleted" do
-        @task = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => @current_user)
+        @task = FactoryGirl.create(:task, :user => FactoryGirl.create(:user), :assignee => current_user)
         @task.destroy
 
         xhr :put, :complete, :id => @task.id
@@ -501,4 +497,3 @@ describe TasksController do
     end
   end
 end
-

data/spec/controllers/users_controller_spec.rb

@@ -20,7 +20,7 @@ describe UsersController do
 
     it "should expose current user as @user if no specific user was requested" do
       get :show
-      assigns[:user].should == @current_user
+      assigns[:user].should == current_user
       response.should render_template("users/show")
     end
 
@@ -38,7 +38,7 @@ describe UsersController do
       end
 
       it "should render current user as JSON if no specific user was requested" do
-        @current_user.should_receive(:to_json).and_return("generated JSON")
+        current_user.should_receive(:to_json).and_return("generated JSON")
 
         get :show
         response.body.should == "generated JSON"
@@ -59,7 +59,7 @@ describe UsersController do
       end
 
       it "should render current user as XML if no specific user was requested" do
-        @current_user.should_receive(:to_xml).and_return("generated XML")
+        current_user.should_receive(:to_xml).and_return("generated XML")
 
         get :show
         response.body.should == "generated XML"
@@ -99,12 +99,12 @@ describe UsersController do
   describe "responding to GET edit" do
     before(:each) do
       require_user
-      @user = @current_user
+      @user = current_user
     end
 
     it "should expose current user as @user and render [edit] template" do
       xhr :get, :edit, :id => @user.id
-      assigns[:user].should == @current_user
+      assigns[:user].should == current_user
       response.should render_template("users/edit")
     end
 
@@ -159,7 +159,7 @@ describe UsersController do
   describe "responding to PUT update" do
     before(:each) do
       require_user
-      @user = @current_user
+      @user = current_user
     end
 
     describe "with valid params" do
@@ -178,7 +178,7 @@ describe UsersController do
 
       it "should not update the user information and redraw [update] template" do
         xhr :put, :update, :id => @user.id, :user => { :first_name => nil }
-        @user.reload.first_name.should == @current_user.first_name
+        @user.reload.first_name.should == current_user.first_name
         assigns[:user].should == @user
         response.should render_template("users/update")
       end
@@ -207,12 +207,12 @@ describe UsersController do
   describe "responding to GET avatar" do
     before(:each) do
       require_user
-      @user = @current_user
+      @user = current_user
     end
 
     it "should expose current user as @user and render [avatar] template" do
       xhr :get, :avatar, :id => @user.id
-      assigns[:user].should == @current_user
+      assigns[:user].should == current_user
       response.should render_template("users/avatar")
     end
   end
@@ -223,7 +223,7 @@ describe UsersController do
   describe "responding to PUT update_avatar" do
     before(:each) do
       require_user
-      @user = @current_user
+      @user = current_user
     end
 
     it "should delete avatar if user chooses to use Gravatar" do
@@ -271,12 +271,12 @@ describe UsersController do
   describe "responding to GET avatar" do
     before(:each) do
       require_user
-      @user = @current_user
+      @user = current_user
     end
 
     it "should expose current user as @user and render [pssword] template" do
       xhr :get, :password, :id => @user.id
-      assigns[:user].should == @current_user
+      assigns[:user].should == current_user
       response.should render_template("users/password")
     end
   end
@@ -287,17 +287,17 @@ describe UsersController do
   describe "responding to PUT change_password" do
     before(:each) do
       require_user
-      @current_user_session.stub!(:unauthorized_record=).and_return(@current_user)
-      @current_user_session.stub!(:save).and_return(@current_user)
-      @user = @current_user
+      @current_user_session.stub!(:unauthorized_record=).and_return(current_user)
+      @current_user_session.stub!(:save).and_return(current_user)
+      @user = current_user
       @new_password = "secret?!"
     end
 
     it "should set new user password" do
       xhr :put, :change_password, :id => @user.id, :current_password => @user.password, :user => { :password => @new_password, :password_confirmation => @new_password }
-      assigns[:user].should == @current_user
-      @current_user.password.should == @new_password
-      @current_user.errors.should be_empty
+      assigns[:user].should == current_user
+      current_user.password.should == @new_password
+      current_user.errors.should be_empty
       flash[:notice].should_not == nil
       response.should render_template("users/change_password")
     end
@@ -305,36 +305,103 @@ describe UsersController do
     it "should allow to change password if current password is blank" do
       @user.password_hash = nil
       xhr :put, :change_password, :id => @user.id, :current_password => "", :user => { :password => @new_password, :password_confirmation => @new_password }
-      @current_user.password.should == @new_password
-      @current_user.errors.should be_empty
+      current_user.password.should == @new_password
+      current_user.errors.should be_empty
       flash[:notice].should_not == nil
       response.should render_template("users/change_password")
     end
 
     it "should not change user password if password field is blank" do
       xhr :put, :change_password, :id => @user.id, :current_password => @user.password, :user => { :password => "", :password_confirmation => "" }
-      assigns[:user].should == @current_user
-      @current_user.password.should == @user.password # password stays the same
-      @current_user.errors.should be_empty # no errors
+      assigns[:user].should == current_user
+      current_user.password.should == @user.password # password stays the same
+      current_user.errors.should be_empty # no errors
       flash[:notice].should_not == nil
       response.should render_template("users/change_password")
     end
 
     it "should require valid current password" do
       xhr :put, :change_password, :id => @user.id, :current_password => "what?!", :user => { :password => @new_password, :password_confirmation => @new_password }
-      @current_user.password.should == @user.password # password stays the same
-      @current_user.should have(1).error # .error_on(:current_password)
+      current_user.password.should == @user.password # password stays the same
+      current_user.should have(1).error # .error_on(:current_password)
       response.should render_template("users/change_password")
     end
 
     it "should require new password and password confirmation to match" do
       xhr :put, :change_password, :id => @user.id, :current_password => @user.password, :user => { :password => @new_password, :password_confirmation => "none" }
-      @current_user.password.should == @user.password # password stays the same
-      @current_user.should have(1).error # .error_on(:current_password)
+      current_user.password.should == @user.password # password stays the same
+      current_user.should have(1).error # .error_on(:current_password)
       response.should render_template("users/change_password")
     end
 
   end
 
-end
+  # GET /users/opportunities
+  # GET /users/opportunities.xml                                         HTML
+  #----------------------------------------------------------------------------
+  describe "responding to GET opportunities_overview" do
+    before(:each) do
+      require_user
+      @user = @current_user
+      @user.update_attributes(:first_name => "Apple", :last_name => "Boy")
+    end
+
+    it "should assign @users_with_opportunities" do
+      FactoryGirl.create(:opportunity, :stage => "prospecting", :assignee => @user)
+      xhr :get, :opportunities_overview
+      assigns[:users_with_opportunities].should == [@current_user]
+    end
+
+    it "@users_with_opportunities should be ordered by name" do
+      FactoryGirl.create(:opportunity, :stage => "prospecting", :assignee => @user)
+
+      user1 = FactoryGirl.create(:user, :first_name => "Zebra", :last_name => "Stripes")
+      FactoryGirl.create(:opportunity, :stage => "prospecting", :assignee => user1)
+
+      user2 = FactoryGirl.create(:user, :first_name => "Bilbo", :last_name => "Magic")
+      FactoryGirl.create(:opportunity, :stage => "prospecting", :assignee => user2)
+
+      xhr :get, :opportunities_overview
 
+      assigns[:users_with_opportunities].should == [@user, user2, user1]
+    end
+
+    it "should assign @unassigned_opportunities with only open unassigned opportunities" do
+      @o1 = FactoryGirl.create(:opportunity, :stage => "prospecting", :assignee => nil)
+      @o2 = FactoryGirl.create(:opportunity, :stage => "won", :assignee => nil)
+      @o3 = FactoryGirl.create(:opportunity, :stage => "prospecting", :assignee => nil)
+
+      xhr :get, :opportunities_overview
+
+      assigns[:unassigned_opportunities].should include(@o1, @o3)
+      assigns[:unassigned_opportunities].should_not include(@o2)
+    end
+
+    it "@unassigned_opportunities should be ordered by stage" do
+      @o1 = FactoryGirl.create(:opportunity, :stage => "proposal", :assignee => nil)
+      @o2 = FactoryGirl.create(:opportunity, :stage => "prospecting", :assignee => nil)
+      @o3 = FactoryGirl.create(:opportunity, :stage => "negotiation", :assignee => nil)
+
+      xhr :get, :opportunities_overview
+
+      assigns[:unassigned_opportunities].should == [@o3, @o1, @o2]
+    end
+
+    it "should not include users who have no assigned opportunities" do
+      xhr :get, :opportunities_overview
+      assigns[:users_with_opportunities].should == []
+    end
+
+    it "should not include users who have no open assigned opportunities" do
+      FactoryGirl.create(:opportunity, :stage => "won", :assignee => @user)
+
+      xhr :get, :opportunities_overview
+      assigns[:users_with_opportunities].should == []
+    end
+
+    it "should render opportunities overview" do
+      xhr :get, :opportunities_overview
+      response.should render_template("users/opportunities_overview")
+    end
+  end
+end