fat_free_crm 0.11.3 → 0.11.4

data/spec/controllers/entities/contacts_controller_spec.rb

@@ -13,15 +13,16 @@ describe ContactsController do
   describe "responding to GET index" do
 
     it "should expose all contacts as @contacts and render [index] template" do
-      @contacts = [ FactoryGirl.create(:contact, :user => @current_user) ]
+      @contacts = [ FactoryGirl.create(:contact, :user => current_user) ]
       get :index
+      assigns[:contacts].count.should == @contacts.count
       assigns[:contacts].should == @contacts
       response.should render_template("contacts/index")
     end
 
     it "should perform lookup using query string" do
-      @billy_bones   = FactoryGirl.create(:contact, :user => @current_user, :first_name => "Billy",   :last_name => "Bones")
-      @captain_flint = FactoryGirl.create(:contact, :user => @current_user, :first_name => "Captain", :last_name => "Flint")
+      @billy_bones   = FactoryGirl.create(:contact, :user => current_user, :first_name => "Billy",   :last_name => "Bones")
+      @captain_flint = FactoryGirl.create(:contact, :user => current_user, :first_name => "Captain", :last_name => "Flint")
 
       get :index, :query => "bill"
       assigns[:contacts].should == [ @billy_bones ]
@@ -31,7 +32,7 @@ describe ContactsController do
 
     describe "AJAX pagination" do
       it "should pick up page number from params" do
-        @contacts = [ FactoryGirl.create(:contact, :user => @current_user) ]
+        @contacts = [ FactoryGirl.create(:contact, :user => current_user) ]
         xhr :get, :index, :page => 42
 
         assigns[:current_page].to_i.should == 42
@@ -42,13 +43,24 @@ describe ContactsController do
 
       it "should pick up saved page number from session" do
         session[:contacts_current_page] = 42
-        @contacts = [ FactoryGirl.create(:contact, :user => @current_user) ]
+        @contacts = [ FactoryGirl.create(:contact, :user => current_user) ]
         xhr :get, :index
 
         assigns[:current_page].should == 42
         assigns[:contacts].should == []
         response.should render_template("contacts/index")
       end
+
+      it "should reset current_page when query is altered" do
+        session[:contacts_current_page] = 42
+        session[:contacts_current_query] = "bill"
+        @contacts = [ FactoryGirl.create(:contact, :user => current_user) ]
+        xhr :get, :index
+
+        assigns[:current_page].should == 1
+        assigns[:contacts].should == @contacts
+        response.should render_template("contacts/index")
+      end
     end
 
     describe "with mime type of JSON" do
@@ -126,7 +138,7 @@ describe ContactsController do
 
     describe "contact got deleted or otherwise unavailable" do
       it "should redirect to contact index if the contact got deleted" do
-        @contact = FactoryGirl.create(:contact, :user => @current_user)
+        @contact = FactoryGirl.create(:contact, :user => current_user)
         @contact.destroy
 
         get :show, :id => @contact.id
@@ -143,7 +155,7 @@ describe ContactsController do
       end
 
       it "should return 404 (Not Found) XML error" do
-        @contact = FactoryGirl.create(:contact, :user => @current_user)
+        @contact = FactoryGirl.create(:contact, :user => current_user)
         @contact.destroy
         request.env["HTTP_ACCEPT"] = "application/xml"
 
@@ -159,15 +171,14 @@ describe ContactsController do
   describe "responding to GET new" do
 
     it "should expose a new contact as @contact and render [new] template" do
-      @contact = Contact.new(:user => @current_user)
-      @account = Account.new(:user => @current_user)
-      @users = [ FactoryGirl.create(:user) ]
-      @accounts = [ FactoryGirl.create(:account, :user => @current_user) ]
+      @contact = Contact.new(:user => current_user,
+                             :access => Setting.default_access)
+      @account = Account.new(:user => current_user)
+      @accounts = [ FactoryGirl.create(:account, :user => current_user) ]
 
       xhr :get, :new
       assigns[:contact].attributes.should == @contact.attributes
       assigns[:account].attributes.should == @account.attributes
-      assigns[:users].should == @users
       assigns[:accounts].should == @accounts
       assigns[:opportunity].should == nil
       response.should render_template("contacts/new")
@@ -205,13 +216,11 @@ describe ContactsController do
   describe "responding to GET edit" do
 
     it "should expose the requested contact as @contact and render [edit] template" do
-      @contact = FactoryGirl.create(:contact, :id => 42, :user => @current_user, :lead => nil)
-      @users = [ FactoryGirl.create(:user) ]
-      @account = Account.new(:user => @current_user)
+      @contact = FactoryGirl.create(:contact, :id => 42, :user => current_user, :lead => nil)
+      @account = Account.new(:user => current_user)
 
       xhr :get, :edit, :id => 42
       assigns[:contact].should == @contact
-      assigns[:users].should == @users
       assigns[:account].attributes.should == @account.attributes
       assigns[:previous].should == nil
       response.should render_template("contacts/edit")
@@ -219,7 +228,7 @@ describe ContactsController do
 
     it "should expose the requested contact as @contact and linked account as @account" do
       @account = FactoryGirl.create(:account, :id => 99)
-      @contact = FactoryGirl.create(:contact, :id => 42, :user => @current_user, :lead => nil)
+      @contact = FactoryGirl.create(:contact, :id => 42, :user => current_user, :lead => nil)
       FactoryGirl.create(:account_contact, :account => @account, :contact => @contact)
 
       xhr :get, :edit, :id => 42
@@ -237,7 +246,7 @@ describe ContactsController do
 
     describe "(contact got deleted or is otherwise unavailable)" do
       it "should reload current page with the flash message if the contact got deleted" do
-        @contact = FactoryGirl.create(:contact, :user => @current_user)
+        @contact = FactoryGirl.create(:contact, :user => current_user)
         @contact.destroy
 
         xhr :get, :edit, :id => @contact.id
@@ -256,7 +265,7 @@ describe ContactsController do
 
     describe "(previous contact got deleted or is otherwise unavailable)" do
       before(:each) do
-        @contact = FactoryGirl.create(:contact, :user => @current_user)
+        @contact = FactoryGirl.create(:contact, :user => current_user)
         @previous = FactoryGirl.create(:contact, :user => FactoryGirl.create(:user))
       end
 
@@ -291,9 +300,9 @@ describe ContactsController do
         @contact = FactoryGirl.build(:contact, :first_name => "Billy", :last_name => "Bones")
         Contact.stub!(:new).and_return(@contact)
 
-        xhr :post, :create, :contact => { :first_name => "Billy", :last_name => "Bones" }, :account => { :name => "Hello world" }, :users => %w(1 2 3)
+        xhr :post, :create, :contact => { :first_name => "Billy", :last_name => "Bones" }, :account => { :name => "Hello world" }
         assigns(:contact).should == @contact
-        assigns(:contact).account.name.should == "Hello world"
+        assigns(:contact).reload.account.name.should == "Hello world"
         response.should render_template("contacts/create")
       end
 
@@ -308,31 +317,37 @@ describe ContactsController do
       end
 
       it "should reload contacts to update pagination if called from contacts index" do
-        @contact = FactoryGirl.build(:contact, :user => @current_user)
+        @contact = FactoryGirl.build(:contact, :user => current_user)
         Contact.stub!(:new).and_return(@contact)
 
         request.env["HTTP_REFERER"] = "http://localhost/contacts"
-        xhr :post, :create, :contact => { :first_name => "Billy", :last_name => "Bones" }, :account => {}, :users => %w(1 2 3)
+        xhr :post, :create, :contact => { :first_name => "Billy", :last_name => "Bones" }, :account => {}
         assigns[:contacts].should == [ @contact ]
       end
+
+      it "should add a new comment to the newly created contact when specified" do
+        @contact = FactoryGirl.build(:contact, :user => current_user)
+        Contact.stub!(:new).and_return(@contact)
+
+        xhr :post, :create, :contact => { :first_name => "Testy", :last_name => "McTest" }, :account => { :name => "Hello world" }, :comment_body => "Awesome comment is awesome"
+        assigns[:contact].comments.map(&:comment).should include("Awesome comment is awesome")
+      end
     end
 
     describe "with invalid params" do
 
       before(:each) do
-        @contact = FactoryGirl.build(:contact, :first_name => nil, :user => @current_user, :lead => nil)
+        @contact = FactoryGirl.build(:contact, :first_name => nil, :user => current_user, :lead => nil)
         Contact.stub!(:new).and_return(@contact)
-        @users = [ FactoryGirl.create(:user) ]
       end
 
       # Redraw [create] form with selected account.
       it "should redraw [Create Contact] form with selected account" do
-        @account = FactoryGirl.create(:account, :id => 42, :user => @current_user)
+        @account = FactoryGirl.create(:account, :id => 42, :user => current_user)
 
         # This redraws [create] form with blank account.
-        xhr :post, :create, :contact => {}, :account => { :id => 42, :user_id => @current_user.id }
+        xhr :post, :create, :contact => {}, :account => { :id => 42, :user_id => current_user.id }
         assigns(:contact).should == @contact
-        assigns(:users).should == @users
         assigns(:account).should == @account
         assigns(:accounts).should == [ @account ]
         response.should render_template("contacts/create")
@@ -340,24 +355,22 @@ describe ContactsController do
 
       # Redraw [create] form with related account.
       it "should redraw [Create Contact] form with related account" do
-        @account = FactoryGirl.create(:account, :id => 123, :user => @current_user)
+        @account = FactoryGirl.create(:account, :id => 123, :user => current_user)
 
         request.env["HTTP_REFERER"] = "http://localhost/accounts/123"
-        xhr :post, :create, :contact => { :first_name => nil }, :account => { :name => nil, :user_id => @current_user.id }
+        xhr :post, :create, :contact => { :first_name => nil }, :account => { :name => nil, :user_id => current_user.id }
         assigns(:contact).should == @contact
-        assigns(:users).should == @users
         assigns(:account).should == @account
         assigns(:accounts).should == [ @account ]
         response.should render_template("contacts/create")
       end
 
       it "should redraw [Create Contact] form with blank account" do
-        @accounts = [ FactoryGirl.create(:account, :user => @current_user) ]
-        @account = Account.new(:user => @current_user)
+        @accounts = [ FactoryGirl.create(:account, :user => current_user) ]
+        @account = Account.new(:user => current_user)
 
-        xhr :post, :create, :contact => { :first_name => nil }, :account => { :name => nil, :user_id => @current_user.id }
+        xhr :post, :create, :contact => { :first_name => nil }, :account => { :name => nil, :user_id => current_user.id }
         assigns(:contact).should == @contact
-        assigns(:users).should == @users
         assigns(:account).attributes.should == @account.attributes
         assigns(:accounts).should == @accounts
         response.should render_template("contacts/create")
@@ -384,8 +397,8 @@ describe ContactsController do
         @contact = FactoryGirl.create(:contact, :id => 42, :first_name => "Billy")
 
         xhr :put, :update, :id => 42, :contact => { :first_name => "Bones" }, :account => {}
-        @contact.reload.first_name.should == "Bones"
-        assigns(:contact).should == @contact
+        assigns[:contact].first_name.should == "Bones"
+        assigns[:contact].should == @contact
         response.should render_template("contacts/update")
       end
 
@@ -393,8 +406,8 @@ describe ContactsController do
         @contact = FactoryGirl.create(:contact, :id => 42, :first_name => "Billy")
 
         xhr :put, :update, :id => 42, :contact => { :first_name => "Bones" }, :account => { :name => "new account" }
-        @contact.reload.first_name.should == "Bones"
-        @contact.account.name.should == "new account"
+        assigns[:contact].first_name.should == "Bones"
+        assigns[:contact].account.name.should == "new account"
       end
 
       it "should be able to link existing account with the contact" do
@@ -402,24 +415,22 @@ describe ContactsController do
         @contact = FactoryGirl.create(:contact, :id => 42, :first_name => "Billy")
 
         xhr :put, :update, :id => 42, :contact => { :first_name => "Bones" }, :account => { :id => 99 }
-        @contact.reload.first_name.should == "Bones"
-        @contact.account.id.should == 99
+        assigns[:contact].first_name.should == "Bones"
+        assigns[:contact].account.id.should == 99
       end
 
       it "should update contact permissions when sharing with specific users" do
         @contact = FactoryGirl.create(:contact, :id => 42, :access => "Public")
-        he  = FactoryGirl.create(:user, :id => 7)
-        she = FactoryGirl.create(:user, :id => 8)
 
-        xhr :put, :update, :id => 42, :contact => { :first_name => "Hello", :access => "Shared" }, :users => %w(7 8), :account => {}
-        @contact.reload.access.should == "Shared"
-        @contact.permissions.map(&:user_id).sort.should == [ 7, 8 ]
+        xhr :put, :update, :id => 42, :contact => { :first_name => "Hello", :access => "Shared", :user_ids => [7, 8] }, :account => {}
+        assigns[:contact].access.should == "Shared"
+        assigns[:contact].user_ids.sort.should == [ 7, 8 ]
         assigns[:contact].should == @contact
       end
 
       describe "contact got deleted or otherwise unavailable" do
         it "should reload current page is the contact got deleted" do
-          @contact = FactoryGirl.create(:contact, :user => @current_user)
+          @contact = FactoryGirl.create(:contact, :user => current_user)
           @contact.destroy
 
           xhr :put, :update, :id => @contact.id
@@ -441,15 +452,13 @@ describe ContactsController do
     describe "with invalid params" do
 
       it "should not update the contact, but still expose it as @contact and render [update] template" do
-        @contact = FactoryGirl.create(:contact, :id => 42, :user => @current_user, :first_name => "Billy", :lead => nil)
-        @account = Account.new(:user => @current_user)
-        @users = [ FactoryGirl.create(:user) ]
+        @contact = FactoryGirl.create(:contact, :id => 42, :user => current_user, :first_name => "Billy", :lead => nil)
+        @account = Account.new(:user => current_user)
 
         xhr :put, :update, :id => 42, :contact => { :first_name => nil }, :account => {}
-        @contact.reload.first_name.should == "Billy"
-        assigns(:contact).should == @contact
-        assigns(:account).attributes.should == @account.attributes
-        assigns(:users).should == @users
+        assigns[:contact].reload.first_name.should == "Billy"
+        assigns[:contact].should == @contact
+        assigns[:account].attributes.should == @account.attributes
         response.should render_template("contacts/update")
       end
 
@@ -458,7 +467,7 @@ describe ContactsController do
         @contact = FactoryGirl.create(:contact, :id => 42, :account => @account)
 
         xhr :put, :update, :id => 42, :contact => { :first_name => nil }, :account => { :id => 99 }
-        assigns(:account).should == @account
+        assigns[:account].should == @account
       end
 
     end
@@ -470,7 +479,7 @@ describe ContactsController do
   #----------------------------------------------------------------------------
   describe "responding to DELETE destroy" do
     before(:each) do
-      @contact = FactoryGirl.create(:contact, :user => @current_user)
+      @contact = FactoryGirl.create(:contact, :user => current_user)
     end
 
     describe "AJAX request" do
@@ -515,7 +524,7 @@ describe ContactsController do
 
       describe "contact got deleted or otherwise unavailable" do
         it "should reload current page is the contact got deleted" do
-          @contact = FactoryGirl.create(:contact, :user => @current_user)
+          @contact = FactoryGirl.create(:contact, :user => current_user)
           @contact.destroy
 
           xhr :delete, :destroy, :id => @contact.id
@@ -542,7 +551,7 @@ describe ContactsController do
       end
 
       it "should redirect to contact index with the flash message is the contact got deleted" do
-        @contact = FactoryGirl.create(:contact, :user => @current_user)
+        @contact = FactoryGirl.create(:contact, :user => current_user)
         @contact.destroy
 
         delete :destroy, :id => @contact.id
@@ -628,63 +637,38 @@ describe ContactsController do
   #----------------------------------------------------------------------------
   describe "responding to POST auto_complete" do
     before(:each) do
-      @auto_complete_matches = [ FactoryGirl.create(:contact, :first_name => "Hello", :last_name => "World", :user => @current_user) ]
+      @auto_complete_matches = [ FactoryGirl.create(:contact, :first_name => "Hello", :last_name => "World", :user => current_user) ]
     end
 
     it_should_behave_like("auto complete")
   end
 
-  # GET /contacts/options                                                  AJAX
-  #----------------------------------------------------------------------------
-  describe "responding to GET options" do
-    it "should set current user preferences when showing options" do
-      @per_page = FactoryGirl.create(:preference, :user => @current_user, :name => "contacts_per_page", :value => Base64.encode64(Marshal.dump(42)))
-      @outline  = FactoryGirl.create(:preference, :user => @current_user, :name => "contacts_outline",  :value => Base64.encode64(Marshal.dump("option_long")))
-      @sort_by  = FactoryGirl.create(:preference, :user => @current_user, :name => "contacts_sort_by",  :value => Base64.encode64(Marshal.dump("contacts.first_name ASC")))
-      @naming   = FactoryGirl.create(:preference, :user => @current_user, :name => "contacts_naming",   :value => Base64.encode64(Marshal.dump("option_after")))
-
-      xhr :get, :options
-      assigns[:per_page].should == 42
-      assigns[:outline].should  == "option_long"
-      assigns[:sort_by].should  == "contacts.first_name ASC"
-      assigns[:naming].should   == "option_after"
-    end
-
-    it "should not assign instance variables when hiding options" do
-      xhr :get, :options, :cancel => "true"
-      assigns[:per_page].should == nil
-      assigns[:outline].should  == nil
-      assigns[:sort_by].should  == nil
-      assigns[:naming].should   == nil
-    end
-  end
-
   # POST /contacts/redraw                                                  AJAX
   #----------------------------------------------------------------------------
   describe "responding to POST redraw" do
     it "should save user selected contact preference" do
-      xhr :post, :redraw, :per_page => 42, :outline => "long", :sort_by => "first_name", :naming => "after"
-      @current_user.preference[:contacts_per_page].to_i.should == 42
-      @current_user.preference[:contacts_outline].should  == "long"
-      @current_user.preference[:contacts_sort_by].should  == "contacts.first_name ASC"
-      @current_user.preference[:contacts_naming].should   == "after"
+      xhr :post, :redraw, :per_page => 42, :view => "long", :sort_by => "first_name", :naming => "after"
+      current_user.preference[:contacts_per_page].to_i.should == 42
+      current_user.preference[:contacts_index_view].should  == "long"
+      current_user.preference[:contacts_sort_by].should  == "contacts.first_name ASC"
+      current_user.preference[:contacts_naming].should   == "after"
     end
 
     it "should set similar options for Leads" do
       xhr :post, :redraw, :sort_by => "first_name", :naming => "after"
-      @current_user.pref[:leads_sort_by].should == "leads.first_name ASC"
-      @current_user.pref[:leads_naming].should == "after"
+      current_user.pref[:leads_sort_by].should == "leads.first_name ASC"
+      current_user.pref[:leads_naming].should == "after"
     end
 
     it "should reset current page to 1" do
-      xhr :post, :redraw, :per_page => 42, :outline => "long", :sort_by => "first_name", :naming => "after"
+      xhr :post, :redraw, :per_page => 42, :view => "long", :sort_by => "first_name", :naming => "after"
       session[:contacts_current_page].should == 1
     end
 
     it "should select @contacts and render [index] template" do
       @contacts = [
-        FactoryGirl.create(:contact, :first_name => "Alice", :user => @current_user),
-        FactoryGirl.create(:contact, :first_name => "Bobby", :user => @current_user)
+        FactoryGirl.create(:contact, :first_name => "Alice", :user => current_user),
+        FactoryGirl.create(:contact, :first_name => "Bobby", :user => current_user)
       ]
 
       xhr :post, :redraw, :per_page => 1, :sort_by => "first_name"
@@ -694,4 +678,3 @@ describe ContactsController do
   end
 
 end
-

data/spec/controllers/entities/leads_controller_spec.rb

@@ -13,7 +13,7 @@ describe LeadsController do
   describe "responding to GET index" do
 
     it "should expose all leads as @leads and render [index] template" do
-      @leads = [ FactoryGirl.create(:lead, :user => @current_user) ]
+      @leads = [ FactoryGirl.create(:lead, :user => current_user) ]
 
       get :index
       assigns[:leads].should == @leads
@@ -21,7 +21,7 @@ describe LeadsController do
     end
 
     it "should collect the data for the leads sidebar" do
-      @leads = [ FactoryGirl.create(:lead, :user => @current_user) ]
+      @leads = [ FactoryGirl.create(:lead, :user => current_user) ]
       @status = Setting.lead_status.dup
 
       get :index
@@ -31,12 +31,12 @@ describe LeadsController do
     it "should filter out leads by status" do
       controller.session[:leads_filter] = "new,contacted"
       @leads = [
-        FactoryGirl.create(:lead, :status => "new", :user => @current_user),
-        FactoryGirl.create(:lead, :status => "contacted", :user => @current_user)
+        FactoryGirl.create(:lead, :status => "new", :user => current_user),
+        FactoryGirl.create(:lead, :status => "contacted", :user => current_user)
       ]
 
       # This one should be filtered out.
-      FactoryGirl.create(:lead, :status => "rejected", :user => @current_user)
+      FactoryGirl.create(:lead, :status => "rejected", :user => current_user)
 
       get :index
       # Note: can't compare campaigns directly because of BigDecimals.
@@ -45,8 +45,8 @@ describe LeadsController do
     end
 
     it "should perform lookup using query string" do
-      @billy_bones   = FactoryGirl.create(:lead, :user => @current_user, :first_name => "Billy",   :last_name => "Bones")
-      @captain_flint = FactoryGirl.create(:lead, :user => @current_user, :first_name => "Captain", :last_name => "Flint")
+      @billy_bones   = FactoryGirl.create(:lead, :user => current_user, :first_name => "Billy",   :last_name => "Bones")
+      @captain_flint = FactoryGirl.create(:lead, :user => current_user, :first_name => "Captain", :last_name => "Flint")
 
       get :index, :query => "bill"
       assigns[:leads].should == [ @billy_bones ]
@@ -56,7 +56,7 @@ describe LeadsController do
 
     describe "AJAX pagination" do
       it "should pick up page number from params" do
-        @leads = [ FactoryGirl.create(:lead, :user => @current_user) ]
+        @leads = [ FactoryGirl.create(:lead, :user => current_user) ]
         xhr :get, :index, :page => 42
 
         assigns[:current_page].to_i.should == 42
@@ -67,13 +67,25 @@ describe LeadsController do
 
       it "should pick up saved page number from session" do
         session[:leads_current_page] = 42
-        @leads = [ FactoryGirl.create(:lead, :user => @current_user) ]
-        xhr :get, :index
+        session[:leads_current_query] = "bill"
+        @leads = [ FactoryGirl.create(:lead, :user => current_user) ]
+        xhr :get, :index, :query => "bill"
 
         assigns[:current_page].should == 42
         assigns[:leads].should == []
         response.should render_template("leads/index")
       end
+
+      it "should reset current_page when query is altered" do
+        session[:leads_current_page] = 42
+        session[:leads_current_query] = "bill"
+        @leads = [ FactoryGirl.create(:lead, :user => current_user) ]
+        xhr :get, :index
+
+        assigns[:current_page].should == 1
+        assigns[:leads].should == @leads
+        response.should render_template("leads/index")
+      end
     end
 
     describe "with mime type of JSON" do
@@ -106,7 +118,7 @@ describe LeadsController do
 
     describe "with mime type of HTML" do
       before(:each) do
-        @lead = FactoryGirl.create(:lead, :id => 42, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :id => 42, :user => current_user)
         @comment = Comment.new
       end
 
@@ -125,7 +137,7 @@ describe LeadsController do
 
     describe "with mime type of JSON" do
       it "should render the requested lead as JSON" do
-        @lead = FactoryGirl.create(:lead, :id => 42, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :id => 42, :user => current_user)
         Lead.should_receive(:find).and_return(@lead)
         @lead.should_receive(:to_json).and_return("generated JSON")
 
@@ -137,7 +149,7 @@ describe LeadsController do
 
     describe "with mime type of XML" do
       it "should render the requested lead as xml" do
-        @lead = FactoryGirl.create(:lead, :id => 42, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :id => 42, :user => current_user)
         Lead.should_receive(:find).and_return(@lead)
         @lead.should_receive(:to_xml).and_return("generated XML")
 
@@ -149,7 +161,7 @@ describe LeadsController do
 
     describe "lead got deleted or otherwise unavailable" do
       it "should redirect to lead index if the lead got deleted" do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         @lead.destroy
 
         get :show, :id => @lead.id
@@ -166,7 +178,7 @@ describe LeadsController do
       end
 
       it "should return 404 (Not Found) JSON error" do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         @lead.destroy
         request.env["HTTP_ACCEPT"] = "application/json"
 
@@ -175,7 +187,7 @@ describe LeadsController do
       end
 
       it "should return 404 (Not Found) XML error" do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         @lead.destroy
         request.env["HTTP_ACCEPT"] = "application/xml"
 
@@ -192,14 +204,12 @@ describe LeadsController do
   describe "responding to GET new" do
 
     it "should expose a new lead as @lead and render [new] template" do
-      @lead = FactoryGirl.build(:lead, :user => @current_user, :campaign => nil)
+      @lead = FactoryGirl.build(:lead, :user => current_user, :campaign => nil)
       Lead.stub!(:new).and_return(@lead)
-      @users = [ FactoryGirl.create(:user) ]
-      @campaigns = [ FactoryGirl.create(:campaign, :user => @current_user) ]
+      @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
       xhr :get, :new
       assigns[:lead].attributes.should == @lead.attributes
-      assigns[:users].should == @users
       assigns[:campaigns].should == @campaigns
       response.should render_template("leads/new")
     end
@@ -236,13 +246,11 @@ describe LeadsController do
   describe "responding to GET edit" do
 
     it "should expose the requested lead as @lead and render [edit] template" do
-      @lead = FactoryGirl.create(:lead, :id => 42, :user => @current_user, :campaign => nil)
-      @users = [ FactoryGirl.create(:user) ]
-      @campaigns = [ FactoryGirl.create(:campaign, :user => @current_user) ]
+      @lead = FactoryGirl.create(:lead, :id => 42, :user => current_user, :campaign => nil)
+      @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
       xhr :get, :edit, :id => 42
       assigns[:lead].should == @lead
-      assigns[:users].should == @users
       assigns[:campaigns].should == @campaigns
       response.should render_template("leads/edit")
     end
@@ -257,7 +265,7 @@ describe LeadsController do
 
     describe "lead got deleted or is otherwise unavailable" do
       it "should reload current page with the flash message if the lead got deleted" do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         @lead.destroy
 
         xhr :get, :edit, :id => @lead.id
@@ -276,7 +284,7 @@ describe LeadsController do
 
     describe "(previous lead got deleted or is otherwise unavailable)" do
       before(:each) do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         @previous = FactoryGirl.create(:lead, :user => FactoryGirl.create(:user))
       end
 
@@ -308,14 +316,12 @@ describe LeadsController do
     describe "with valid params" do
 
       it "should expose a newly created lead as @lead and render [create] template" do
-        @lead = FactoryGirl.build(:lead, :user => @current_user, :campaign => nil)
+        @lead = FactoryGirl.build(:lead, :user => current_user, :campaign => nil)
         Lead.stub!(:new).and_return(@lead)
-        @users = [ FactoryGirl.create(:user) ]
-        @campaigns = [ FactoryGirl.create(:campaign, :user => @current_user) ]
+        @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
-        xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones" }, :users => %w(1 2 3)
+        xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones" }
         assigns(:lead).should == @lead
-        assigns(:users).should == @users
         assigns(:campaigns).should == @campaigns
         assigns[:lead_status_total].should be_nil
         response.should render_template("leads/create")
@@ -329,10 +335,11 @@ describe LeadsController do
         @campaign.permissions << FactoryGirl.build(:permission, :user => she, :asset => @campaign)
         @campaign.save
 
-        @lead = FactoryGirl.build(:lead, :campaign => @campaign, :user => @current_user, :access => "Shared")
+        @lead = FactoryGirl.build(:lead, :campaign => @campaign, :user => current_user, :access => "Shared")
         Lead.stub!(:new).and_return(@lead)
 
-        xhr :put, :create, :lead => { :first_name => "Billy", :last_name => "Bones", :access => "Campaign" }, :campaign => @campaign.id, :users => %w(7 8)
+        xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones", :access => "Campaign", :user_ids => %w(7 8) }, :campaign => @campaign.id
+        assigns(:lead).should == @lead
         @lead.reload.access.should == "Shared"
         @lead.permissions.map(&:user_id).sort.should == [ 7, 8 ]
         @lead.permissions.map(&:asset_id).should == [ @lead.id, @lead.id ]
@@ -340,45 +347,49 @@ describe LeadsController do
       end
 
       it "should get the data to update leads sidebar if called from leads index" do
-        @lead = FactoryGirl.build(:lead, :user => @current_user, :campaign => nil)
+        @lead = FactoryGirl.build(:lead, :user => current_user, :campaign => nil)
         Lead.stub!(:new).and_return(@lead)
 
         request.env["HTTP_REFERER"] = "http://localhost/leads"
-        xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones" }, :users => %w(1 2 3)
+        xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones" }
         assigns[:lead_status_total].should be_an_instance_of(HashWithIndifferentAccess)
       end
 
       it "should reload leads to update pagination if called from leads index" do
-        @lead = FactoryGirl.build(:lead, :user => @current_user, :campaign => nil)
+        @lead = FactoryGirl.build(:lead, :user => current_user, :campaign => nil)
         Lead.stub!(:new).and_return(@lead)
 
         request.env["HTTP_REFERER"] = "http://localhost/leads"
-        xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones" }, :users => %w(1 2 3)
+        xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones" }
         assigns[:leads].should == [ @lead ]
       end
 
       it "should reload lead campaign if called from campaign landing page" do
         @campaign = FactoryGirl.create(:campaign)
-        @lead = FactoryGirl.build(:lead, :user => @current_user, :campaign => @campaign)
+        @lead = FactoryGirl.build(:lead, :user => current_user, :campaign => @campaign)
 
         request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{@campaign.id}"
         xhr :put, :create, :lead => { :first_name => "Billy", :last_name => "Bones"}, :campaign => @campaign.id
         assigns[:campaign].should == @campaign
       end
-
+      
+      it "should add a new comment to the newly created lead when specified" do
+        @lead = FactoryGirl.create(:lead)
+        Lead.stub!(:new).and_return(@lead)
+        xhr :post, :create, :lead => { :first_name => "Test", :last_name => "Lead" }, :comment_body => "This is an important lead."
+        @lead.reload.comments.map(&:comment).should include("This is an important lead.")
+      end
     end
 
     describe "with invalid params" do
 
       it "should expose a newly created but unsaved lead as @lead and still render [create] template" do
-        @lead = FactoryGirl.build(:lead, :user => @current_user, :first_name => nil, :campaign => nil)
+        @lead = FactoryGirl.build(:lead, :user => current_user, :first_name => nil, :campaign => nil)
         Lead.stub!(:new).and_return(@lead)
-        @users = [ FactoryGirl.create(:user) ]
-        @campaigns = [ FactoryGirl.create(:campaign, :user => @current_user) ]
+        @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
-        xhr :post, :create, :lead => { :first_name => nil }, :users => nil
+        xhr :post, :create, :lead => { :first_name => nil }
         assigns(:lead).should == @lead
-        assigns(:users).should == @users
         assigns(:campaigns).should == @campaigns
         assigns[:lead_status_total].should == nil
         response.should render_template("leads/create")
@@ -396,7 +407,7 @@ describe LeadsController do
     describe "with valid params" do
 
       it "should update the requested lead, expose it as @lead, and render [update] template" do
-        @lead = FactoryGirl.create(:lead, :first_name => "Billy", :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :first_name => "Billy", :user => current_user)
 
         xhr :put, :update, :id => @lead.id, :lead => { :first_name => "Bones" }
         @lead.reload.first_name.should == "Bones"
@@ -406,14 +417,14 @@ describe LeadsController do
       end
 
       it "should update lead status" do
-        @lead = FactoryGirl.create(:lead, :status => "new", :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :status => "new", :user => current_user)
 
         xhr :put, :update, :id => @lead.id, :lead => { :status => "rejected" }
         @lead.reload.status.should == "rejected"
       end
 
       it "should update lead source" do
-        @lead = FactoryGirl.create(:lead, :source => "campaign", :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :source => "campaign", :user => current_user)
 
         xhr :put, :update, :id => @lead.id, :lead => { :source => "cald_call" }
         @lead.reload.source.should == "cald_call"
@@ -458,13 +469,13 @@ describe LeadsController do
         @campaigns[:new].reload.leads_count.should == @counts[:new] + 1
       end
 
-      it "should update shared permissions for the campaign" do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+      it "should update shared permissions for the lead" do
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         he  = FactoryGirl.create(:user, :id => 7)
         she = FactoryGirl.create(:user, :id => 8)
 
-        xhr :put, :update, :id => @lead.id, :lead => { :access => "Shared" }, :users => %w(7 8)
-        @lead.permissions.map(&:user_id).sort.should == [ 7, 8 ]
+        xhr :put, :update, :id => @lead.id, :lead => { :access => "Shared", :user_ids => %w(7 8) }
+        @lead.user_ids.sort.should == [ 7, 8 ]
       end
 
       it "should get the data for leads sidebar when called from leads index" do
@@ -487,7 +498,7 @@ describe LeadsController do
 
       describe "lead got deleted or otherwise unavailable" do
         it "should reload current page with the flash message if the lead got deleted" do
-          @lead = FactoryGirl.create(:lead, :user => @current_user)
+          @lead = FactoryGirl.create(:lead, :user => current_user)
           @lead.destroy
 
           xhr :put, :update, :id => @lead.id
@@ -508,13 +519,11 @@ describe LeadsController do
     describe "with invalid params" do
 
       it "should not update the lead, but still expose it as @lead and render [update] template" do
-        @lead = FactoryGirl.create(:lead, :id => 42, :user => @current_user, :campaign => nil)
-        @users = [ FactoryGirl.create(:user) ]
-        @campaigns = [ FactoryGirl.create(:campaign, :user => @current_user) ]
+        @lead = FactoryGirl.create(:lead, :id => 42, :user => current_user, :campaign => nil)
+        @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
         xhr :put, :update, :id => 42, :lead => { :first_name => nil }
         assigns[:lead].should == @lead
-        assigns[:users].should == @users
         assigns[:campaigns].should == @campaigns
         response.should render_template("leads/update")
       end
@@ -529,7 +538,7 @@ describe LeadsController do
   describe "responding to DELETE destroy" do
 
     before(:each) do
-      @lead = FactoryGirl.create(:lead, :user => @current_user)
+      @lead = FactoryGirl.create(:lead, :user => current_user)
     end
 
     describe "AJAX request" do
@@ -547,7 +556,7 @@ describe LeadsController do
         end
 
         it "should get data for the sidebar" do
-          @another_lead = FactoryGirl.create(:lead, :user => @current_user)
+          @another_lead = FactoryGirl.create(:lead, :user => current_user)
 
           xhr :delete, :destroy, :id => @lead.id
           assigns[:leads].should == [ @another_lead ] # @lead got deleted
@@ -576,7 +585,7 @@ describe LeadsController do
       describe "when called from campaign landing page" do
         before(:each) do
           @campaign = FactoryGirl.create(:campaign)
-          @lead = FactoryGirl.create(:lead, :user => @current_user, :campaign => @campaign)
+          @lead = FactoryGirl.create(:lead, :user => current_user, :campaign => @campaign)
           request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{@campaign.id}"
         end
 
@@ -595,7 +604,7 @@ describe LeadsController do
 
       describe "lead got deleted or otherwise unavailable" do
         it "should reload current page with the flash message if the lead got deleted" do
-          @lead = FactoryGirl.create(:lead, :user => @current_user)
+          @lead = FactoryGirl.create(:lead, :user => current_user)
           @lead.destroy
 
           xhr :delete, :destroy, :id => @lead.id
@@ -622,7 +631,7 @@ describe LeadsController do
       end
 
       it "should redirect to lead index with the flash message is the lead got deleted" do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         @lead.destroy
 
         delete :destroy, :id => @lead.id
@@ -646,16 +655,14 @@ describe LeadsController do
   describe "responding to GET convert" do
 
     it "should should collect necessary data and render [convert] template" do
-      @campaign = FactoryGirl.create(:campaign, :user => @current_user)
-      @lead = FactoryGirl.create(:lead, :user => @current_user, :campaign => @campaign, :source => "cold_call")
-      @users = [ FactoryGirl.create(:user) ]
-      @accounts = [ FactoryGirl.create(:account, :user => @current_user) ]
-      @account = Account.new(:user => @current_user, :name => @lead.company, :access => "Lead")
-      @opportunity = Opportunity.new(:user => @current_user, :access => "Lead", :stage => "prospecting", :campaign => @lead.campaign, :source => @lead.source)
+      @campaign = FactoryGirl.create(:campaign, :user => current_user)
+      @lead = FactoryGirl.create(:lead, :user => current_user, :campaign => @campaign, :source => "cold_call")
+      @accounts = [ FactoryGirl.create(:account, :user => current_user) ]
+      @account = Account.new(:user => current_user, :name => @lead.company, :access => "Lead")
+      @opportunity = Opportunity.new(:user => current_user, :access => "Lead", :stage => "prospecting", :campaign => @lead.campaign, :source => @lead.source)
 
       xhr :get, :convert, :id => @lead.id
       assigns[:lead].should == @lead
-      assigns[:users].should == @users
       assigns[:accounts].should == @accounts
       assigns[:account].attributes.should == @account.attributes
       assigns[:opportunity].attributes.should == @opportunity.attributes
@@ -665,7 +672,7 @@ describe LeadsController do
 
     describe "(lead got deleted or is otherwise unavailable)" do
       it "should reload current page with the flash message if the lead got deleted" do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         @lead.destroy
 
         xhr :get, :convert, :id => @lead.id
@@ -684,7 +691,7 @@ describe LeadsController do
 
     describe "(previous lead got deleted or is otherwise unavailable)" do
       before(:each) do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         @previous = FactoryGirl.create(:lead, :user => FactoryGirl.create(:user))
       end
 
@@ -714,19 +721,17 @@ describe LeadsController do
   describe "responding to PUT promote" do
 
     it "on success: should change lead's status to [converted] and render [promote] template" do
-      @lead = FactoryGirl.create(:lead, :id => 42, :user => @current_user, :campaign => nil)
-      @users = [ FactoryGirl.create(:user) ]
-      @account = FactoryGirl.create(:account, :id => 123, :user => @current_user)
-      @opportunity = FactoryGirl.build(:opportunity, :user => @current_user, :campaign => @lead.campaign,
+      @lead = FactoryGirl.create(:lead, :id => 42, :user => current_user, :campaign => nil)
+      @account = FactoryGirl.create(:account, :id => 123, :user => current_user)
+      @opportunity = FactoryGirl.build(:opportunity, :user => current_user, :campaign => @lead.campaign,
                                    :account => @account)
       Opportunity.stub!(:new).and_return(@opportunity)
-      @contact = FactoryGirl.build(:contact, :user => @current_user, :lead => @lead)
+      @contact = FactoryGirl.build(:contact, :user => current_user, :lead => @lead)
       Contact.stub!(:new).and_return(@contact)
 
       xhr :put, :promote, :id => 42, :account => { :id => 123 }, :opportunity => { :name => "Hello" }
       @lead.reload.status.should == "converted"
       assigns[:lead].should == @lead
-      assigns[:users].should == @users
       assigns[:account].should == @account
       assigns[:accounts].should == [ @account ]
       assigns[:opportunity].should == @opportunity
@@ -742,16 +747,16 @@ describe LeadsController do
       @lead.permissions << FactoryGirl.build(:permission, :user => he,  :asset => @lead)
       @lead.permissions << FactoryGirl.build(:permission, :user => she, :asset => @lead)
       @lead.save
-      @account = FactoryGirl.build(:account, :user => @current_user, :access => "Shared")
+      @account = FactoryGirl.build(:account, :user => current_user, :access => "Shared")
       @account.permissions << FactoryGirl.create(:permission, :user => he,  :asset => @account)
       @account.permissions << FactoryGirl.create(:permission, :user => she, :asset => @account)
       @account.stub!(:new).and_return(@account)
-      @opportunity = FactoryGirl.build(:opportunity, :user => @current_user, :access => "Shared")
+      @opportunity = FactoryGirl.build(:opportunity, :user => current_user, :access => "Shared")
       @opportunity.permissions << FactoryGirl.create(:permission, :user => he,  :asset => @opportunity)
       @opportunity.permissions << FactoryGirl.create(:permission, :user => she, :asset => @opportunity)
       @opportunity.stub!(:new).and_return(@opportunity)
 
-      xhr :put, :promote, :id => @lead.id, :access => "Lead", :account => { :name => "Hello", :access => "Lead", :user_id => @current_user.id }, :opportunity => { :name => "World", :access => "Lead", :user_id => @current_user.id }
+      xhr :put, :promote, :id => @lead.id, :access => "Lead", :account => { :name => "Hello", :access => "Lead", :user_id => current_user.id }, :opportunity => { :name => "World", :access => "Lead", :user_id => current_user.id }
       @account.access.should == "Shared"
       @account.permissions.map(&:user_id).sort.should == [ 7, 8 ]
       @account.permissions.map(&:asset_id).should == [ @account.id, @account.id ]
@@ -764,14 +769,14 @@ describe LeadsController do
 
     it "should assign lead's campaign to the newly created opportunity" do
       @campaign = FactoryGirl.create(:campaign)
-      @lead = FactoryGirl.create(:lead, :user => @current_user, :campaign => @campaign)
+      @lead = FactoryGirl.create(:lead, :user => current_user, :campaign => @campaign)
 
       xhr :put, :promote, :id => @lead.id, :account => { :name => "Hello" }, :opportunity => { :name => "Hello", :campaign_id => @campaign.id }
       assigns[:opportunity].campaign.should == @campaign
     end
 
     it "should assign lead's source to the newly created opportunity" do
-      @lead = FactoryGirl.create(:lead, :user => @current_user, :source => "cold_call")
+      @lead = FactoryGirl.create(:lead, :user => current_user, :source => "cold_call")
 
       xhr :put, :promote, :id => @lead.id, :account => { :name => "Hello" }, :opportunity => { :name => "Hello", :source => @lead.source }
       assigns[:opportunity].source.should == @lead.source
@@ -796,9 +801,8 @@ describe LeadsController do
     end
 
     it "on failure: should not change lead's status and still render [promote] template" do
-      @lead = FactoryGirl.create(:lead, :id => 42, :user => @current_user, :status => "new")
-      @users = [ FactoryGirl.create(:user) ]
-      @account = FactoryGirl.create(:account, :id => 123, :user => @current_user)
+      @lead = FactoryGirl.create(:lead, :id => 42, :user => current_user, :status => "new")
+      @account = FactoryGirl.create(:account, :id => 123, :user => current_user)
       @contact = FactoryGirl.build(:contact, :first_name => nil) # make it fail
       Contact.stub!(:new).and_return(@contact)
 
@@ -809,7 +813,7 @@ describe LeadsController do
 
     describe "lead got deleted or otherwise unavailable" do
       it "should reload current page with the flash message if the lead got deleted" do
-        @lead = FactoryGirl.create(:lead, :user => @current_user)
+        @lead = FactoryGirl.create(:lead, :user => current_user)
         @lead.destroy
 
         xhr :put, :promote, :id => @lead.id
@@ -833,7 +837,7 @@ describe LeadsController do
   describe "responding to PUT reject" do
 
     before(:each) do
-      @lead = FactoryGirl.create(:lead, :user => @current_user, :status => "new")
+      @lead = FactoryGirl.create(:lead, :user => current_user, :status => "new")
     end
 
     describe "AJAX request" do
@@ -863,7 +867,7 @@ describe LeadsController do
 
       describe "lead got deleted or otherwise unavailable" do
         it "should reload current page with the flash message if the lead got deleted" do
-          @lead = FactoryGirl.create(:lead, :user => @current_user)
+          @lead = FactoryGirl.create(:lead, :user => current_user)
           @lead.destroy
 
           xhr :put, :reject, :id => @lead.id
@@ -893,7 +897,7 @@ describe LeadsController do
 
       describe "lead got deleted or otherwise unavailable" do
         it "should redirect to lead index if the lead got deleted" do
-          @lead = FactoryGirl.create(:lead, :user => @current_user)
+          @lead = FactoryGirl.create(:lead, :user => current_user)
           @lead.destroy
 
           put :reject, :id => @lead.id
@@ -943,7 +947,7 @@ describe LeadsController do
   #----------------------------------------------------------------------------
   describe "responding to POST discard" do
     before(:each) do
-      @attachment = FactoryGirl.create(:task, :assigned_to => @current_user)
+      @attachment = FactoryGirl.create(:task, :assigned_to => current_user)
       @model = FactoryGirl.create(:lead)
       @model.tasks << @attachment
     end
@@ -955,63 +959,38 @@ describe LeadsController do
   #----------------------------------------------------------------------------
   describe "responding to POST auto_complete" do
     before(:each) do
-      @auto_complete_matches = [ FactoryGirl.create(:lead, :first_name => "Hello", :last_name => "World", :user => @current_user) ]
+      @auto_complete_matches = [ FactoryGirl.create(:lead, :first_name => "Hello", :last_name => "World", :user => current_user) ]
     end
 
     it_should_behave_like("auto complete")
   end
 
-  # GET /leads/options                                                     AJAX
-  #----------------------------------------------------------------------------
-  describe "responding to GET options" do
-    it "should set current user preferences when showing options" do
-      @per_page = FactoryGirl.create(:preference, :user => @current_user, :name => "leads_per_page", :value => Base64.encode64(Marshal.dump(42)))
-      @outline  = FactoryGirl.create(:preference, :user => @current_user, :name => "leads_outline",  :value => Base64.encode64(Marshal.dump("option_long")))
-      @sort_by  = FactoryGirl.create(:preference, :user => @current_user, :name => "leads_sort_by",  :value => Base64.encode64(Marshal.dump("leads.first_name ASC")))
-      @naming   = FactoryGirl.create(:preference, :user => @current_user, :name => "leads_naming",   :value => Base64.encode64(Marshal.dump("option_after")))
-
-      xhr :get, :options
-      assigns[:per_page].should == 42
-      assigns[:outline].should  == "option_long"
-      assigns[:sort_by].should  == "leads.first_name ASC"
-      assigns[:naming].should   == "option_after"
-    end
-
-    it "should not assign instance variables when hiding options" do
-      xhr :get, :options, :cancel => "true"
-      assigns[:per_page].should == nil
-      assigns[:outline].should  == nil
-      assigns[:sort_by].should  == nil
-      assigns[:naming].should   == nil
-    end
-  end
-
   # POST /leads/redraw                                                     AJAX
   #----------------------------------------------------------------------------
   describe "responding to POST redraw" do
     it "should save user selected lead preference" do
-      xhr :post, :redraw, :per_page => 42, :outline => "long", :sort_by => "first_name", :naming => "after"
-      @current_user.preference[:leads_per_page].should == "42"
-      @current_user.preference[:leads_outline].should  == "long"
-      @current_user.preference[:leads_sort_by].should  == "leads.first_name ASC"
-      @current_user.preference[:leads_naming].should   == "after"
+      xhr :post, :redraw, :per_page => 42, :view => "long", :sort_by => "first_name", :naming => "after"
+      current_user.preference[:leads_per_page].should == "42"
+      current_user.preference[:leads_index_view].should  == "long"
+      current_user.preference[:leads_sort_by].should  == "leads.first_name ASC"
+      current_user.preference[:leads_naming].should   == "after"
     end
 
     it "should set similar options for Contacts" do
       xhr :post, :redraw, :sort_by => "first_name", :naming => "after"
-      @current_user.pref[:contacts_sort_by].should == "contacts.first_name ASC"
-      @current_user.pref[:contacts_naming].should == "after"
+      current_user.pref[:contacts_sort_by].should == "contacts.first_name ASC"
+      current_user.pref[:contacts_naming].should == "after"
     end
 
     it "should reset current page to 1" do
-      xhr :post, :redraw, :per_page => 42, :outline => "long", :sort_by => "first_name", :naming => "after"
+      xhr :post, :redraw, :per_page => 42, :view => "long", :sort_by => "first_name", :naming => "after"
       session[:leads_current_page].should == 1
     end
 
     it "should select @leads and render [index] template" do
       @leads = [
-        FactoryGirl.create(:lead, :first_name => "Alice", :user => @current_user),
-        FactoryGirl.create(:lead, :first_name => "Bobby", :user => @current_user)
+        FactoryGirl.create(:lead, :first_name => "Alice", :user => current_user),
+        FactoryGirl.create(:lead, :first_name => "Bobby", :user => current_user)
       ]
 
       xhr :post, :redraw, :per_page => 1, :sort_by => "first_name"
@@ -1027,7 +1006,7 @@ describe LeadsController do
     it "should filter out leads as @leads and render :index action" do
       session[:leads_filter] = "contacted,rejected"
 
-      @leads = [ FactoryGirl.create(:lead, :user => @current_user, :status => "new") ]
+      @leads = [ FactoryGirl.create(:lead, :user => current_user, :status => "new") ]
       xhr :post, :filter, :status => "new"
       assigns[:leads].should == @leads
       response.should be_a_success
@@ -1044,4 +1023,3 @@ describe LeadsController do
   end
 
 end
-