fat_free_crm 0.11.3 → 0.11.4

data/spec/controllers/comments_controller_spec.rb

@@ -156,7 +156,7 @@ describe CommentsController do
     COMMENTABLE.each do |asset|
       it "should expose the requested comment as @commment and render [edit] template" do
         @asset = FactoryGirl.create(asset)
-        @comment = FactoryGirl.create(:comment, :id => 42, :commentable => @asset, :user => @current_user)
+        @comment = FactoryGirl.create(:comment, :id => 42, :commentable => @asset, :user => current_user)
         Comment.stub!(:new).and_return(@comment)
 
         xhr :get, :edit, :id => 42
@@ -176,10 +176,10 @@ describe CommentsController do
       COMMENTABLE.each do |asset|
         it "should expose a newly created comment as @comment for the #{asset}" do
           @asset = FactoryGirl.create(asset)
-          @comment = FactoryGirl.build(:comment, :commentable => @asset, :user => @current_user)
+          @comment = FactoryGirl.build(:comment, :commentable => @asset, :user => current_user)
           Comment.stub!(:new).and_return(@comment)
 
-          xhr :post, :create, :comment => { :commentable_type => asset.to_s.classify, :commentable_id => @asset.id, :user_id => @current_user.id, :comment => "Hello" }
+          xhr :post, :create, :comment => { :commentable_type => asset.to_s.classify, :commentable_id => @asset.id, :user_id => current_user.id, :comment => "Hello" }
           assigns[:comment].should == @comment
           response.should render_template("comments/create")
         end
@@ -190,7 +190,7 @@ describe CommentsController do
       COMMENTABLE.each do |asset|
         it "should expose a newly created but unsaved comment as @comment for #{asset}" do
           @asset = FactoryGirl.create(asset)
-          @comment = FactoryGirl.build(:comment, :commentable => @asset, :user => @current_user)
+          @comment = FactoryGirl.build(:comment, :commentable => @asset, :user => current_user)
           Comment.stub!(:new).and_return(@comment)
 
           xhr :post, :create, :comment => {}
@@ -258,7 +258,7 @@ describe CommentsController do
         COMMENTABLE.each do |asset|
           it "should destroy the requested comment and render [destroy] template" do
             @asset = FactoryGirl.create(asset)
-            @comment = FactoryGirl.create(:comment, :commentable => @asset, :user => @current_user)
+            @comment = FactoryGirl.create(:comment, :commentable => @asset, :user => current_user)
             Comment.stub!(:new).and_return(@comment)
 
             xhr :delete, :destroy, :id => @comment.id
@@ -271,4 +271,3 @@ describe CommentsController do
   end
 
 end
-

data/spec/controllers/emails_controller_spec.rb

@@ -16,7 +16,7 @@ describe EmailsController, "handling GET /emails" do
         MEDIATOR.each do |asset|
           it "should destroy the requested email and render [destroy] template" do
             @asset = FactoryGirl.create(asset)
-            @email = FactoryGirl.create(:email, :mediator => @asset, :user => @current_user)
+            @email = FactoryGirl.create(:email, :mediator => @asset, :user => current_user)
             Email.stub!(:new).and_return(@email)
 
             xhr :delete, :destroy, :id => @email.id
@@ -29,4 +29,3 @@ describe EmailsController, "handling GET /emails" do
   end
 
 end
-

data/spec/controllers/entities/accounts_controller_spec.rb

@@ -19,14 +19,14 @@ describe AccountsController do
     end
 
     it "should expose all accounts as @accounts and render [index] template" do
-      @accounts = [ FactoryGirl.create(:account, :user => @current_user) ]
+      @accounts = [ FactoryGirl.create(:account, :user => current_user) ]
       get :index
       assigns[:accounts].should == @accounts
       response.should render_template("accounts/index")
     end
 
     it "should collect the data for the accounts sidebar" do
-      @accounts = [ FactoryGirl.create(:account, :user => @current_user) ]
+      @accounts = [ FactoryGirl.create(:account, :user => current_user) ]
 
       get :index
       (assigns[:account_category_total].keys.map(&:to_sym) - (@category << :all << :other)).should == []
@@ -36,19 +36,19 @@ describe AccountsController do
       categories = %w(customer vendor)
       controller.session[:accounts_filter] = categories.join(',')
       @accounts = [
-        FactoryGirl.create(:account, :user => @current_user, :category => categories.first),
-        FactoryGirl.create(:account, :user => @current_user, :category => categories.last)
+        FactoryGirl.create(:account, :user => current_user, :category => categories.first),
+        FactoryGirl.create(:account, :user => current_user, :category => categories.last)
       ]
       # This one should be filtered out.
-      FactoryGirl.create(:account, :user => @current_user, :category => "competitor")
+      FactoryGirl.create(:account, :user => current_user, :category => "competitor")
 
       get :index
       assigns[:accounts].should == @accounts
     end
 
     it "should perform lookup using query string" do
-      @first  = FactoryGirl.create(:account, :user => @current_user, :name => "The first one")
-      @second = FactoryGirl.create(:account, :user => @current_user, :name => "The second one")
+      @first  = FactoryGirl.create(:account, :user => current_user, :name => "The first one")
+      @second = FactoryGirl.create(:account, :user => current_user, :name => "The second one")
 
       get :index, :query => "second"
       assigns[:accounts].should == [ @second ]
@@ -58,7 +58,7 @@ describe AccountsController do
 
     describe "AJAX pagination" do
       it "should pick up page number from params" do
-        @accounts = [ FactoryGirl.create(:account, :user => @current_user) ]
+        @accounts = [ FactoryGirl.create(:account, :user => current_user) ]
         xhr :get, :index, :page => 42
 
         assigns[:current_page].to_i.should == 42
@@ -69,13 +69,24 @@ describe AccountsController do
 
       it "should pick up saved page number from session" do
         session[:accounts_current_page] = 42
-        @accounts = [ FactoryGirl.create(:account, :user => @current_user) ]
+        @accounts = [ FactoryGirl.create(:account, :user => current_user) ]
         xhr :get, :index
 
         assigns[:current_page].should == 42
         assigns[:accounts].should == []
         response.should render_template("accounts/index")
       end
+
+      it "should reset current_page when query is altered" do
+        session[:accounts_current_page] = 42
+        session[:accounts_current_query] = "bill"
+        @accounts = [ FactoryGirl.create(:account, :user => current_user) ]
+        xhr :get, :index
+
+        assigns[:current_page].should == 1
+        assigns[:accounts].should == @accounts
+        response.should render_template("accounts/index")
+      end
     end
 
     describe "with mime type of JSON" do
@@ -108,7 +119,7 @@ describe AccountsController do
 
     describe "with mime type of HTML" do
       before do
-        @account = FactoryGirl.create(:account, :user => @current_user)
+        @account = FactoryGirl.create(:account, :user => current_user)
         @stage = Setting.unroll(:opportunity_stage)
         @comment = Comment.new
       end
@@ -129,7 +140,7 @@ describe AccountsController do
 
     describe "with mime type of JSON" do
       it "should render the requested account as json" do
-        @account = FactoryGirl.create(:account, :user => @current_user)
+        @account = FactoryGirl.create(:account, :user => current_user)
         Account.should_receive(:find).and_return(@account)
         @account.should_receive(:to_json).and_return("generated JSON")
 
@@ -141,7 +152,7 @@ describe AccountsController do
 
     describe "with mime type of XML" do
       it "should render the requested account as xml" do
-        @account = FactoryGirl.create(:account, :user => @current_user)
+        @account = FactoryGirl.create(:account, :user => current_user)
         Account.should_receive(:find).and_return(@account)
         @account.should_receive(:to_xml).and_return("generated XML")
 
@@ -153,7 +164,7 @@ describe AccountsController do
 
     describe "account got deleted or otherwise unavailable" do
       it "should redirect to account index if the account got deleted" do
-        @account = FactoryGirl.create(:account, :user => @current_user)
+        @account = FactoryGirl.create(:account, :user => current_user)
         @account.destroy
 
         get :show, :id => @account.id
@@ -170,7 +181,7 @@ describe AccountsController do
       end
 
       it "should return 404 (Not Found) JSON error" do
-        @account = FactoryGirl.create(:account, :user => @current_user)
+        @account = FactoryGirl.create(:account, :user => current_user)
         @account.destroy
         request.env["HTTP_ACCEPT"] = "application/json"
 
@@ -179,7 +190,7 @@ describe AccountsController do
       end
 
       it "should return 404 (Not Found) XML error" do
-        @account = FactoryGirl.create(:account, :user => @current_user)
+        @account = FactoryGirl.create(:account, :user => current_user)
         @account.destroy
         request.env["HTTP_ACCEPT"] = "application/xml"
 
@@ -196,12 +207,10 @@ describe AccountsController do
   describe "responding to GET new" do
 
     it "should expose a new account as @account and render [new] template" do
-      @account = Account.new(:user => @current_user)
-      @users = [ FactoryGirl.create(:user) ]
-
+      @account = Account.new(:user => current_user,
+                             :access => Setting.default_access)
       xhr :get, :new
       assigns[:account].attributes.should == @account.attributes
-      assigns[:users].should == @users
       assigns[:contact].should == nil
       response.should render_template("accounts/new")
     end
@@ -220,12 +229,10 @@ describe AccountsController do
   describe "responding to GET edit" do
 
     it "should expose the requested account as @account and render [edit] template" do
-      @account = FactoryGirl.create(:account, :id => 42, :user => @current_user)
-      @users = [ FactoryGirl.create(:user) ]
+      @account = FactoryGirl.create(:account, :id => 42, :user => current_user)
 
       xhr :get, :edit, :id => 42
       assigns[:account].should == @account
-      assigns[:users].should == @users
       assigns[:previous].should == nil
       response.should render_template("accounts/edit")
     end
@@ -240,7 +247,7 @@ describe AccountsController do
 
     describe "(account got deleted or is otherwise unavailable)" do
       it "should reload current page with the flash message if the account got deleted" do
-        @account = FactoryGirl.create(:account, :user => @current_user)
+        @account = FactoryGirl.create(:account, :user => current_user)
         @account.destroy
 
         xhr :get, :edit, :id => @account.id
@@ -259,7 +266,7 @@ describe AccountsController do
 
     describe "(previous account got deleted or is otherwise unavailable)" do
       before do
-        @account = FactoryGirl.create(:account, :user => @current_user)
+        @account = FactoryGirl.create(:account, :user => current_user)
         @previous = FactoryGirl.create(:account, :user => FactoryGirl.create(:user))
       end
 
@@ -291,44 +298,47 @@ describe AccountsController do
     describe "with valid params" do
 
       it "should expose a newly created account as @account and render [create] template" do
-        @account = FactoryGirl.build(:account, :name => "Hello world", :user => @current_user)
+        @account = FactoryGirl.build(:account, :name => "Hello world", :user => current_user)
         Account.stub!(:new).and_return(@account)
-        @users = [ FactoryGirl.create(:user) ]
 
-        xhr :post, :create, :account => { :name => "Hello world" }, :users => %w(1 2 3)
+        xhr :post, :create, :account => { :name => "Hello world" }
         assigns(:account).should == @account
-        assigns(:users).should == @users
         response.should render_template("accounts/create")
       end
 
       # Note: [Create Account] is shown only on Accounts index page.
       it "should reload accounts to update pagination" do
-        @account = FactoryGirl.build(:account, :user => @current_user)
+        @account = FactoryGirl.build(:account, :user => current_user)
         Account.stub!(:new).and_return(@account)
 
-        xhr :post, :create, :account => { :name => "Hello" }, :users => %w(1 2 3)
+        xhr :post, :create, :account => { :name => "Hello" }
         assigns[:accounts].should == [ @account ]
       end
 
       it "should get data to update account sidebar" do
-        @account = FactoryGirl.build(:account, :name => "Hello", :user => @current_user)
+        @account = FactoryGirl.build(:account, :name => "Hello", :user => current_user)
         Campaign.stub!(:new).and_return(@account)
-        @users = [ FactoryGirl.create(:user) ]
 
-        xhr :post, :create, :account => { :name => "Hello" }, :users => %w(1 2 3)
+        xhr :post, :create, :account => { :name => "Hello" }
         assigns[:account_category_total].should be_instance_of(HashWithIndifferentAccess)
       end
+
+      it "should add a new comment to the newly created account when specified" do
+        @account = FactoryGirl.build(:account, :name => "Hello world", :user => current_user)
+        Account.stub!(:new).and_return(@account)
+
+        xhr :post, :create, :account => { :name => "Hello world" }, :comment_body => "Awesome comment is awesome"
+        assigns[:account].comments.map(&:comment).should include("Awesome comment is awesome")
+      end
     end
 
     describe "with invalid params" do
       it "should expose a newly created but unsaved account as @account and still render [create] template" do
         @account = FactoryGirl.build(:account, :name => nil, :user => nil)
         Account.stub!(:new).and_return(@account)
-        @users = [ FactoryGirl.create(:user) ]
 
-        xhr :post, :create, :account => {}, :users => []
+        xhr :post, :create, :account => {}
         assigns(:account).should == @account
-        assigns(:users).should == @users
         response.should render_template("accounts/create")
       end
     end
@@ -353,25 +363,22 @@ describe AccountsController do
         @account = FactoryGirl.create(:account, :id => 42)
         request.env["HTTP_REFERER"] = "http://localhost/accounts"
 
-        xhr :put, :update, :id => 42, :account => { :name => "Hello" }, :users => []
+        xhr :put, :update, :id => 42, :account => { :name => "Hello" }
         assigns(:account).should == @account
         assigns[:account_category_total].should be_instance_of(HashWithIndifferentAccess)
       end
 
       it "should update account permissions when sharing with specific users" do
         @account = FactoryGirl.create(:account, :id => 42, :access => "Public")
-        he  = FactoryGirl.create(:user, :id => 7)
-        she = FactoryGirl.create(:user, :id => 8)
 
-        xhr :put, :update, :id => 42, :account => { :name => "Hello", :access => "Shared" }, :users => %w(7 8)
-        @account.reload.access.should == "Shared"
-        @account.permissions.map(&:user_id).sort.should == [ 7, 8 ]
-        assigns[:account].should == @account
+        xhr :put, :update, :id => 42, :account => { :name => "Hello", :access => "Shared", :user_ids => [7, 8] }
+        assigns[:account].access.should == "Shared"
+        assigns[:account].user_ids.sort.should == [7, 8]
       end
 
       describe "account got deleted or otherwise unavailable" do
         it "should reload current page is the account got deleted" do
-          @account = FactoryGirl.create(:account, :user => @current_user)
+          @account = FactoryGirl.create(:account, :user => current_user)
           @account.destroy
 
           xhr :put, :update, :id => @account.id
@@ -394,7 +401,7 @@ describe AccountsController do
         @account = FactoryGirl.create(:account, :id => 42, :name => "Hello people")
 
         xhr :put, :update, :id => 42, :account => { :name => nil }
-        @account.reload.name.should == "Hello people"
+        assigns(:account).reload.name.should == "Hello people"
         assigns(:account).should == @account
         response.should render_template("accounts/update")
       end
@@ -407,12 +414,12 @@ describe AccountsController do
   #----------------------------------------------------------------------------
   describe "responding to DELETE destroy" do
     before do
-      @account = FactoryGirl.create(:account, :user => @current_user)
+      @account = FactoryGirl.create(:account, :user => current_user)
     end
 
     describe "AJAX request" do
       it "should destroy the requested account and render [destroy] template" do
-        @another_account = FactoryGirl.create(:account, :user => @current_user)
+        @another_account = FactoryGirl.create(:account, :user => current_user)
         xhr :delete, :destroy, :id => @account.id
 
         lambda { Account.find(@account) }.should raise_error(ActiveRecord::RecordNotFound)
@@ -444,7 +451,7 @@ describe AccountsController do
 
       describe "account got deleted or otherwise unavailable" do
         it "should reload current page is the account got deleted" do
-          @account = FactoryGirl.create(:account, :user => @current_user)
+          @account = FactoryGirl.create(:account, :user => current_user)
           @account.destroy
 
           xhr :delete, :destroy, :id => @account.id
@@ -471,7 +478,7 @@ describe AccountsController do
       end
 
       it "should redirect to account index with the flash message is the account got deleted" do
-        @account = FactoryGirl.create(:account, :user => @current_user)
+        @account = FactoryGirl.create(:account, :user => current_user)
         @account.destroy
 
         delete :destroy, :id => @account.id
@@ -548,53 +555,31 @@ describe AccountsController do
   #----------------------------------------------------------------------------
   describe "responding to POST auto_complete" do
     before do
-      @auto_complete_matches = [ FactoryGirl.create(:account, :name => "Hello World", :user => @current_user) ]
+      @auto_complete_matches = [ FactoryGirl.create(:account, :name => "Hello World", :user => current_user) ]
     end
 
     it_should_behave_like("auto complete")
   end
 
-  # GET /accounts/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 => "accounts_per_page", :value => Base64.encode64(Marshal.dump(42)))
-      @outline  = FactoryGirl.create(:preference, :user => @current_user, :name => "accounts_outline",  :value => Base64.encode64(Marshal.dump("option_long")))
-      @sort_by  = FactoryGirl.create(:preference, :user => @current_user, :name => "accounts_sort_by",  :value => Base64.encode64(Marshal.dump("accounts.name ASC")))
-
-      xhr :get, :options
-      assigns[:per_page].should == 42
-      assigns[:outline].should  == "option_long"
-      assigns[:sort_by].should  == "accounts.name ASC"
-    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
-    end
-  end
-
   # POST /accounts/redraw                                                 AJAX
   #----------------------------------------------------------------------------
   describe "responding to POST redraw" do
     it "should save user selected account preference" do
-      xhr :post, :redraw, :per_page => 42, :outline => "brief", :sort_by => "name"
-      @current_user.preference[:accounts_per_page].should == "42"
-      @current_user.preference[:accounts_outline].should  == "brief"
-      @current_user.preference[:accounts_sort_by].should  == "accounts.name ASC"
+      xhr :post, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
+      current_user.preference[:accounts_per_page].should == "42"
+      current_user.preference[:accounts_index_view].should  == "brief"
+      current_user.preference[:accounts_sort_by].should  == "accounts.name ASC"
     end
 
     it "should reset current page to 1" do
-      xhr :post, :redraw, :per_page => 42, :outline => "brief", :sort_by => "name"
+      xhr :post, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
       session[:accounts_current_page].should == 1
     end
 
     it "should select @accounts and render [index] template" do
       @accounts = [
-        FactoryGirl.create(:account, :name => "A", :user => @current_user),
-        FactoryGirl.create(:account, :name => "B", :user => @current_user)
+        FactoryGirl.create(:account, :name => "A", :user => current_user),
+        FactoryGirl.create(:account, :name => "B", :user => current_user)
       ]
 
       xhr :post, :redraw, :per_page => 1, :sort_by => "name"
@@ -608,7 +593,7 @@ describe AccountsController do
   describe "responding to POST filter" do
     it "should expose filtered accounts as @accounts and render [index] template" do
       session[:accounts_filter] = "customer,vendor"
-      @accounts = [ FactoryGirl.create(:account, :category => "partner", :user => @current_user) ]
+      @accounts = [ FactoryGirl.create(:account, :category => "partner", :user => current_user) ]
 
       xhr :post, :filter, :category => "partner"
       assigns(:accounts).should == @accounts
@@ -623,4 +608,3 @@ describe AccountsController do
     end
   end
 end
-

data/spec/controllers/entities/campaigns_controller_spec.rb

@@ -21,7 +21,7 @@ describe CampaignsController do
     end
 
     it "should expose all campaigns as @campaigns and render [index] template" do
-      @campaigns = [ FactoryGirl.create(:campaign, :user => @current_user) ]
+      @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
       get :index
       assigns[:campaigns].should == @campaigns
@@ -29,7 +29,7 @@ describe CampaignsController do
     end
 
     it "should collect the data for the opportunities sidebar" do
-      @campaigns = [ FactoryGirl.create(:campaign, :user => @current_user) ]
+      @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
       get :index
       (assigns[:campaign_status_total].keys.map(&:to_sym) - (@status << :all << :other)).should == []
@@ -38,12 +38,12 @@ describe CampaignsController do
     it "should filter out campaigns by status" do
       controller.session[:campaigns_filter] = "planned,started"
       @campaigns = [
-        FactoryGirl.create(:campaign, :user => @current_user, :status => "started"),
-        FactoryGirl.create(:campaign, :user => @current_user, :status => "planned")
+        FactoryGirl.create(:campaign, :user => current_user, :status => "started"),
+        FactoryGirl.create(:campaign, :user => current_user, :status => "planned")
       ]
 
       # This one should be filtered out.
-      FactoryGirl.create(:campaign, :user => @current_user, :status => "completed")
+      FactoryGirl.create(:campaign, :user => current_user, :status => "completed")
 
       get :index
       # Note: can't compare campaigns directly because of BigDecimal objects.
@@ -52,8 +52,8 @@ describe CampaignsController do
     end
 
     it "should perform lookup using query string" do
-      @first  = FactoryGirl.create(:campaign, :user => @current_user, :name => "Hello, world!")
-      @second = FactoryGirl.create(:campaign, :user => @current_user, :name => "Hello again")
+      @first  = FactoryGirl.create(:campaign, :user => current_user, :name => "Hello, world!")
+      @second = FactoryGirl.create(:campaign, :user => current_user, :name => "Hello again")
 
       get :index, :query => "again"
       assigns[:campaigns].should == [ @second ]
@@ -63,7 +63,7 @@ describe CampaignsController do
 
     describe "AJAX pagination" do
       it "should pick up page number from params" do
-        @campaigns = [ FactoryGirl.create(:campaign, :user => @current_user) ]
+        @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
         xhr :get, :index, :page => 42
 
         assigns[:current_page].to_i.should == 42
@@ -74,13 +74,24 @@ describe CampaignsController do
 
       it "should pick up saved page number from session" do
         session[:campaigns_current_page] = 42
-        @campaigns = [ FactoryGirl.create(:campaign, :user => @current_user) ]
+        @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
         xhr :get, :index
 
         assigns[:current_page].should == 42
         assigns[:campaigns].should == []
         response.should render_template("campaigns/index")
       end
+
+      it "should reset current_page when query is altered" do
+        session[:campaigns_current_page] = 42
+        session[:campaigns_current_query] = "bill"
+        @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
+        xhr :get, :index
+
+        assigns[:current_page].should == 1
+        assigns[:campaigns].should == @campaigns
+        response.should render_template("campaigns/index")
+      end
     end
 
     describe "with mime type of JSON" do
@@ -113,7 +124,7 @@ describe CampaignsController do
 
     describe "with mime type of HTML" do
       before(:each) do
-        @campaign = FactoryGirl.create(:campaign, :id => 42, :user => @current_user)
+        @campaign = FactoryGirl.create(:campaign, :id => 42, :user => current_user)
         @stage = Setting.unroll(:opportunity_stage)
         @comment = Comment.new
       end
@@ -134,7 +145,7 @@ describe CampaignsController do
 
     describe "with mime type of JSON" do
       it "should render the requested campaign as JSON" do
-        @campaign = FactoryGirl.create(:campaign, :id => 42, :user => @current_user)
+        @campaign = FactoryGirl.create(:campaign, :id => 42, :user => current_user)
         Campaign.should_receive(:find).and_return(@campaign)
         @campaign.should_receive(:to_json).and_return("generated JSON")
 
@@ -146,7 +157,7 @@ describe CampaignsController do
 
     describe "with mime type of XML" do
       it "should render the requested campaign as XML" do
-        @campaign = FactoryGirl.create(:campaign, :id => 42, :user => @current_user)
+        @campaign = FactoryGirl.create(:campaign, :id => 42, :user => current_user)
         Campaign.should_receive(:find).and_return(@campaign)
         @campaign.should_receive(:to_xml).and_return("generated XML")
 
@@ -158,7 +169,7 @@ describe CampaignsController do
 
     describe "campaign got deleted or otherwise unavailable" do
       it "should redirect to campaign index if the campaign got deleted" do
-        @campaign = FactoryGirl.create(:campaign, :user => @current_user)
+        @campaign = FactoryGirl.create(:campaign, :user => current_user)
         @campaign.destroy
 
         get :show, :id => @campaign.id
@@ -175,7 +186,7 @@ describe CampaignsController do
       end
 
       it "should return 404 (Not Found) JSON error" do
-        @campaign = FactoryGirl.create(:campaign, :user => @current_user)
+        @campaign = FactoryGirl.create(:campaign, :user => current_user)
         @campaign.destroy
         request.env["HTTP_ACCEPT"] = "application/json"
 
@@ -184,7 +195,7 @@ describe CampaignsController do
       end
 
       it "should return 404 (Not Found) XML error" do
-        @campaign = FactoryGirl.create(:campaign, :user => @current_user)
+        @campaign = FactoryGirl.create(:campaign, :user => current_user)
         @campaign.destroy
         request.env["HTTP_ACCEPT"] = "application/xml"
 
@@ -200,12 +211,10 @@ describe CampaignsController do
   describe "responding to GET new" do
 
     it "should expose a new campaign as @campaign" do
-      @campaign = Campaign.new(:user => @current_user)
-      @users = [ FactoryGirl.create(:user) ]
-
+      @campaign = Campaign.new(:user => current_user,
+                               :access => Setting.default_access)
       xhr :get, :new
       assigns[:campaign].attributes.should == @campaign.attributes
-      assigns[:users].should == @users
       response.should render_template("campaigns/new")
     end
 
@@ -222,12 +231,10 @@ describe CampaignsController do
   describe "responding to GET edit" do
 
     it "should expose the requested campaign as @campaign and render [edit] template" do
-      @campaign = FactoryGirl.create(:campaign, :id => 42, :user => @current_user)
-      @users = [ FactoryGirl.create(:user) ]
+      @campaign = FactoryGirl.create(:campaign, :id => 42, :user => current_user)
 
       xhr :get, :edit, :id => 42
       assigns[:campaign].should == @campaign
-      assigns[:users].should == @users
       response.should render_template("campaigns/edit")
     end
 
@@ -242,7 +249,7 @@ describe CampaignsController do
 
     describe "(campaign got deleted or is otherwise unavailable)" do
       it "should reload current page with the flash message if the campaign got deleted" do
-        @campaign = FactoryGirl.create(:campaign, :user => @current_user)
+        @campaign = FactoryGirl.create(:campaign, :user => current_user)
         @campaign.destroy
 
         xhr :get, :edit, :id => @campaign.id
@@ -261,7 +268,7 @@ describe CampaignsController do
 
     describe "(previous campaign got deleted or is otherwise unavailable)" do
       before(:each) do
-        @campaign = FactoryGirl.create(:campaign, :user => @current_user)
+        @campaign = FactoryGirl.create(:campaign, :user => current_user)
         @previous = FactoryGirl.create(:campaign, :user => FactoryGirl.create(:user))
       end
 
@@ -293,44 +300,47 @@ describe CampaignsController do
     describe "with valid params" do
 
       it "should expose a newly created campaign as @campaign and render [create] template" do
-        @campaign = FactoryGirl.build(:campaign, :name => "Hello", :user => @current_user)
+        @campaign = FactoryGirl.build(:campaign, :name => "Hello", :user => current_user)
         Campaign.stub!(:new).and_return(@campaign)
-        @users = [ FactoryGirl.create(:user) ]
 
-        xhr :post, :create, :campaign => { :name => "Hello" }, :users => %w(1 2 3)
+        xhr :post, :create, :campaign => { :name => "Hello" }
         assigns(:campaign).should == @campaign
-        assigns(:users).should == @users
         response.should render_template("campaigns/create")
       end
 
       it "should get data to update campaign sidebar" do
-        @campaign = FactoryGirl.build(:campaign, :name => "Hello", :user => @current_user)
+        @campaign = FactoryGirl.build(:campaign, :name => "Hello", :user => current_user)
         Campaign.stub!(:new).and_return(@campaign)
-        @users = [ FactoryGirl.create(:user) ]
 
-        xhr :post, :create, :campaign => { :name => "Hello" }, :users => %w(1 2 3)
+        xhr :post, :create, :campaign => { :name => "Hello" }
         assigns[:campaign_status_total].should be_instance_of(HashWithIndifferentAccess)
       end
 
       it "should reload campaigns to update pagination" do
-        @campaign = FactoryGirl.build(:campaign, :user => @current_user)
+        @campaign = FactoryGirl.build(:campaign, :user => current_user)
         Campaign.stub!(:new).and_return(@campaign)
 
-        xhr :post, :create, :campaign => { :name => "Hello" }, :users => %w(1 2 3)
+        xhr :post, :create, :campaign => { :name => "Hello" }
         assigns[:campaigns].should == [ @campaign ]
       end
+
+      it "should add a new comment to the newly created campaign when specified" do
+        @campaign = FactoryGirl.build(:campaign, :name => "Hello world", :user => current_user)
+        Campaign.stub!(:new).and_return(@campaign)
+
+        xhr :post, :create, :campaign => { :name => "Hello world" }, :comment_body => "Awesome comment is awesome"
+        @campaign.reload.comments.map(&:comment).should include("Awesome comment is awesome")
+      end
     end
 
     describe "with invalid params" do
 
       it "should expose a newly created but unsaved campaign as @campaign and still render [create] template" do
-        @campaign = FactoryGirl.build(:campaign, :id => nil, :name => nil, :user => @current_user)
+        @campaign = FactoryGirl.build(:campaign, :id => nil, :name => nil, :user => current_user)
         Campaign.stub!(:new).and_return(@campaign)
-        @users = [ FactoryGirl.create(:user) ]
 
-        xhr :post, :create, :campaign => nil, :users => %w(1 2 3)
+        xhr :post, :create, :campaign => nil
         assigns(:campaign).should == @campaign
-        assigns(:users).should == @users
         response.should render_template("campaigns/create")
       end
     end
@@ -346,7 +356,7 @@ describe CampaignsController do
       it "should update the requested campaign and render [update] template" do
         @campaign = FactoryGirl.create(:campaign, :id => 42, :name => "Bye")
 
-        xhr :put, :update, :id => 42, :campaign => { :name => "Hello" }, :users => []
+        xhr :put, :update, :id => 42, :campaign => { :name => "Hello" }
         @campaign.reload.name.should == "Hello"
         assigns(:campaign).should == @campaign
         response.should render_template("campaigns/update")
@@ -356,7 +366,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.create(:campaign, :id => 42)
         request.env["HTTP_REFERER"] = "http://localhost/campaigns"
 
-        xhr :put, :update, :id => 42, :campaign => { :name => "Hello" }, :users => []
+        xhr :put, :update, :id => 42, :campaign => { :name => "Hello" }
         assigns(:campaign).should == @campaign
         assigns[:campaign_status_total].should be_instance_of(HashWithIndifferentAccess)
       end
@@ -366,18 +376,17 @@ describe CampaignsController do
         he  = FactoryGirl.create(:user, :id => 7)
         she = FactoryGirl.create(:user, :id => 8)
 
-        xhr :put, :update, :id => 42, :campaign => { :name => "Hello", :access => "Shared" }, :users => %w(7 8)
-        @campaign.reload.access.should == "Shared"
-        @campaign.permissions.map(&:user_id).sort.should == [ 7, 8 ]
-        assigns[:campaign].should == @campaign
+        xhr :put, :update, :id => 42, :campaign => { :name => "Hello", :access => "Shared", :user_ids => %w(7 8) }
+        assigns[:campaign].access.should == "Shared"
+        assigns[:campaign].user_ids.sort.should == [ 7, 8 ]
       end
 
       describe "campaign got deleted or otherwise unavailable" do
         it "should reload current page with the flash message if the campaign got deleted" do
-          @campaign = FactoryGirl.create(:campaign, :user => @current_user)
+          @campaign = FactoryGirl.create(:campaign, :user => current_user)
           @campaign.destroy
 
-          xhr :put, :update, :id => @campaign.id, :users => []
+          xhr :put, :update, :id => @campaign.id
           flash[:warning].should_not == nil
           response.body.should == "window.location.reload();"
         end
@@ -385,7 +394,7 @@ describe CampaignsController do
         it "should reload current page with the flash message if the campaign is protected" do
           @private = FactoryGirl.create(:campaign, :user => FactoryGirl.create(:user), :access => "Private")
 
-          xhr :put, :update, :id => @private.id, :users => []
+          xhr :put, :update, :id => @private.id
           flash[:warning].should_not == nil
           response.body.should == "window.location.reload();"
         end
@@ -395,13 +404,11 @@ describe CampaignsController do
     describe "with invalid params" do
 
       it "should not update the requested campaign, but still expose it as @campaign and still render [update] template" do
-        @campaign = FactoryGirl.create(:campaign, :id => 42, :name => "Hello", :user => @current_user)
-        @users = [ FactoryGirl.create(:user) ]
+        @campaign = FactoryGirl.create(:campaign, :id => 42, :name => "Hello", :user => current_user)
 
         xhr :put, :update, :id => 42, :campaign => { :name => nil }
         @campaign.reload.name.should == "Hello"
         assigns(:campaign).should == @campaign
-        assigns(:users).should == @users
         response.should render_template("campaigns/update")
       end
     end
@@ -412,12 +419,12 @@ describe CampaignsController do
   #----------------------------------------------------------------------------
   describe "responding to DELETE destroy" do
     before(:each) do
-      @campaign = FactoryGirl.create(:campaign, :user => @current_user)
+      @campaign = FactoryGirl.create(:campaign, :user => current_user)
     end
 
     describe "AJAX request" do
       it "should destroy the requested campaign and render [destroy] template" do
-        @another_campaign = FactoryGirl.create(:campaign, :user => @current_user)
+        @another_campaign = FactoryGirl.create(:campaign, :user => current_user)
         xhr :delete, :destroy, :id => @campaign.id
 
         assigns[:campaigns].should == [ @another_campaign ]
@@ -449,7 +456,7 @@ describe CampaignsController do
 
       describe "campaign got deleted or otherwise unavailable" do
         it "should reload current page with the flash message if the campaign got deleted" do
-          @campaign = FactoryGirl.create(:campaign, :user => @current_user)
+          @campaign = FactoryGirl.create(:campaign, :user => current_user)
           @campaign.destroy
 
           xhr :delete, :destroy, :id => @campaign.id
@@ -476,7 +483,7 @@ describe CampaignsController do
       end
 
       it "should redirect to campaign index with the flash message is the campaign got deleted" do
-        @campaign = FactoryGirl.create(:campaign, :user => @current_user)
+        @campaign = FactoryGirl.create(:campaign, :user => current_user)
         @campaign.destroy
 
         delete :destroy, :id => @campaign.id
@@ -587,53 +594,31 @@ describe CampaignsController do
   #----------------------------------------------------------------------------
   describe "responding to POST auto_complete" do
     before(:each) do
-      @auto_complete_matches = [ FactoryGirl.create(:campaign, :name => "Hello World", :user => @current_user) ]
+      @auto_complete_matches = [ FactoryGirl.create(:campaign, :name => "Hello World", :user => current_user) ]
     end
 
     it_should_behave_like("auto complete")
   end
 
-  # GET /campaigns/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 => "campaigns_per_page", :value => Base64.encode64(Marshal.dump(42)))
-      @outline  = FactoryGirl.create(:preference, :user => @current_user, :name => "campaigns_outline",  :value => Base64.encode64(Marshal.dump("option_long")))
-      @sort_by  = FactoryGirl.create(:preference, :user => @current_user, :name => "campaigns_sort_by",  :value => Base64.encode64(Marshal.dump("campaigns.name ASC")))
-
-      xhr :get, :options
-      assigns[:per_page].should == 42
-      assigns[:outline].should  == "option_long"
-      assigns[:sort_by].should  == "campaigns.name ASC"
-    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
-    end
-  end
-
   # POST /campaigns/redraw                                                 AJAX
   #----------------------------------------------------------------------------
   describe "responding to POST redraw" do
     it "should save user selected campaign preference" do
-      xhr :post, :redraw, :per_page => 42, :outline => "brief", :sort_by => "name"
-      @current_user.preference[:campaigns_per_page].should == "42"
-      @current_user.preference[:campaigns_outline].should  == "brief"
-      @current_user.preference[:campaigns_sort_by].should  == "campaigns.name ASC"
+      xhr :post, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
+      current_user.preference[:campaigns_per_page].should == "42"
+      current_user.preference[:campaigns_index_view].should  == "brief"
+      current_user.preference[:campaigns_sort_by].should  == "campaigns.name ASC"
     end
 
     it "should reset current page to 1" do
-      xhr :post, :redraw, :per_page => 42, :outline => "brief", :sort_by => "name"
+      xhr :post, :redraw, :per_page => 42, :view => "brief", :sort_by => "name"
       session[:campaigns_current_page].should == 1
     end
 
     it "should select @campaigns and render [index] template" do
       @campaigns = [
-        FactoryGirl.create(:campaign, :name => "A", :user => @current_user),
-        FactoryGirl.create(:campaign, :name => "B", :user => @current_user)
+        FactoryGirl.create(:campaign, :name => "A", :user => current_user),
+        FactoryGirl.create(:campaign, :name => "B", :user => current_user)
       ]
 
       xhr :post, :redraw, :per_page => 1, :sort_by => "name"
@@ -648,7 +633,7 @@ describe CampaignsController do
 
     it "should expose filtered campaigns as @campaigns and render [index] template" do
       session[:campaigns_filter] = "planned,started"
-      @campaigns = [ FactoryGirl.create(:campaign, :status => "completed", :user => @current_user) ]
+      @campaigns = [ FactoryGirl.create(:campaign, :status => "completed", :user => current_user) ]
 
       xhr :post, :filter, :status => "completed"
       assigns(:campaigns).should == @campaigns
@@ -665,4 +650,3 @@ describe CampaignsController do
   end
 
 end
-