fat_free_crm 0.17.3 → 0.18.0

data/spec/models/entities/contact_spec.rb

@@ -41,16 +41,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Contact do
-  let(:current_user) { FactoryGirl.create(:user) }
-
   it "should create a new instance given valid attributes" do
     Contact.create!(first_name: "Billy", last_name: "Bones")
   end
 
   describe "Update existing contact" do
     before(:each) do
-      @account = FactoryGirl.create(:account)
-      @contact = FactoryGirl.create(:contact, account: @account)
+      @contact = create(:contact, account: create(:account))
     end
 
     it "should create new account if requested so" do
@@ -65,7 +62,7 @@ describe Contact do
     end
 
     it "should change account if another account was selected" do
-      @another_account = FactoryGirl.create(:account)
+      @another_account = create(:account)
       expect do
         @contact.update_with_account_and_permissions(
           account: { id: @another_account.id },
@@ -99,7 +96,7 @@ describe Contact do
     end
 
     it "should change account if entered name of another account was found" do
-      @another_account = FactoryGirl.create(:account, name: "Another name")
+      @another_account = create(:account, name: "Another name")
       expect do
         @contact.update_with_account_and_permissions(
           account: { name: "Another name" },
@@ -113,12 +110,12 @@ describe Contact do
 
   describe "Attach" do
     before do
-      @contact = FactoryGirl.create(:contact)
+      @contact = create(:contact)
     end
 
     it "should return nil when attaching existing asset" do
-      @task = FactoryGirl.create(:task, asset: @contact, user: current_user)
-      @opportunity = FactoryGirl.create(:opportunity)
+      @task = create(:task, asset: @contact)
+      @opportunity = create(:opportunity)
       @contact.opportunities << @opportunity
 
       expect(@contact.attach!(@task)).to eq(nil)
@@ -126,8 +123,8 @@ describe Contact do
     end
 
     it "should return non-empty list of attachments when attaching new asset" do
-      @task = FactoryGirl.create(:task, user: current_user)
-      @opportunity = FactoryGirl.create(:opportunity)
+      @task = create(:task)
+      @opportunity = create(:opportunity)
 
       expect(@contact.attach!(@task)).to eq([@task])
       expect(@contact.attach!(@opportunity)).to eq([@opportunity])
@@ -136,11 +133,11 @@ describe Contact do
 
   describe "Discard" do
     before do
-      @contact = FactoryGirl.create(:contact)
+      @contact = create(:contact)
     end
 
     it "should discard a task" do
-      @task = FactoryGirl.create(:task, asset: @contact, user: current_user)
+      @task = create(:task, asset: @contact)
       expect(@contact.tasks.count).to eq(1)
 
       @contact.discard!(@task)
@@ -149,7 +146,7 @@ describe Contact do
     end
 
     it "should discard an opportunity" do
-      @opportunity = FactoryGirl.create(:opportunity)
+      @opportunity = create(:opportunity)
       @contact.opportunities << @opportunity
       expect(@contact.opportunities.count).to eq(1)
 
@@ -161,16 +158,16 @@ describe Contact do
 
   describe "Exportable" do
     describe "assigned contact" do
-      let(:contact1) { FactoryGirl.build(:contact, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user)) }
-      let(:contact2) { FactoryGirl.build(:contact, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: FactoryGirl.create(:user, first_name: nil, last_name: nil)) }
+      let(:contact1) { build(:contact, assignee: create(:user)) }
+      let(:contact2) { build(:contact, user: create(:user, first_name: nil, last_name: nil), assignee: create(:user, first_name: nil, last_name: nil)) }
       it_should_behave_like("exportable") do
         let(:exported) { [contact1, contact2] }
       end
     end
 
     describe "unassigned contact" do
-      let(:contact1) { FactoryGirl.build(:contact, user: FactoryGirl.create(:user), assignee: nil) }
-      let(:contact2) { FactoryGirl.build(:contact, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: nil) }
+      let(:contact1) { build(:contact, assignee: nil) }
+      let(:contact2) { build(:contact, user: create(:user, first_name: nil, last_name: nil), assignee: nil) }
       it_should_behave_like("exportable") do
         let(:exported) { [contact1, contact2] }
       end
@@ -182,8 +179,8 @@ describe Contact do
   end
 
   describe "text_search" do
-    before(:each) do
-      @contact = FactoryGirl.create(:contact, first_name: "Bob", last_name: "Dillion", email: 'bob_dillion@example.com', phone: '+1 123 456 789')
+    before do
+      @contact = create(:contact, first_name: "Bob", last_name: "Dillion", email: 'bob_dillion@example.com', phone: '+1 123 456 789')
     end
 
     it "should search first_name" do
@@ -211,7 +208,7 @@ describe Contact do
     end
 
     it "should not break with a single quote" do
-      contact2 = FactoryGirl.create(:contact, first_name: "Shamus", last_name: "O'Connell", email: 'bob_dillion@example.com', phone: '+1 123 456 789')
+      contact2 = create(:contact, first_name: "Shamus", last_name: "O'Connell", email: 'bob_dillion@example.com', phone: '+1 123 456 789')
       expect(Contact.text_search("O'Connell")).to eq([contact2])
     end
 

data/spec/models/entities/lead_spec.rb

@@ -41,25 +41,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Lead do
-  let(:current_user) { FactoryGirl.create(:user) }
-
   it "should create a new instance given valid attributes" do
     Lead.create!(first_name: "Billy", last_name: "Bones")
   end
 
   describe "Attach" do
     before do
-      @lead = FactoryGirl.create(:lead)
+      @lead = create(:lead)
     end
 
     it "should return nil when attaching existing task" do
-      @task = FactoryGirl.create(:task, asset: @lead, user: current_user)
+      @task = create(:task, asset: @lead)
 
       expect(@lead.attach!(@task)).to eq(nil)
     end
 
     it "should return non-empty list of tasks when attaching new task" do
-      @task = FactoryGirl.create(:task, user: current_user)
+      @task = create(:task)
 
       expect(@lead.attach!(@task)).to eq([@task])
     end
@@ -67,11 +65,11 @@ describe Lead do
 
   describe "Discard" do
     before do
-      @lead = FactoryGirl.create(:lead)
+      @lead = create(:lead)
     end
 
     it "should discard a task" do
-      @task = FactoryGirl.create(:task, asset: @lead, user: current_user)
+      @task = create(:task, asset: @lead)
       expect(@lead.tasks.count).to eq(1)
 
       @lead.discard!(@task)
@@ -82,16 +80,16 @@ describe Lead do
 
   describe "Exportable" do
     describe "assigned lead" do
-      let(:lead1) { FactoryGirl.build(:lead, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user)) }
-      let(:lead2) { FactoryGirl.build(:lead, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: FactoryGirl.create(:user, first_name: nil, last_name: nil)) }
+      let(:lead1) { build(:lead, assignee: create(:user)) }
+      let(:lead2) { build(:lead, user: create(:user, first_name: nil, last_name: nil), assignee: create(:user, first_name: nil, last_name: nil)) }
       it_should_behave_like("exportable") do
         let(:exported) { [lead1, lead2] }
       end
     end
 
     describe "unassigned lead" do
-      let(:lead1) { FactoryGirl.build(:lead, user: FactoryGirl.create(:user), assignee: nil) }
-      let(:lead2) { FactoryGirl.build(:lead, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: nil) }
+      let(:lead1) { build(:lead, assignee: nil) }
+      let(:lead2) { build(:lead, user: create(:user, first_name: nil, last_name: nil), assignee: nil) }
       it_should_behave_like("exportable") do
         let(:exported) { [lead1, lead2] }
       end

data/spec/models/entities/opportunity_spec.rb

@@ -35,8 +35,8 @@ describe Opportunity do
   end
 
   it "should be possible to create opportunity with the same name" do
-    FactoryGirl.create(:opportunity, name: "Hello")
-    expect { FactoryGirl.create(:opportunity, name: "Hello") }.to_not raise_error
+    create(:opportunity, name: "Hello")
+    expect { create(:opportunity, name: "Hello") }.to_not raise_error
   end
 
   it "have a default stage" do
@@ -50,8 +50,8 @@ describe Opportunity do
 
   describe "Update existing opportunity" do
     before(:each) do
-      @account = FactoryGirl.create(:account)
-      @opportunity = FactoryGirl.create(:opportunity, account: @account)
+      @account = create(:account)
+      @opportunity = create(:opportunity, account: @account)
     end
 
     it "should create new account if requested so" do
@@ -66,7 +66,7 @@ describe Opportunity do
     end
 
     it "should update the account another account was selected" do
-      @another_account = FactoryGirl.create(:account)
+      @another_account = create(:account)
       expect do
         @opportunity.update_with_account_and_permissions(
           account: { id: @another_account.id },
@@ -100,7 +100,7 @@ describe Opportunity do
     end
 
     it "should change account if entered name of another account was found" do
-      @another_account = FactoryGirl.create(:account, name: "Another name")
+      @another_account = create(:account, name: "Another name")
       expect do
         @opportunity.update_with_account_and_permissions(
           account: { name: "Another name" },
@@ -112,14 +112,14 @@ describe Opportunity do
     end
 
     it "should set the probability to 0% if opportunity has been lost" do
-      opportunity = FactoryGirl.create(:opportunity, stage: "prospecting", probability: 25)
+      opportunity = create(:opportunity, stage: "prospecting", probability: 25)
       opportunity.update_attributes(stage: 'lost')
       opportunity.reload
       expect(opportunity.probability).to eq(0)
     end
 
     it "should set the probablility to 100% if opportunity has been won" do
-      opportunity = FactoryGirl.create(:opportunity, stage: "prospecting", probability: 65)
+      opportunity = create(:opportunity, stage: "prospecting", probability: 65)
       opportunity.update_attributes(stage: 'won')
       opportunity.reload
       expect(opportunity.probability).to eq(100)
@@ -130,12 +130,12 @@ describe Opportunity do
     it "should find non-closed opportunities" do
       Opportunity.delete_all
       @opportunities = [
-        FactoryGirl.create(:opportunity, stage: "prospecting", amount: 1),
-        FactoryGirl.create(:opportunity, stage: "analysis", amount: 1),
-        FactoryGirl.create(:opportunity, stage: "won",      amount: 2),
-        FactoryGirl.create(:opportunity, stage: "won",      amount: 2),
-        FactoryGirl.create(:opportunity, stage: "lost",     amount: 3),
-        FactoryGirl.create(:opportunity, stage: "lost",     amount: 3)
+        create(:opportunity, stage: "prospecting", amount: 1),
+        create(:opportunity, stage: "analysis", amount: 1),
+        create(:opportunity, stage: "won",      amount: 2),
+        create(:opportunity, stage: "won",      amount: 2),
+        create(:opportunity, stage: "lost",     amount: 3),
+        create(:opportunity, stage: "lost",     amount: 3)
       ]
       expect(Opportunity.pipeline.sum(:amount)).to eq(2)
       expect(Opportunity.won.sum(:amount)).to eq(4)
@@ -144,8 +144,8 @@ describe Opportunity do
     end
 
     context "unassigned" do
-      let(:unassigned_opportunity) { FactoryGirl.create(:opportunity, assignee: nil) }
-      let(:assigned_opportunity) { FactoryGirl.create(:opportunity, assignee: FactoryGirl.create(:user)) }
+      let(:unassigned_opportunity) { create(:opportunity, assignee: nil) }
+      let(:assigned_opportunity) { create(:opportunity, assignee: create(:user)) }
 
       it "includes unassigned opportunities" do
         expect(Opportunity.unassigned).to include(unassigned_opportunity)
@@ -159,12 +159,12 @@ describe Opportunity do
 
   describe "Attach" do
     before do
-      @opportunity = FactoryGirl.create(:opportunity)
+      @opportunity = create(:opportunity)
     end
 
     it "should return nil when attaching existing asset" do
-      @task = FactoryGirl.create(:task, asset: @opportunity)
-      @contact = FactoryGirl.create(:contact)
+      @task = create(:task, asset: @opportunity)
+      @contact = create(:contact)
       @opportunity.contacts << @contact
 
       expect(@opportunity.attach!(@task)).to eq(nil)
@@ -172,8 +172,8 @@ describe Opportunity do
     end
 
     it "should return non-empty list of attachments when attaching new asset" do
-      @task = FactoryGirl.create(:task)
-      @contact = FactoryGirl.create(:contact)
+      @task = create(:task)
+      @contact = create(:contact)
 
       expect(@opportunity.attach!(@task)).to eq([@task])
       expect(@opportunity.attach!(@contact)).to eq([@contact])
@@ -182,11 +182,11 @@ describe Opportunity do
 
   describe "Discard" do
     before do
-      @opportunity = FactoryGirl.create(:opportunity)
+      @opportunity = create(:opportunity)
     end
 
     it "should discard a task" do
-      @task = FactoryGirl.create(:task, asset: @opportunity)
+      @task = create(:task, asset: @opportunity)
       expect(@opportunity.tasks.count).to eq(1)
 
       @opportunity.discard!(@task)
@@ -195,7 +195,7 @@ describe Opportunity do
     end
 
     it "should discard an contact" do
-      @contact = FactoryGirl.create(:contact)
+      @contact = create(:contact)
       @opportunity.contacts << @contact
       expect(@opportunity.contacts.count).to eq(1)
 
@@ -207,16 +207,16 @@ describe Opportunity do
 
   describe "Exportable" do
     describe "assigned opportunity" do
-      let(:opportunity1) { FactoryGirl.build(:opportunity, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user)) }
-      let(:opportunity2) { FactoryGirl.build(:opportunity, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: FactoryGirl.create(:user, first_name: nil, last_name: nil)) }
+      let(:opportunity1) { build(:opportunity, user: create(:user), assignee: create(:user)) }
+      let(:opportunity2) { build(:opportunity, user: create(:user, first_name: nil, last_name: nil), assignee: create(:user, first_name: nil, last_name: nil)) }
       it_should_behave_like("exportable") do
         let(:exported) { [opportunity1, opportunity2] }
       end
     end
 
     describe "unassigned opportunity" do
-      let(:opportunity1) { FactoryGirl.build(:opportunity, user: FactoryGirl.create(:user), assignee: nil) }
-      let(:opportunity2) { FactoryGirl.build(:opportunity, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: nil) }
+      let(:opportunity1) { build(:opportunity, user: create(:user), assignee: nil) }
+      let(:opportunity2) { build(:opportunity, user: create(:user, first_name: nil, last_name: nil), assignee: nil) }
       it_should_behave_like("exportable") do
         let(:exported) { [opportunity1, opportunity2] }
       end
@@ -230,14 +230,14 @@ describe Opportunity do
   describe "scopes" do
     context "visible_on_dashboard" do
       before :each do
-        @user = FactoryGirl.create(:user)
-        @o1 = FactoryGirl.create(:opportunity_in_pipeline, user: @user, stage: 'prospecting')
-        @o2 = FactoryGirl.create(:opportunity_in_pipeline, user: @user, assignee: FactoryGirl.create(:user), stage: 'prospecting')
-        @o3 = FactoryGirl.create(:opportunity_in_pipeline, user: FactoryGirl.create(:user), assignee: @user, stage: 'prospecting')
-        @o4 = FactoryGirl.create(:opportunity_in_pipeline, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user), stage: 'prospecting')
-        @o5 = FactoryGirl.create(:opportunity_in_pipeline, user: FactoryGirl.create(:user), assignee: @user, stage: 'prospecting')
-        @o6 = FactoryGirl.create(:opportunity, assignee: @user, stage: 'won')
-        @o7 = FactoryGirl.create(:opportunity, assignee: @user, stage: 'lost')
+        @user = create(:user)
+        @o1 = create(:opportunity_in_pipeline, user: @user, stage: 'prospecting')
+        @o2 = create(:opportunity_in_pipeline, user: @user, assignee: create(:user), stage: 'prospecting')
+        @o3 = create(:opportunity_in_pipeline, user: create(:user), assignee: @user, stage: 'prospecting')
+        @o4 = create(:opportunity_in_pipeline, user: create(:user), assignee: create(:user), stage: 'prospecting')
+        @o5 = create(:opportunity_in_pipeline, user: create(:user), assignee: @user, stage: 'prospecting')
+        @o6 = create(:opportunity, assignee: @user, stage: 'won')
+        @o7 = create(:opportunity, assignee: @user, stage: 'lost')
       end
 
       it "should show opportunities which have been created by the user and are unassigned" do
@@ -263,9 +263,9 @@ describe Opportunity do
     end
 
     context "by_closes_on" do
-      let(:o1) { FactoryGirl.create(:opportunity, closes_on: 3.days.from_now) }
-      let(:o2) { FactoryGirl.create(:opportunity, closes_on: 7.days.from_now) }
-      let(:o3) { FactoryGirl.create(:opportunity, closes_on: 5.days.from_now) }
+      let(:o1) { create(:opportunity, closes_on: 3.days.from_now) }
+      let(:o2) { create(:opportunity, closes_on: 7.days.from_now) }
+      let(:o3) { create(:opportunity, closes_on: 5.days.from_now) }
 
       it "should show opportunities ordered by closes on" do
         expect(Opportunity.by_closes_on).to eq([o1, o3, o2])
@@ -273,9 +273,9 @@ describe Opportunity do
     end
 
     context "by_amount" do
-      let(:o1) { FactoryGirl.create(:opportunity, amount:  50_000) }
-      let(:o2) { FactoryGirl.create(:opportunity, amount:  10_000) }
-      let(:o3) { FactoryGirl.create(:opportunity, amount: 750_000) }
+      let(:o1) { create(:opportunity, amount:  50_000) }
+      let(:o2) { create(:opportunity, amount:  10_000) }
+      let(:o3) { create(:opportunity, amount: 750_000) }
 
       it "should show opportunities ordered by amount" do
         expect(Opportunity.by_amount).to eq([o3, o1, o2])
@@ -283,9 +283,9 @@ describe Opportunity do
     end
 
     context "not lost" do
-      let(:o1) { FactoryGirl.create(:opportunity, stage: 'won') }
-      let(:o2) { FactoryGirl.create(:opportunity, stage: 'lost') }
-      let(:o3) { FactoryGirl.create(:opportunity, stage: 'analysis') }
+      let(:o1) { create(:opportunity, stage: 'won') }
+      let(:o2) { create(:opportunity, stage: 'lost') }
+      let(:o3) { create(:opportunity, stage: 'analysis') }
 
       it "should show opportunities which are not lost" do
         expect(Opportunity.not_lost).to include(o1, o3)

data/spec/models/fields/custom_field_spec.rb

@@ -35,16 +35,16 @@ describe CustomField do
     expect(Contact).to receive(:reset_column_information)
     expect(Contact).to receive(:serialize_custom_fields!)
 
-    FactoryGirl.create(:custom_field,
-                       as: "string",
-                       name: "cf_test_field",
-                       label: "Test Field",
-                       field_group: FactoryGirl.create(:field_group, klass_name: "Contact"))
+    create(:custom_field,
+           as: "string",
+           name: "cf_test_field",
+           label: "Test Field",
+           field_group: create(:field_group, klass_name: "Contact"))
   end
 
   it "should generate a unique column name for a custom field" do
-    field_group = FactoryGirl.build(:field_group, klass_name: "Contact")
-    c = FactoryGirl.build(:custom_field, label: "Test Field", field_group: field_group)
+    field_group = build(:field_group, klass_name: "Contact")
+    c = build(:custom_field, label: "Test Field", field_group: field_group)
 
     columns = []
     %w[cf_test_field cf_test_field_2 cf_test_field_3 cf_test_field_4].each do |field|
@@ -54,12 +54,12 @@ describe CustomField do
   end
 
   it "should evaluate the safety of database transitions" do
-    c = FactoryGirl.build(:custom_field, as: "string")
+    c = build(:custom_field, as: "string")
     expect(c.send(:db_transition_safety, c.as, "email")).to eq(:null)
     expect(c.send(:db_transition_safety, c.as, "text")).to eq(:safe)
     expect(c.send(:db_transition_safety, c.as, "datetime")).to eq(:unsafe)
 
-    c = FactoryGirl.build(:custom_field, as: "datetime")
+    c = build(:custom_field, as: "datetime")
     expect(c.send(:db_transition_safety, c.as, "date")).to eq(:safe)
     expect(c.send(:db_transition_safety, c.as, "url")).to eq(:unsafe)
   end
@@ -67,7 +67,7 @@ describe CustomField do
   it "should return a safe list of types for the 'as' select options" do
     { "email"   => %w[check_boxes text string email url tel select radio_buttons],
       "integer" => %w[integer float] }.each do |type, expected_arr|
-      c = FactoryGirl.build(:custom_field, as: type)
+      c = build(:custom_field, as: type)
       opts = c.available_as
       expect(opts.map(&:first)).to match_array(expected_arr)
     end
@@ -81,12 +81,12 @@ describe CustomField do
     expect(Contact).to receive(:reset_column_information).twice
     expect(Contact).to receive(:serialize_custom_fields!).twice
 
-    field_group = FactoryGirl.create(:field_group, klass_name: "Contact")
-    c = FactoryGirl.create(:custom_field,
-                           label: "Test Field",
-                           name: nil,
-                           as: "email",
-                           field_group: field_group)
+    field_group = create(:field_group, klass_name: "Contact")
+    c = create(:custom_field,
+               label: "Test Field",
+               name: nil,
+               as: "email",
+               field_group: field_group)
     c.as = "text"
     c.save
   end
@@ -102,7 +102,7 @@ describe CustomField do
       expect(Contact).to receive(:reset_column_information)
       expect(Contact).to receive(:serialize_custom_fields!)
 
-      contact = FactoryGirl.build(:contact)
+      contact = build(:contact)
       expect(contact.cf_another_new_field).to eq(nil)
     end
   end