fat_free_crm 0.17.3 → 0.18.0

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
 

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

data/spec/views/leads/convert.js.haml_spec.rb

@@ -13,11 +13,11 @@ describe "/leads/convert" do
   before do
     login
 
-    assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, user: current_user))
+    assign(:lead, @lead = build_stubbed(:lead, user: current_user))
     assign(:users, [current_user])
-    assign(:account, @account = FactoryGirl.build_stubbed(:account))
+    assign(:account, @account = build_stubbed(:account))
     assign(:accounts, [@account])
-    assign(:opportunity, FactoryGirl.build_stubbed(:opportunity))
+    assign(:opportunity, build_stubbed(:opportunity))
   end
 
   it "cancel from lead index page: should replace [Convert Lead] form with lead partial" do
@@ -37,7 +37,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.build_stubbed(:lead, user: current_user))
+    assign(:previous, previous = build_stubbed(:lead, user: current_user))
 
     render
     expect(rendered).to include("$('#lead_#{previous.id}').replaceWith")

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

@@ -11,12 +11,12 @@ describe "/leads/create" do
   before do
     controller.controller_path = 'leads'
     login
-    assign(:campaigns, [FactoryGirl.build_stubbed(:campaign)])
+    assign(:campaigns, [build_stubbed(:campaign)])
   end
 
   describe "create success" do
     before do
-      assign(:lead, @lead = FactoryGirl.build_stubbed(:lead))
+      assign(:lead, @lead = build_stubbed(:lead))
       assign(:leads, [@lead].paginate)
       assign(:lead_status_total, Hash.new(1))
     end
@@ -46,7 +46,7 @@ describe "/leads/create" do
     end
 
     it "should update related asset sidebar from related asset" do
-      assign(:campaign, campaign = FactoryGirl.create(:campaign))
+      assign(:campaign, campaign = create(:campaign))
       controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
       render
 
@@ -58,8 +58,8 @@ describe "/leads/create" do
 
   describe "create failure" do
     it "should re-render [create] template in :create_lead div" do
-      assign(:lead, FactoryGirl.build(:lead, first_name: nil)) # make it invalid
-      assign(:users, [FactoryGirl.build_stubbed(:user)])
+      assign(:lead, build(:lead, first_name: nil)) # make it invalid
+      assign(:users, [build_stubbed(:user)])
 
       render
 

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

@@ -10,7 +10,7 @@ require 'spec_helper'
 describe "/leads/destroy" do
   before do
     login
-    assign(:lead, @lead = FactoryGirl.build_stubbed(:lead))
+    assign(:lead, @lead = build_stubbed(:lead))
     assign(:lead_status_total, Hash.new(1))
   end
 
@@ -38,7 +38,7 @@ describe "/leads/destroy" do
   end
 
   it "should update related asset sidebar when called from related asset" do
-    assign(:campaign, campaign = FactoryGirl.build_stubbed(:campaign))
+    assign(:campaign, campaign = build_stubbed(:campaign))
     controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
     render
 

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

@@ -12,9 +12,9 @@ describe "/leads/edit" do
 
   before do
     login
-    assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, status: "new", user: current_user))
+    assign(:lead, @lead = build_stubbed(:lead, status: "new", user: current_user))
     assign(:users, [current_user])
-    assign(:campaigns, [FactoryGirl.build_stubbed(:campaign)])
+    assign(:campaigns, [build_stubbed(:campaign)])
   end
 
   it "cancel from lead index page: should replace [Edit Lead] form with lead partial" do
@@ -34,7 +34,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.build_stubbed(:lead, user: current_user))
+    assign(:previous, previous = build_stubbed(:lead, user: current_user))
 
     render
     expect(rendered).to include("$('#lead_#{previous.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{previous.id}\\'")
@@ -68,7 +68,7 @@ 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.build_stubbed(:lead, status: "converted", user: current_user))
+    assign(:lead, build_stubbed(:lead, status: "converted", user: current_user))
 
     render
     expect(rendered).not_to include("crm.hide_form('convert_lead'")

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

@@ -19,7 +19,7 @@ describe "/leads/index" do
   end
 
   it "should render list of accounts if list of leads is not empty" do
-    assign(:leads, [FactoryGirl.build_stubbed(:lead)].paginate(page: 1, per_page: 20))
+    assign(:leads, [build_stubbed(:lead)].paginate(page: 1, per_page: 20))
 
     render
     expect(view).to render_template(partial: "_lead")

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

@@ -15,7 +15,7 @@ describe "/leads/index" do
   end
 
   it "should render [lead] template with @leads collection if there are leads" do
-    assign(:leads, [FactoryGirl.build_stubbed(:lead, id: 42)].paginate(page: 1, per_page: 20))
+    assign(:leads, [build_stubbed(:lead, id: 42)].paginate(page: 1, per_page: 20))
 
     render template: 'leads/index', formats: [:js]
 

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

@@ -12,7 +12,7 @@ describe "/leads/new" do
 
   before do
     login
-    @campaign = FactoryGirl.build_stubbed(:campaign)
+    @campaign = build_stubbed(:campaign)
     assign(:lead, Lead.new(user: current_user))
     assign(:users, [current_user])
     assign(:campaign, @campaign)

data/spec/views/leads/promote.js.haml_spec.rb

@@ -11,16 +11,16 @@ describe "/leads/promote" do
   before do
     login
     assign(:users, [current_user])
-    assign(:account, @account = FactoryGirl.build_stubbed(:account))
+    assign(:account, @account = build_stubbed(:account))
     assign(:accounts, [@account])
-    assign(:contact, FactoryGirl.build_stubbed(:contact))
-    assign(:opportunity, FactoryGirl.build_stubbed(:opportunity))
+    assign(:contact, build_stubbed(:contact))
+    assign(:opportunity, build_stubbed(:opportunity))
     assign(:lead_status_total, Hash.new(1))
   end
 
   describe "no errors :" do
     before do
-      assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, status: "converted", user: current_user, assignee: current_user))
+      assign(:lead, @lead = build_stubbed(:lead, status: "converted", user: current_user, assignee: current_user))
     end
 
     describe "from lead landing page -" do
@@ -66,9 +66,9 @@ describe "/leads/promote" do
     describe "from related campaign page -" do
       before do
         controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
-        assign(:campaign, FactoryGirl.build_stubbed(:campaign))
+        assign(:campaign, build_stubbed(:campaign))
         assign(:stage, Setting.unroll(:opportunity_stage))
-        assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity))
+        assign(:opportunity, @opportunity = build_stubbed(:opportunity))
       end
 
       it "should replace [Convert Lead] with lead partial and highlight it" do
@@ -95,7 +95,7 @@ describe "/leads/promote" do
 
   describe "validation errors:" do
     before do
-      assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, status: "new", user: current_user, assignee: current_user))
+      assign(:lead, @lead = build_stubbed(:lead, status: "new", user: current_user, assignee: current_user))
     end
 
     describe "from lead landing page -" do

data/spec/views/leads/reject.js.haml_spec.rb

@@ -10,7 +10,7 @@ require 'spec_helper'
 describe "/leads/reject" do
   before do
     login
-    assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, status: "new"))
+    assign(:lead, @lead = build_stubbed(:lead, status: "new"))
     assign(:lead_status_total, Hash.new(1))
   end
 
@@ -37,7 +37,7 @@ describe "/leads/reject" do
   end
 
   it "should update campaign sidebar if called from campaign landing page" do
-    assign(:campaign, campaign = FactoryGirl.build_stubbed(:campaign))
+    assign(:campaign, campaign = build_stubbed(:campaign))
     controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
     render
 

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

@@ -12,10 +12,10 @@ describe "/leads/show" do
 
   before do
     login
-    assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, id: 42))
+    assign(:lead, @lead = build_stubbed(:lead, id: 42))
     assign(:users, [current_user])
     assign(:comment, Comment.new)
-    assign(:timeline, [FactoryGirl.build_stubbed(:comment, commentable: @lead)])
+    assign(:timeline, [build_stubbed(:comment, commentable: @lead)])
 
     # 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/leads/update.js.haml_spec.rb

@@ -10,9 +10,9 @@ require 'spec_helper'
 describe "/leads/update" do
   before do
     login
-    assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, user: current_user, assignee: FactoryGirl.build_stubbed(:user)))
+    assign(:lead, @lead = build_stubbed(:lead, user: current_user, assignee: build_stubbed(:user)))
     assign(:users, [current_user])
-    assign(:campaigns, [FactoryGirl.build_stubbed(:campaign)])
+    assign(:campaigns, [build_stubbed(:campaign)])
     assign(:lead_status_total, Hash.new(1))
   end
 
@@ -58,7 +58,7 @@ describe "/leads/update" do
 
     describe "on related asset page -" do
       before do
-        assign(:campaign, FactoryGirl.build_stubbed(:campaign))
+        assign(:campaign, build_stubbed(:campaign))
         controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
       end
 
@@ -69,7 +69,7 @@ describe "/leads/update" do
       end
 
       it "should update campaign sidebar" do
-        assign(:campaign, FactoryGirl.build_stubbed(:campaign))
+        assign(:campaign, build_stubbed(:campaign))
         render
 
         expect(rendered).to include("sidebar")

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

@@ -12,14 +12,14 @@ describe "/opportunities/_edit" do
 
   before do
     login
-    assign(:account, @account = FactoryGirl.build_stubbed(:account))
+    assign(:account, @account = build_stubbed(:account))
     assign(:accounts, [@account])
     assign(:stage, Setting.unroll(:opportunity_stage))
   end
 
   it "should render [edit opportunity] form" do
     assign(:users, [current_user])
-    assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity, campaign: @campaign = FactoryGirl.build_stubbed(:campaign)))
+    assign(:opportunity, @opportunity = build_stubbed(:opportunity, campaign: @campaign = build_stubbed(:campaign)))
     render
 
     expect(rendered).to have_tag("form[class=edit_opportunity]") do
@@ -30,7 +30,7 @@ describe "/opportunities/_edit" do
 
   it "should pick default assignee (Myself)" do
     assign(:users, [current_user])
-    assign(:opportunity, FactoryGirl.build_stubbed(:opportunity, assignee: nil))
+    assign(:opportunity, build_stubbed(:opportunity, assignee: nil))
     render
 
     expect(rendered).to have_tag("select[id=opportunity_assigned_to]") do |options|
@@ -39,9 +39,9 @@ describe "/opportunities/_edit" do
   end
 
   it "should show correct assignee" do
-    @user = FactoryGirl.create(:user)
+    @user = create(:user)
     assign(:users, [current_user, @user])
-    assign(:opportunity, FactoryGirl.create(:opportunity, assignee: @user))
+    assign(:opportunity, create(:opportunity, assignee: @user))
     render
 
     expect(rendered).to have_tag("select[id=opportunity_assigned_to]") do |_options|
@@ -52,7 +52,7 @@ describe "/opportunities/_edit" do
 
   it "should render background info field if settings require so" do
     assign(:users, [current_user])
-    assign(:opportunity, FactoryGirl.build_stubbed(:opportunity))
+    assign(:opportunity, build_stubbed(:opportunity))
     Setting.background_info = [:opportunity]
 
     render
@@ -61,7 +61,7 @@ describe "/opportunities/_edit" do
 
   it "should not render background info field if settings do not require so" do
     assign(:users, [current_user])
-    assign(:opportunity, FactoryGirl.build_stubbed(:opportunity))
+    assign(:opportunity, build_stubbed(:opportunity))
     Setting.background_info = []
 
     render

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

@@ -12,8 +12,8 @@ describe "/opportunities/_new" do
 
   before do
     login
-    assign(:opportunity, FactoryGirl.build(:opportunity))
-    @account = FactoryGirl.build_stubbed(:account)
+    assign(:opportunity, build(:opportunity))
+    @account = build_stubbed(:account)
     assign(:account, @account)
     assign(:accounts, [@account])
     assign(:users, [current_user])

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

@@ -15,7 +15,7 @@ describe "/opportunities/create" do
 
   describe "create success" do
     before do
-      assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity))
+      assign(:opportunity, @opportunity = build_stubbed(:opportunity))
       assign(:opportunities, [@opportunities].paginate)
       assign(:opportunity_stage_total, Hash.new(1))
     end
@@ -44,7 +44,7 @@ describe "/opportunities/create" do
     end
 
     it "should update related account sidebar when called from related account" do
-      assign(:account, account = FactoryGirl.create(:account))
+      assign(:account, account = create(:account))
       controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/#{account.id}"
       render
 
@@ -53,7 +53,7 @@ describe "/opportunities/create" do
     end
 
     it "should update related campaign sidebar when called from related campaign" do
-      assign(:campaign, campaign = FactoryGirl.create(:campaign))
+      assign(:campaign, campaign = create(:campaign))
       controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
       render
 
@@ -72,9 +72,9 @@ describe "/opportunities/create" do
 
   describe "create failure" do
     it "should re-render [create] template in :create_opportunity div" do
-      assign(:opportunity, FactoryGirl.build(:opportunity, name: nil)) # make it invalid
-      @account = FactoryGirl.build_stubbed(:account)
-      assign(:users, [FactoryGirl.build_stubbed(:user)])
+      assign(:opportunity, build(:opportunity, name: nil)) # make it invalid
+      @account = build_stubbed(:account)
+      assign(:users, [build_stubbed(:user)])
       assign(:account, @account)
       assign(:accounts, [@account])