fat_free_crm 0.17.3 → 0.18.0

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

@@ -10,7 +10,7 @@ require 'spec_helper'
 describe "/opportunities/destroy" do
   before do
     login
-    assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity))
+    assign(:opportunity, @opportunity = build_stubbed(:opportunity))
     assign(:stage, Setting.unroll(:opportunity_stage))
     assign(:opportunity_stage_total, Hash.new(1))
   end
@@ -39,7 +39,7 @@ describe "/opportunities/destroy" do
   end
 
   it "should update related account sidebar when called from related account" do
-    assign(:account, account = FactoryGirl.build_stubbed(:account))
+    assign(:account, account = build_stubbed(:account))
     controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/#{account.id}"
     render
 
@@ -49,7 +49,7 @@ describe "/opportunities/destroy" do
   end
 
   it "should update related campaign sidebar when called from related campaign" 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/opportunities/edit.js.haml_spec.rb

@@ -13,9 +13,9 @@ describe "/opportunities/edit" do
   before do
     login
 
-    assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity, user: current_user))
+    assign(:opportunity, @opportunity = build_stubbed(:opportunity, user: current_user))
     assign(:users, [current_user])
-    assign(:account, @account = FactoryGirl.build_stubbed(:account))
+    assign(:account, @account = build_stubbed(:account))
     assign(:accounts, [@account])
     assign(:stage, Setting.unroll(:opportunity_stage))
   end
@@ -37,7 +37,7 @@ describe "/opportunities/edit" do
 
   it "edit: should hide previously open [Edit Opportunity] for and replace it with opportunity partial" do
     params[:cancel] = nil
-    assign(:previous, previous = FactoryGirl.build_stubbed(:opportunity, user: current_user))
+    assign(:previous, previous = build_stubbed(:opportunity, user: current_user))
 
     render
     expect(rendered).to include("$('#opportunity_#{previous.id}').replaceWith")

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

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

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

@@ -16,7 +16,7 @@ describe "/opportunities/index" do
   end
 
   it "should render [opportunity] template with @opportunities collection if there are opportunities" do
-    assign(:opportunities, [FactoryGirl.build_stubbed(:opportunity, id: 42)].paginate)
+    assign(:opportunities, [build_stubbed(:opportunity, id: 42)].paginate)
 
     render template: 'opportunities/index', formats: [:js]
 

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

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

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

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

@@ -11,9 +11,9 @@ describe "/opportunities/update" do
   before do
     login
 
-    assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity, user: current_user, assignee: FactoryGirl.build_stubbed(:user)))
+    assign(:opportunity, @opportunity = build_stubbed(:opportunity, user: current_user, assignee: build_stubbed(:user)))
     assign(:users, [current_user])
-    assign(:account, @account = FactoryGirl.build_stubbed(:account))
+    assign(:account, @account = build_stubbed(:account))
     assign(:accounts, [@account])
     assign(:stage, Setting.unroll(:opportunity_stage))
     assign(:opportunity_stage_total, Hash.new(1))
@@ -62,7 +62,7 @@ describe "/opportunities/update" do
 
     describe "on related asset page -" do
       it "should update account sidebar" do
-        assign(:account, account = FactoryGirl.build_stubbed(:account))
+        assign(:account, account = build_stubbed(:account))
         controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/#{account.id}"
         render
 
@@ -72,7 +72,7 @@ describe "/opportunities/update" do
       end
 
       it "should update campaign sidebar" 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/tasks/_edit.haml_spec.rb

@@ -12,7 +12,7 @@ describe "/tasks/_edit" do
 
   before do
     login
-    assign(:task, FactoryGirl.build_stubbed(:task, asset: FactoryGirl.build_stubbed(:account), bucket: "due_asap"))
+    assign(:task, build_stubbed(:task, asset: build_stubbed(:account), bucket: "due_asap"))
     assign(:users, [current_user])
     assign(:bucket, %w[due_asap due_today])
     assign(:category, %w[meeting money])

data/spec/views/tasks/complete.js.haml_spec.rb

@@ -17,7 +17,7 @@ describe "/tasks/complete" do
 
   describe "complete from Tasks tab (pending view)" do
     before do
-      @task = FactoryGirl.build_stubbed(:task)
+      @task = build_stubbed(:task)
       assign(:task, @task)
       assign(:view, "pending")
       assign(:empty_bucket, :due_asap)
@@ -33,7 +33,7 @@ describe "/tasks/complete" do
     end
 
     it "should update tasks sidebar" do
-      assign(:task, FactoryGirl.build_stubbed(:task))
+      assign(:task, build_stubbed(:task))
       assign(:view, "pending")
       assign(:empty_bucket, :due_asap)
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
@@ -48,7 +48,7 @@ describe "/tasks/complete" do
 
   describe "complete from related asset" do
     it "should replace pending partial with the completed one" do
-      @task = FactoryGirl.build_stubbed(:task, completed_at: Time.now, completor: current_user)
+      @task = build_stubbed(:task, completed_at: Time.now, completor: current_user)
       assign(:task, @task)
 
       render
@@ -57,7 +57,7 @@ describe "/tasks/complete" do
     end
 
     it "should update recently viewed items" do
-      @task = FactoryGirl.build_stubbed(:task, completed_at: Time.now, completor: current_user)
+      @task = build_stubbed(:task, completed_at: Time.now, completor: current_user)
       assign(:task, @task)
       controller.request.env["HTTP_REFERER"] = "http://localhost/leads/123"
 

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

@@ -48,7 +48,7 @@ describe "/tasks/create" do
 
   it "should show flash message when assigning a task from pending tasks view" do
     assign(:view, "pending")
-    assign(:task, FactoryGirl.build_stubbed(:task, id: 42, assignee: FactoryGirl.build_stubbed(:user)))
+    assign(:task, build_stubbed(:task, id: 42, assignee: build_stubbed(:user)))
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
     render
 
@@ -58,7 +58,7 @@ describe "/tasks/create" do
 
   it "should update recent items when assigning a task from pending tasks view" do
     assign(:view, "pending")
-    assign(:task, FactoryGirl.build_stubbed(:task, id: 42, assignee: FactoryGirl.build_stubbed(:user)))
+    assign(:task, build_stubbed(:task, id: 42, assignee: build_stubbed(:user)))
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
     render
 
@@ -68,7 +68,7 @@ describe "/tasks/create" do
 
   it "should show flash message when creating a pending task from assigned tasks view" do
     assign(:view, "assigned")
-    assign(:task, FactoryGirl.build_stubbed(:task, id: 42, assignee: nil))
+    assign(:task, build_stubbed(:task, id: 42, assignee: nil))
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
     render
 
@@ -78,7 +78,7 @@ describe "/tasks/create" do
 
   it "should update recent items when creating a pending task from assigned tasks view" do
     assign(:view, "assigned")
-    assign(:task, FactoryGirl.build_stubbed(:task, id: 42, assignee: nil))
+    assign(:task, build_stubbed(:task, id: 42, assignee: nil))
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
     render
 
@@ -89,7 +89,7 @@ describe "/tasks/create" do
   (TASK_STATUSES - ['assigned']).each do |status|
     describe "create from outside the Tasks tab" do
       before do
-        @task = FactoryGirl.build_stubbed(:task, id: 42)
+        @task = build_stubbed(:task, id: 42)
         assign(:view, status)
         assign(:task, @task)
         render
@@ -112,7 +112,7 @@ describe "/tasks/create" do
   end
 
   it "create failure: should re-render [create] template in :create_task div" do
-    assign(:task, FactoryGirl.build(:task, name: nil)) # make it invalid
+    assign(:task, build(:task, name: nil)) # make it invalid
     render
 
     expect(rendered).to include(%/$('#create_task').effect("shake"/)

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

@@ -17,7 +17,7 @@ describe "/tasks/destroy" do
   TASK_STATUSES.each do |status|
     describe "destroy from Tasks tab (#{status} view)" do
       before do
-        @task = FactoryGirl.build_stubbed(:task)
+        @task = build_stubbed(:task)
         assign(:task, @task)
         assign(:view, status)
         assign(:empty_bucket, :due_asap)
@@ -46,7 +46,7 @@ describe "/tasks/destroy" do
 
   describe "destroy from related asset" do
     it "should blind up out destroyed task partial" do
-      @task = FactoryGirl.build_stubbed(:task)
+      @task = build_stubbed(:task)
       assign(:task, @task)
       controller.request.env["HTTP_REFERER"] = "http://localhost/leads/123"
 

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

@@ -16,10 +16,10 @@ describe "/tasks/index" do
 
   TASK_STATUSES.each do |status|
     before do
-      user = FactoryGirl.build_stubbed(:user)
-      account = FactoryGirl.build_stubbed(:account)
-      @due = FactoryGirl.build_stubbed(:task, asset: account, bucket: "due_asap", assignee: user)
-      @completed = FactoryGirl.build_stubbed(:task, asset: account, bucket: "completed_today", assignee: user, completed_at: 1.hour.ago, completor: user)
+      user = build_stubbed(:user)
+      account = build_stubbed(:account)
+      @due = build_stubbed(:task, asset: account, bucket: "due_asap", assignee: user)
+      @completed = build_stubbed(:task, asset: account, bucket: "completed_today", assignee: user, completed_at: 1.hour.ago, completor: user)
     end
 
     it "should render list of #{status} tasks if list of tasks is not empty" do

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

@@ -12,7 +12,7 @@ describe "/tasks/new" do
 
   before do
     login
-    assign(:task, FactoryGirl.build(:task))
+    assign(:task, build(:task))
     assign(:users, [current_user])
     assign(:bucket, Setting.task_bucket[1..-1] << ["On Specific Date...", :specific_time])
     assign(:category, Setting.unroll(:task_category))

data/spec/views/tasks/uncomplete.js.haml_spec.rb

@@ -17,7 +17,7 @@ describe "/tasks/uncomplete" do
 
   describe "uncomplete from Tasks tab (completed view)" do
     before do
-      @task = FactoryGirl.build_stubbed(:task)
+      @task = build_stubbed(:task)
       assign(:task, @task)
       assign(:view, "completed")
       assign(:empty_bucket, :due_asap)
@@ -33,7 +33,7 @@ describe "/tasks/uncomplete" do
     end
 
     it "should update tasks sidebar" do
-      assign(:task, FactoryGirl.build_stubbed(:task))
+      assign(:task, build_stubbed(:task))
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
       render

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

@@ -16,8 +16,8 @@ describe "/tasks/update" do
 
   describe "Changing due date" do
     before do
-      assign(:task_before_update, FactoryGirl.build_stubbed(:task, bucket: "due_asap"))
-      assign(:task, @task = FactoryGirl.build_stubbed(:task, bucket: "due_tomorrow"))
+      assign(:task_before_update, build_stubbed(:task, bucket: "due_asap"))
+      assign(:task, @task = build_stubbed(:task, bucket: "due_tomorrow"))
       assign(:view, "pending")
       assign(:task_total, stub_task_total("pending"))
     end
@@ -64,9 +64,9 @@ describe "/tasks/update" do
     end
 
     it "pending task to somebody from Tasks tab: should remove the task and show flash message (assigned)" do
-      assignee = FactoryGirl.build_stubbed(:user)
-      assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: nil))
-      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: assignee))
+      assignee = build_stubbed(:user)
+      assign(:task_before_update, build_stubbed(:task, assignee: nil))
+      assign(:task, @task = build_stubbed(:task, assignee: assignee))
       assign(:view, "pending")
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
@@ -78,9 +78,9 @@ describe "/tasks/update" do
     end
 
     it "assigned tasks to me from Tasks tab: should remove the task and show flash message (pending)" do
-      assignee = FactoryGirl.build_stubbed(:user)
-      assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: assignee))
-      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: nil))
+      assignee = build_stubbed(:user)
+      assign(:task_before_update, build_stubbed(:task, assignee: assignee))
+      assign(:task, @task = build_stubbed(:task, assignee: nil))
       assign(:view, "assigned")
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
 
@@ -92,8 +92,8 @@ describe "/tasks/update" do
     end
 
     it "assigned tasks to somebody else from Tasks tab: should re-render task partial" do
-      assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
-      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
+      assign(:task_before_update, build_stubbed(:task, assignee: build_stubbed(:user)))
+      assign(:task, @task = build_stubbed(:task, assignee: build_stubbed(:user)))
       assign(:view, "assigned")
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
 
@@ -102,8 +102,8 @@ describe "/tasks/update" do
     end
 
     it "from Tasks tab: should update tasks sidebar" do
-      assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: nil))
-      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
+      assign(:task_before_update, build_stubbed(:task, assignee: nil))
+      assign(:task, @task = build_stubbed(:task, assignee: build_stubbed(:user)))
       assign(:view, "assigned")
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
       render
@@ -115,16 +115,16 @@ describe "/tasks/update" do
     end
 
     it "from asset page: should should re-render task partial" do
-      assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: nil))
-      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
+      assign(:task_before_update, build_stubbed(:task, assignee: nil))
+      assign(:task, @task = build_stubbed(:task, assignee: build_stubbed(:user)))
       render
 
       expect(rendered).to include("$('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
     end
 
     it "from asset page: should update recently viewed items" do
-      assign(:task_before_update, FactoryGirl.build_stubbed(:task, assignee: nil))
-      assign(:task, @task = FactoryGirl.build_stubbed(:task, assignee: FactoryGirl.build_stubbed(:user)))
+      assign(:task_before_update, build_stubbed(:task, assignee: nil))
+      assign(:task, @task = build_stubbed(:task, assignee: build_stubbed(:user)))
       render
 
       expect(rendered).to have_text("Recent Items")
@@ -132,8 +132,8 @@ describe "/tasks/update" do
   end
 
   it "error: should re-disiplay [Edit Task] form and shake it" do
-    assign(:task_before_update, FactoryGirl.build_stubbed(:task))
-    assign(:task, @task = FactoryGirl.build_stubbed(:task))
+    assign(:task_before_update, build_stubbed(:task))
+    assign(:task, @task = build_stubbed(:task))
     @task.errors.add(:name)
 
     render

data/spec/views/users/upload_avatar.js.haml_spec.rb

@@ -16,7 +16,7 @@ describe "/users/upload_avatar" do
 
   describe "no errors:" do
     before do
-      @avatar = FactoryGirl.build_stubbed(:avatar, entity: current_user)
+      @avatar = build_stubbed(:avatar, entity: current_user)
       allow(current_user).to receive(:avatar).and_return(@avatar)
       assign(:user, @user = current_user)
     end
@@ -31,7 +31,7 @@ describe "/users/upload_avatar" do
 
   describe "validation errors:" do
     before do
-      @avatar = FactoryGirl.build_stubbed(:avatar, entity: current_user)
+      @avatar = build_stubbed(:avatar, entity: current_user)
       @avatar.errors.add(:image, "error")
       allow_any_instance_of(User).to receive(:avatar).and_return(@avatar)
       assign(:user, @user = current_user)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.18.0
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -548,6 +548,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".docker/nginx/sites-enabled/ffcrm.conf"
+- ".dockerignore"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -1282,6 +1283,7 @@ files:
 - spec/features/leads_spec.rb
 - spec/features/opportunities_overview_spec.rb
 - spec/features/opportunities_spec.rb
+- spec/features/support/autocomlete_helper.rb
 - spec/features/support/browser.rb
 - spec/features/support/headless.rb
 - spec/features/support/helpers.rb
@@ -1573,7 +1575,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="