fat_free_crm 0.11.3 → 0.11.4

data/spec/views/contacts/_new.haml_spec.rb

@@ -7,7 +7,7 @@ describe "/contacts/_new" do
     login_and_assign
     @account = FactoryGirl.create(:account)
     assign(:contact, Contact.new)
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:account, @account)
     assign(:accounts, [ @account ])
   end
@@ -17,7 +17,7 @@ describe "/contacts/_new" do
     view.should render_template(:partial => "contacts/_top_section")
     view.should render_template(:partial => "contacts/_extra")
     view.should render_template(:partial => "contacts/_web")
-    view.should render_template(:partial => "contacts/_permissions")
+    view.should render_template(:partial => "entities/_permissions")
 
     rendered.should have_tag("form[class=new_contact]")
   end
@@ -44,4 +44,3 @@ describe "/contacts/_new" do
   end
 
 end
-

data/spec/views/contacts/create.rjs_spec.rb

@@ -50,9 +50,8 @@ describe "/contacts/create" do
   describe "create failure" do
     it "create (failure): should re-render [create] template in :create_contact div" do
       assign(:contact, FactoryGirl.build(:contact, :first_name => nil)) # make it invalid
-      @current_user = FactoryGirl.create(:user)
       @account = FactoryGirl.create(:account)
-      assign(:users, [ @current_user ])
+      assign(:users, [ FactoryGirl.create(:user) ])
       assign(:account, @account)
       assign(:accounts, [ @account ])
 
@@ -66,4 +65,3 @@ describe "/contacts/create" do
   end
 
 end
-

data/spec/views/contacts/edit.rjs_spec.rb

@@ -5,8 +5,8 @@ describe "/contacts/edit" do
 
   before do
     login_and_assign
-    assign(:contact, @contact = FactoryGirl.create(:contact, :user => @current_user))
-    assign(:users, [ @current_user ])
+    assign(:contact, @contact = FactoryGirl.create(:contact, :user => current_user))
+    assign(:users, [ current_user ])
     assign(:account, @account = FactoryGirl.create(:account))
     assign(:accounts, [ @account ])
   end
@@ -30,7 +30,7 @@ describe "/contacts/edit" do
 
   it "edit: should hide previously open [Edit Contact] for and replace it with contact partial" do
     params[:cancel] = nil
-    assign(:previous, previous = FactoryGirl.create(:contact, :user => @current_user))
+    assign(:previous, previous = FactoryGirl.create(:contact, :user => current_user))
 
     render
     rendered.should have_rjs("contact_#{previous.id}") do |rjs|
@@ -74,4 +74,3 @@ describe "/contacts/edit" do
   end
 
 end
-

data/spec/views/contacts/index.haml_spec.rb

@@ -4,6 +4,10 @@ describe "/contacts/index" do
   include ContactsHelper
 
   before do
+    view.lookup_context.prefixes << 'entities'
+    assign :per_page, Contact.per_page
+    assign :sort_by,  Contact.sort_by
+    assign :ransack_search, Contact.search
     login_and_assign
   end
 
@@ -12,7 +16,7 @@ describe "/contacts/index" do
 
     render
     view.should render_template(:partial => "_contact")
-    view.should render_template(:partial => "shared/_paginate")
+    view.should render_template(:partial => "shared/_paginate_with_per_page")
   end
 
   it "should render a message if there're no contacts" do
@@ -21,8 +25,7 @@ describe "/contacts/index" do
     render
     view.should_not render_template(:partial => "_contact")
     view.should render_template(:partial => "shared/_empty")
-    view.should render_template(:partial => "shared/_paginate")
+    view.should render_template(:partial => "shared/_paginate_with_per_page")
   end
 
 end
-

data/spec/views/contacts/new.rjs_spec.rb

@@ -6,8 +6,8 @@ describe "/contacts/new" do
   before do
     login_and_assign
     @account = FactoryGirl.create(:account)
-    assign(:contact, Contact.new(:user => @current_user))
-    assign(:users, [ @current_user ])
+    assign(:contact, Contact.new(:user => current_user))
+    assign(:users, [ current_user ])
     assign(:account, @account)
     assign(:accounts, [ @account ])
   end
@@ -18,13 +18,6 @@ describe "/contacts/new" do
     rendered.should include('crm.flick("empty", "toggle")')
   end
 
-  it "should hide options form when called from Contacts index" do
-    controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
-    render
-
-    rendered.should include('crm.hide_form("options")')
-  end
-
   describe "new contact" do
     it "should render [new] template into :create_contact div" do
       params[:cancel] = nil
@@ -47,5 +40,3 @@ describe "/contacts/new" do
   end
 
 end
-
-

data/spec/views/contacts/show.haml_spec.rb

@@ -8,7 +8,7 @@ describe "/contacts/show" do
     @contact = FactoryGirl.create(:contact, :id => 42,
       :opportunities => [ FactoryGirl.create(:opportunity) ])
     assign(:contact, @contact)
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:comment, Comment.new)
     assign(:timeline, [ FactoryGirl.create(:comment, :commentable => @contact) ])
   end
@@ -24,4 +24,3 @@ describe "/contacts/show" do
   end
 
 end
-

data/spec/views/contacts/update.rjs_spec.rb

@@ -6,8 +6,8 @@ describe "/contacts/update" do
   before do
     login_and_assign
 
-    assign(:contact, @contact = FactoryGirl.create(:contact, :user => @current_user))
-    assign(:users, [ @current_user ])
+    assign(:contact, @contact = FactoryGirl.create(:contact, :user => current_user))
+    assign(:users, [ current_user ])
     assign(:account, @account = FactoryGirl.create(:account))
     assign(:accounts, [ @account ])
   end
@@ -138,4 +138,3 @@ describe "/contacts/update" do
     end
   end # errors
 end
-

data/spec/views/home/index.haml_spec.rb

@@ -9,14 +9,18 @@ describe "/home/index" do
 
   it "should render list of activities if it's not empty" do
     assign(:activities, [ FactoryGirl.create(:version, :event => "update", :item => FactoryGirl.create(:account)) ])
-
+    assign(:my_tasks, [])
+    assign(:my_opportunities, [])
+    assign(:my_accounts, [])
     render
     view.should render_template(:partial => "_activity")
   end
 
   it "should render a message if there're no activities" do
     assign(:activities, [])
-
+    assign(:my_tasks, [])
+    assign(:my_opportunities, [])
+    assign(:my_accounts, [])
     render
     view.should_not render_template(:partial => "_activity")
 

data/spec/views/home/index.rjs_spec.rb

@@ -8,7 +8,7 @@ describe "/home/index" do
   end
 
   it "should render [activity] template with @activities collection" do
-    assign(:activities, [ FactoryGirl.create(:version, :id => 42, :event => "update", :item => FactoryGirl.create(:account), :whodunnit => @current_user.id.to_s) ])
+    assign(:activities, [ FactoryGirl.create(:version, :id => 42, :event => "update", :item => FactoryGirl.create(:account), :whodunnit => current_user.id.to_s) ])
 
     render :template => 'home/index', :formats => [:js]
 
@@ -27,4 +27,3 @@ describe "/home/index" do
   end
 
 end
-

data/spec/views/home/options.rjs_spec.rb

@@ -17,7 +17,7 @@ describe "/home/options" do
     render
 
     rendered.should have_rjs("options") do |rjs|
-      with_tag("input[type=hidden]") # @current_user
+      with_tag("input[type=hidden]") # current_user
 
       user_menu = "onLoading:function(request){$('user').update('all users'); " +
                   "$('loading').show()}, parameters:'user=all_users'}); } } }"
@@ -49,4 +49,3 @@ describe "/home/options" do
     rendered.should include('crm.set_title("title", "Recent Activity")')
   end
 end
-

data/spec/views/leads/_convert.haml_spec.rb

@@ -7,7 +7,7 @@ describe "/leads/_convert" do
     login_and_assign
     @account = FactoryGirl.create(:account)
     assign(:lead, FactoryGirl.create(:lead))
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:account, @account)
     assign(:accounts, [ @account ])
     assign(:opportunity, FactoryGirl.create(:opportunity))
@@ -22,4 +22,3 @@ describe "/leads/_convert" do
   end
 
 end
-

data/spec/views/leads/_edit.haml_spec.rb

@@ -6,7 +6,7 @@ describe "/leads/_edit" do
   before do
     login_and_assign
     assign(:lead, @lead = FactoryGirl.create(:lead))
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:campaign, @campaign = FactoryGirl.create(:campaign))
     assign(:campaigns, [ @campaign ])
   end
@@ -17,7 +17,7 @@ describe "/leads/_edit" do
     view.should render_template(:partial => "leads/_status")
     view.should render_template(:partial => "leads/_contact")
     view.should render_template(:partial => "leads/_web")
-    view.should render_template(:partial => "leads/_permissions")
+    view.should render_template(:partial => "entities/_permissions")
 
     rendered.should have_tag("form[class=edit_lead]") do
       with_tag "input[type=hidden][id=lead_user_id][value=#{@lead.user_id}]"
@@ -38,4 +38,3 @@ describe "/leads/_edit" do
     rendered.should_not have_tag("textarea[id=lead_background_info]")
   end
 end
-

data/spec/views/leads/_new.haml_spec.rb

@@ -6,7 +6,7 @@ describe "/leads/_new" do
   before do
     login_and_assign
     assign(:lead, FactoryGirl.build(:lead))
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:campaign, @campaign = FactoryGirl.create(:campaign))
     assign(:campaigns, [ @campaign ])
   end
@@ -17,7 +17,7 @@ describe "/leads/_new" do
     view.should render_template(:partial => "leads/_status")
     view.should render_template(:partial => "leads/_contact")
     view.should render_template(:partial => "leads/_web")
-    view.should render_template(:partial => "leads/_permissions")
+    view.should render_template(:partial => "entities/_permissions")
 
     rendered.should have_tag("form[class=new_lead]")
   end
@@ -36,4 +36,3 @@ describe "/leads/_new" do
     rendered.should_not have_tag("textarea[id=lead_background_info]")
   end
 end
-

data/spec/views/leads/_sidebar_show.haml_spec.rb

@@ -5,7 +5,7 @@ describe "/leads/_sidebar_show" do
 
   before do
     login_and_assign
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:comment, Comment.new)
     assign(:lead, FactoryGirl.create(:lead,
                           :blog => 'http://www.blogger.com/home',
@@ -22,4 +22,3 @@ describe "/leads/_sidebar_show" do
     rendered.should_not have_tag("a[href=http://www.facebook/profile]")
   end
 end
-

data/spec/views/leads/convert.rjs_spec.rb

@@ -6,8 +6,8 @@ describe "/leads/convert" do
   before do
     login_and_assign
 
-    assign(:lead, @lead = FactoryGirl.create(:lead, :user => @current_user))
-    assign(:users, [ @current_user ])
+    assign(:lead, @lead = FactoryGirl.create(:lead, :user => current_user))
+    assign(:users, [ current_user ])
     assign(:account, @account = FactoryGirl.create(:account))
     assign(:accounts, [ @account ])
     assign(:opportunity, FactoryGirl.create(:opportunity))
@@ -32,7 +32,7 @@ describe "/leads/convert" do
 
   it "convert: should hide previously open [Convert Lead] and replace it with lead partial" do
     params[:cancel] = nil
-    assign(:previous, previous = FactoryGirl.create(:lead, :user => @current_user))
+    assign(:previous, previous = FactoryGirl.create(:lead, :user => current_user))
 
     render
     rendered.should have_rjs("lead_#{previous.id}") do |rjs|
@@ -75,9 +75,7 @@ describe "/leads/convert" do
 
     render
     rendered.should include("crm.create_or_select_account")
-    rendered.should include('crm.date_select_popup("opportunity_closes_on")')
     rendered.should include('$("account_name").focus()')
   end
 
 end
-

data/spec/views/leads/edit.rjs_spec.rb

@@ -5,8 +5,8 @@ describe "/leads/edit" do
 
   before do
     login_and_assign
-    assign(:lead, @lead = FactoryGirl.create(:lead, :status => "new", :user => @current_user))
-    assign(:users, [ @current_user ])
+    assign(:lead, @lead = FactoryGirl.create(:lead, :status => "new", :user => current_user))
+    assign(:users, [ current_user ])
     assign(:campaigns, [ FactoryGirl.create(:campaign) ])
   end
 
@@ -29,7 +29,7 @@ describe "/leads/edit" do
 
   it "edit: should hide previously open [Edit Lead] and replace it with lead partial" do
     params[:cancel] = nil
-    assign(:previous, previous = FactoryGirl.create(:lead, :user => @current_user))
+    assign(:previous, previous = FactoryGirl.create(:lead, :user => current_user))
 
     render
     rendered.should have_rjs("lead_#{previous.id}") do |rjs|
@@ -69,11 +69,10 @@ describe "/leads/edit" do
 
   it "edit from lead landing page: should not attempt to hide [Convert Lead] if the lead is already converted" do
     params[:cancel] = "false"
-    assign(:lead, FactoryGirl.create(:lead, :status => "converted", :user => @current_user))
+    assign(:lead, FactoryGirl.create(:lead, :status => "converted", :user => current_user))
 
     render
     rendered.should_not include('crm.hide_form("convert_lead"')
   end
 
 end
-

data/spec/views/leads/index.haml_spec.rb

@@ -4,6 +4,10 @@ describe "/leads/index" do
   include LeadsHelper
 
   before do
+    view.lookup_context.prefixes << 'entities'
+    assign :per_page, Lead.per_page
+    assign :sort_by,  Lead.sort_by
+    assign :ransack_search, Lead.search
     login_and_assign
   end
 
@@ -12,7 +16,7 @@ describe "/leads/index" do
 
     render
     view.should render_template(:partial => "_lead")
-    view.should render_template(:partial => "shared/_paginate")
+    view.should render_template(:partial => "shared/_paginate_with_per_page")
   end
 
   it "should render a message if there're no leads" do
@@ -21,8 +25,7 @@ describe "/leads/index" do
     render
     view.should_not render_template(:partial => "_leads")
     view.should render_template(:partial => "shared/_empty")
-    view.should render_template(:partial => "shared/_paginate")
+    view.should render_template(:partial => "shared/_paginate_with_per_page")
   end
 
 end
-

data/spec/views/leads/new.rjs_spec.rb

@@ -6,8 +6,8 @@ describe "/leads/new" do
   before do
     login_and_assign
     @campaign = FactoryGirl.create(:campaign)
-    assign(:lead, Lead.new(:user => @current_user))
-    assign(:users, [ @current_user ])
+    assign(:lead, Lead.new(:user => current_user))
+    assign(:users, [ current_user ])
     assign(:campaign, @campaign)
     assign(:campaigns, [ @campaign ])
   end
@@ -18,13 +18,6 @@ describe "/leads/new" do
     rendered.should include('crm.flick("empty", "toggle")')
   end
 
-  it "should hide options form when called from Leads index" do
-    controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
-    render
-
-    rendered.should include('crm.hide_form("options")')
-  end
-
   describe "new lead" do
     it "should render [new] template into :create_lead div" do
       params[:cancel] = nil
@@ -48,5 +41,3 @@ describe "/leads/new" do
   end
 
 end
-
-

data/spec/views/leads/promote.rjs_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe "/leads/promote" do
   before do
     login_and_assign
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:account, @account = FactoryGirl.create(:account))
     assign(:accounts, [ @account ])
     assign(:contact, FactoryGirl.create(:contact))
@@ -13,7 +13,7 @@ describe "/leads/promote" do
 
   describe "no errors :" do
     before do
-      assign(:lead, @lead = FactoryGirl.create(:lead, :status => "converted", :user => @current_user, :assignee => @current_user))
+      assign(:lead, @lead = FactoryGirl.create(:lead, :status => "converted", :user => current_user, :assignee => current_user))
     end
 
     describe "from lead landing page -" do
@@ -98,7 +98,7 @@ describe "/leads/promote" do
 
   describe "validation errors:" do
     before do
-      assign(:lead, @lead = FactoryGirl.create(:lead, :status => "new", :user => @current_user, :assignee => @current_user))
+      assign(:lead, @lead = FactoryGirl.create(:lead, :status => "new", :user => current_user, :assignee => current_user))
     end
 
     describe "from lead landing page -" do
@@ -146,9 +146,7 @@ describe "/leads/promote" do
     it "should handle new or existing account and set up calendar field" do
       render
       rendered.should include("crm.create_or_select_account")
-      rendered.should include('crm.date_select_popup("opportunity_closes_on")')
       rendered.should include('$("account_name").focus()')
     end
   end # errors
 end
-

data/spec/views/leads/show.haml_spec.rb

@@ -6,7 +6,7 @@ describe "/leads/show" do
   before do
     login_and_assign
     assign(:lead, @lead = FactoryGirl.create(:lead, :id => 42))
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:comment, Comment.new)
     assign(:timeline, [ FactoryGirl.create(:comment, :commentable => @lead) ])
   end
@@ -21,4 +21,3 @@ describe "/leads/show" do
   end
 
 end
-