fat_free_crm 0.17.3 → 0.19.2

data/spec/views/campaigns/create.js.haml_spec.rb

@@ -14,14 +14,14 @@ describe "/campaigns/create" do
 
   describe "create success" do
     before do
-      assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign))
+      assign(:campaign, @campaign = build_stubbed(:campaign))
       assign(:campaigns, [@campaign].paginate)
       assign(:campaign_status_total, Hash.new(1))
       render
     end
 
     it "should hide [Create Campaign] form and insert campaign partial" do
-      expect(rendered).to include("$('#campaigns').prepend('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
+      expect(rendered).to include("$('#campaigns').prepend('<li class=\\'highlight campaign\\' id=\\'campaign_#{@campaign.id}\\'")
       expect(rendered).to include(%/$('#campaign_#{@campaign.id}').effect("highlight"/)
     end
 
@@ -38,8 +38,8 @@ describe "/campaigns/create" do
 
   describe "create failure" do
     it "should re-render [create] template in :create_campaign div" do
-      assign(:campaign, FactoryGirl.build(:campaign, name: nil)) # make it invalid
-      assign(:users, [FactoryGirl.build_stubbed(:user)])
+      assign(:campaign, build(:campaign, name: nil)) # make it invalid
+      assign(:users, [build_stubbed(:user)])
 
       render
 

data/spec/views/campaigns/destroy.js.haml_spec.rb

@@ -10,7 +10,7 @@ require 'spec_helper'
 describe "/campaigns/destroy" do
   before do
     login
-    assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign, user: current_user))
+    assign(:campaign, @campaign = build_stubbed(:campaign, user: current_user))
     assign(:campaigns, [@campaign].paginate)
     assign(:campaign_status_total, Hash.new(1))
     render

data/spec/views/campaigns/edit.js.haml_spec.rb

@@ -12,7 +12,7 @@ describe "/campaigns/edit" do
 
   before do
     login
-    assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign, user: current_user))
+    assign(:campaign, @campaign = build_stubbed(:campaign, user: current_user))
     assign(:users, [current_user])
   end
 
@@ -20,7 +20,7 @@ describe "/campaigns/edit" do
     params[:cancel] = "true"
 
     render
-    expect(rendered).to include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
+    expect(rendered).to include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'highlight campaign\\' id=\\'campaign_#{@campaign.id}\\'")
   end
 
   it "cancel from campaign landing page: should hide [Edit Campaign] form" do
@@ -33,10 +33,10 @@ describe "/campaigns/edit" do
 
   it "edit: should hide previously open [Edit Campaign] for and replace it with campaign partial" do
     params[:cancel] = nil
-    assign(:previous, previous = FactoryGirl.build_stubbed(:campaign, user: current_user))
+    assign(:previous, previous = build_stubbed(:campaign, user: current_user))
 
     render
-    expect(rendered).to include("$('#campaign_#{previous.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{previous.id}\\'")
+    expect(rendered).to include("$('#campaign_#{previous.id}').replaceWith('<li class=\\'highlight campaign\\' id=\\'campaign_#{previous.id}\\'")
   end
 
   it "edit: should remove previously open [Edit Campaign] if it's no longer available" do

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

@@ -19,7 +19,7 @@ describe "/campaigns/index" do
   end
 
   it "should render list of accounts if list of campaigns is not empty" do
-    assign(:campaigns, [FactoryGirl.build_stubbed(:campaign)].paginate)
+    assign(:campaigns, [build_stubbed(:campaign)].paginate)
 
     render
     expect(view).to render_template(partial: "_campaign")

data/spec/views/campaigns/index.js.haml_spec.rb

@@ -15,11 +15,11 @@ describe "/campaigns/index" do
   end
 
   it "should render [campaign] template with @campaigns collection if there are campaigns" do
-    assign(:campaigns, [FactoryGirl.build_stubbed(:campaign, id: 42)].paginate)
+    assign(:campaigns, [build_stubbed(:campaign, id: 42)].paginate)
 
     render template: 'campaigns/index', formats: [:js]
 
-    expect(rendered).to include("$('#campaigns').html('<li class=\\'campaign highlight\\' id=\\'campaign_42\\'")
+    expect(rendered).to include("$('#campaigns').html('<li class=\\'highlight campaign\\' id=\\'campaign_42\\'")
     expect(rendered).to include("#paginate")
   end
 

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

@@ -12,13 +12,13 @@ describe "/campaigns/show" do
 
   before do
     login
-    @campaign = FactoryGirl.build_stubbed(:campaign, id: 42,
-                                                     leads: [FactoryGirl.build_stubbed(:lead)],
-                                                     opportunities: [FactoryGirl.build_stubbed(:opportunity)])
+    @campaign = build_stubbed(:campaign, id: 42,
+                                         leads: [build_stubbed(:lead)],
+                                         opportunities: [build_stubbed(:opportunity)])
     assign(:campaign, @campaign)
     assign(:users, [current_user])
     assign(:comment, Comment.new)
-    assign(:timeline, [FactoryGirl.build_stubbed(:comment, commentable: @campaign)])
+    assign(:timeline, [build_stubbed(:comment, commentable: @campaign)])
     allow(view).to receive(:params) { { id: 123 } }
 
     # controller#controller_name and controller#action_name are not set in view specs

data/spec/views/campaigns/update.js.haml_spec.rb

@@ -10,7 +10,7 @@ require 'spec_helper'
 describe "/campaigns/update" do
   before do
     login
-    assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign, user: current_user))
+    assign(:campaign, @campaign = build_stubbed(:campaign, user: current_user))
     assign(:users, [current_user])
     assign(:status, Setting.campaign_status)
     assign(:campaign_status_total, Hash.new(1))
@@ -44,7 +44,7 @@ describe "/campaigns/update" do
 
       it "should replace [Edit Campaign] with campaign partial and highlight it" do
         render
-        expect(rendered).to include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
+        expect(rendered).to include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'highlight campaign\\' id=\\'campaign_#{@campaign.id}\\'")
         expect(rendered).to include(%/$('#campaign_#{@campaign.id}').effect("highlight"/)
       end
     end

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

@@ -12,12 +12,12 @@ describe "/contacts/_edit" do
 
   before do
     login
-    assign(:account, @account = FactoryGirl.create(:account))
+    assign(:account, @account = create(:account))
     assign(:accounts, [@account])
   end
 
   it "should render [edit contact] form" do
-    assign(:contact, @contact = FactoryGirl.create(:contact))
+    assign(:contact, @contact = create(:contact))
     assign(:users, [current_user])
 
     render
@@ -33,7 +33,7 @@ describe "/contacts/_edit" do
 
   it "should pick default assignee (Myself)" do
     assign(:users, [current_user])
-    assign(:contact, FactoryGirl.create(:contact, assignee: nil))
+    assign(:contact, create(:contact, assignee: nil))
 
     render
     expect(rendered).to have_tag("select[id=contact_assigned_to]") do |options|
@@ -42,9 +42,9 @@ describe "/contacts/_edit" do
   end
 
   it "should show correct assignee" do
-    @user = FactoryGirl.create(:user)
+    @user = create(:user)
     assign(:users, [current_user, @user])
-    assign(:contact, FactoryGirl.create(:contact, assignee: @user))
+    assign(:contact, create(:contact, assignee: @user))
 
     render
     expect(rendered).to have_tag("select[id=contact_assigned_to]") do |_options|
@@ -55,7 +55,7 @@ describe "/contacts/_edit" do
 
   it "should render background info field if settings require so" do
     assign(:users, [current_user])
-    assign(:contact, FactoryGirl.create(:contact))
+    assign(:contact, create(:contact))
     Setting.background_info = [:contact]
 
     render
@@ -64,7 +64,7 @@ describe "/contacts/_edit" do
 
   it "should not render background info field if settings do not require so" do
     assign(:users, [current_user])
-    assign(:contact, FactoryGirl.create(:contact))
+    assign(:contact, create(:contact))
     Setting.background_info = []
 
     render

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

@@ -12,7 +12,7 @@ describe "/contacts/_new" do
 
   before do
     login
-    @account = FactoryGirl.build_stubbed(:account)
+    @account = build_stubbed(:account)
     assign(:contact, Contact.new)
     assign(:users, [current_user])
     assign(:account, @account)

data/spec/views/contacts/create.js.haml_spec.rb

@@ -16,14 +16,14 @@ describe "/contacts/create" do
 
   describe "create success" do
     before do
-      assign(:contact, @contact = FactoryGirl.build_stubbed(:contact))
+      assign(:contact, @contact = build_stubbed(:contact))
       assign(:contacts, [@contact].paginate)
     end
 
     it "should hide [Create Contact] form and insert contact partial" do
       render
 
-      expect(rendered).to include("$('#contacts').prepend('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+      expect(rendered).to include("$('#contacts').prepend('<li class=\\'highlight contact\\' id=\\'contact_#{@contact.id}\\'")
       expect(rendered).to include(%/$('#contact_#{@contact.id}').effect("highlight"/)
     end
 
@@ -51,9 +51,9 @@ 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
-      @account = FactoryGirl.build_stubbed(:account)
-      assign(:users, [FactoryGirl.build_stubbed(:user)])
+      assign(:contact, build(:contact, first_name: nil)) # make it invalid
+      @account = build_stubbed(:account)
+      assign(:users, [build_stubbed(:user)])
       assign(:account, @account)
       assign(:accounts, [@account])
 

data/spec/views/contacts/destroy.js.haml_spec.rb

@@ -12,7 +12,7 @@ describe "/contacts/destroy" do
 
   before do
     login
-    assign(:contact, @contact = FactoryGirl.build_stubbed(:contact))
+    assign(:contact, @contact = build_stubbed(:contact))
     assign(:contacts, [@contact].paginate)
   end
 

data/spec/views/contacts/edit.js.haml_spec.rb

@@ -12,9 +12,9 @@ describe "/contacts/edit" do
 
   before do
     login
-    assign(:contact, @contact = FactoryGirl.build_stubbed(:contact, user: current_user))
+    assign(:contact, @contact = build_stubbed(:contact, user: current_user))
     assign(:users, [current_user])
-    assign(:account, @account = FactoryGirl.build_stubbed(:account))
+    assign(:account, @account = build_stubbed(:account))
     assign(:accounts, [@account])
   end
 
@@ -22,7 +22,7 @@ describe "/contacts/edit" do
     params[:cancel] = "true"
 
     render
-    expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+    expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'highlight contact\\' id=\\'contact_#{@contact.id}\\'")
   end
 
   it "cancel from contact landing page: should hide [Edit Contact] form" do
@@ -35,7 +35,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.build_stubbed(:contact, user: current_user))
+    assign(:previous, previous = build_stubbed(:contact, user: current_user))
 
     render
     expect(rendered).to include("$('#contact_#{previous.id}').replaceWith")

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

@@ -19,7 +19,7 @@ describe "/contacts/index" do
   end
 
   it "should render a list of contacts if it's not empty" do
-    assign(:contacts, [FactoryGirl.build_stubbed(:contact)].paginate)
+    assign(:contacts, [build_stubbed(:contact)].paginate)
 
     render
     expect(view).to render_template(partial: "_contact")

data/spec/views/contacts/index.js.html_spec.rb

@@ -15,11 +15,11 @@ describe "/contacts/index" do
   end
 
   it "should render [contact] template with @contacts collection if there are contacts" do
-    assign(:contacts, [FactoryGirl.build_stubbed(:contact, id: 42)].paginate)
+    assign(:contacts, [build_stubbed(:contact, id: 42)].paginate)
 
     render template: 'contacts/index', formats: [:js]
 
-    expect(rendered).to include("$('#contacts').html('<li class=\\'contact highlight\\' id=\\'contact_42\\'")
+    expect(rendered).to include("$('#contacts').html('<li class=\\'highlight contact\\' id=\\'contact_42\\'")
     expect(rendered).to include("#paginate")
   end
 

data/spec/views/contacts/new.js.haml_spec.rb

@@ -12,7 +12,7 @@ describe "/contacts/new" do
 
   before do
     login
-    @account = FactoryGirl.build_stubbed(:account)
+    @account = build_stubbed(:account)
     assign(:contact, Contact.new(user: current_user))
     assign(:users, [current_user])
     assign(:account, @account)

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

@@ -12,12 +12,12 @@ describe "/contacts/show" do
 
   before do
     login
-    @contact = FactoryGirl.create(:contact, id: 42,
-                                            opportunities: [FactoryGirl.create(:opportunity)])
+    @contact = create(:contact, id: 42,
+                                opportunities: [create(:opportunity)])
     assign(:contact, @contact)
     assign(:users, [current_user])
     assign(:comment, Comment.new)
-    assign(:timeline, [FactoryGirl.create(:comment, commentable: @contact)])
+    assign(:timeline, [create(:comment, commentable: @contact)])
 
     # controller#controller_name and controller#action_name are not set in view specs
     allow(view).to receive(:template_for_current_view).and_return(nil)

data/spec/views/contacts/update.js.haml_spec.rb

@@ -13,9 +13,9 @@ describe "/contacts/update" do
   before do
     login
 
-    assign(:contact, @contact = FactoryGirl.build_stubbed(:contact, user: current_user))
+    assign(:contact, @contact = build_stubbed(:contact, user: current_user))
     assign(:users, [current_user])
-    assign(:account, @account = FactoryGirl.build_stubbed(:account))
+    assign(:account, @account = build_stubbed(:account))
     assign(:accounts, [@account])
   end
 
@@ -47,7 +47,7 @@ describe "/contacts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
 
         render
-        expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+        expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'highlight contact\\' id=\\'contact_#{@contact.id}\\'")
         expect(rendered).to include(%/$('#contact_#{@contact.id}').effect("highlight"/)
       end
 
@@ -67,7 +67,7 @@ describe "/contacts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
 
         render
-        expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+        expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'highlight contact\\' id=\\'contact_#{@contact.id}\\'")
         expect(rendered).to include(%/$('#contact_#{@contact.id}').effect("highlight"/)
       end
 
@@ -118,7 +118,7 @@ describe "/contacts/update" do
 
       it "errors: should show disabled accounts dropdown" do
         render
-        expect(rendered).to include("crm.create_or_select_account(#{@referer =~ /\/accounts\//})")
+        expect(rendered).to include("crm.create_or_select_account(#{@referer =~ %r{/accounts/}})")
       end
 
       it "should redraw the [edit_contact] form and shake it" do

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

@@ -15,7 +15,7 @@ describe "/home/index" do
   end
 
   it "should render list of activities if it's not empty" do
-    assign(:activities, [FactoryGirl.build_stubbed(:version, event: "update", item: FactoryGirl.build_stubbed(:account))])
+    assign(:activities, [build_stubbed(:version, event: "update", item: build_stubbed(:account))])
     assign(:my_tasks, [])
     assign(:my_opportunities, [])
     assign(:my_accounts, [])

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

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

data/spec/views/home/options.js.haml_spec.rb

@@ -19,7 +19,7 @@ describe "/home/options" do
     assign(:user, "all_users")
     assign(:action, "all_actions")
     assign(:duration, "two_days")
-    assign(:all_users, [FactoryGirl.build_stubbed(:user)])
+    assign(:all_users, [build_stubbed(:user)])
 
     render
 
@@ -35,7 +35,7 @@ describe "/home/options" do
     assign(:action, "all_actions")
     assign(:user, "all_users")
     assign(:duration, "two_days")
-    assign(:all_users, [FactoryGirl.build_stubbed(:user)])
+    assign(:all_users, [build_stubbed(:user)])
 
     render
 

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

@@ -12,12 +12,12 @@ describe "/leads/_convert" do
 
   before do
     login
-    @account = FactoryGirl.build_stubbed(:account)
-    assign(:lead, FactoryGirl.build_stubbed(:lead))
+    @account = build_stubbed(:account)
+    assign(:lead, build_stubbed(:lead))
     assign(:users, [current_user])
     assign(:account, @account)
     assign(:accounts, [@account])
-    assign(:opportunity, FactoryGirl.build_stubbed(:opportunity))
+    assign(:opportunity, build_stubbed(:opportunity))
   end
 
   it "should render [convert lead] form" do

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

@@ -12,9 +12,9 @@ describe "/leads/_edit" do
 
   before do
     login
-    assign(:lead, @lead = FactoryGirl.build_stubbed(:lead))
+    assign(:lead, @lead = build_stubbed(:lead))
     assign(:users, [current_user])
-    assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign))
+    assign(:campaign, @campaign = build_stubbed(:campaign))
     assign(:campaigns, [@campaign])
   end
 

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

@@ -12,9 +12,9 @@ describe "/leads/_new" do
 
   before do
     login
-    assign(:lead, FactoryGirl.build(:lead))
+    assign(:lead, build(:lead))
     assign(:users, [current_user])
-    assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign))
+    assign(:campaign, @campaign = build_stubbed(:campaign))
     assign(:campaigns, [@campaign])
   end
 

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

@@ -14,11 +14,11 @@ describe "/leads/_sidebar_show" do
     login
     assign(:users, [current_user])
     assign(:comment, Comment.new)
-    assign(:lead, FactoryGirl.build_stubbed(:lead,
-                                            blog: 'http://www.blogger.com/home',
-                                            linkedin: 'www.linkedin.com',
-                                            twitter: 'twitter.com/account',
-                                            facebook: ''))
+    assign(:lead, build_stubbed(:lead,
+                                blog: 'http://www.blogger.com/home',
+                                linkedin: 'www.linkedin.com',
+                                twitter: 'twitter.com/account',
+                                facebook: ''))
   end
 
   it "should render working web presence links whether a protocol is provided or not" do