fat_free_crm 0.17.3 → 0.18.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of fat_free_crm might be problematic. Click here for more details.

Files changed (195) hide show
  1. checksums.yaml +4 -4
  2. data/.dockerignore +11 -0
  3. data/.rubocop.yml +1 -1
  4. data/.rubocop_todo.yml +30 -8
  5. data/.travis.yml +14 -9
  6. data/CHANGELOG.md +43 -7
  7. data/CONTRIBUTORS.md +95 -53
  8. data/Gemfile +11 -7
  9. data/Gemfile.lock +83 -83
  10. data/README.md +7 -4
  11. data/app/assets/javascripts/crm.js.coffee +3 -3
  12. data/app/assets/javascripts/crm_select2.js.coffee +15 -14
  13. data/app/controllers/admin/field_groups_controller.rb +8 -1
  14. data/app/controllers/admin/fields_controller.rb +4 -4
  15. data/app/controllers/admin/groups_controller.rb +1 -1
  16. data/app/controllers/admin/tags_controller.rb +1 -1
  17. data/app/controllers/application_controller.rb +11 -0
  18. data/app/controllers/authentications_controller.rb +1 -1
  19. data/app/controllers/comments_controller.rb +15 -7
  20. data/app/controllers/entities/campaigns_controller.rb +7 -2
  21. data/app/controllers/entities/leads_controller.rb +9 -2
  22. data/app/controllers/entities/opportunities_controller.rb +13 -2
  23. data/app/controllers/entities_controller.rb +10 -5
  24. data/app/controllers/lists_controller.rb +5 -1
  25. data/app/controllers/tasks_controller.rb +15 -1
  26. data/app/helpers/accounts_helper.rb +1 -1
  27. data/app/helpers/application_helper.rb +2 -2
  28. data/app/helpers/leads_helper.rb +1 -1
  29. data/app/helpers/opportunities_helper.rb +56 -3
  30. data/app/helpers/tags_helper.rb +1 -1
  31. data/app/models/entities/lead.rb +0 -7
  32. data/app/models/entities/opportunity.rb +3 -2
  33. data/app/models/observers/opportunity_observer.rb +4 -4
  34. data/app/models/users/ability.rb +3 -4
  35. data/app/views/campaigns/_metrics.html.haml +3 -3
  36. data/app/views/home/_opportunity.html.haml +4 -19
  37. data/app/views/opportunities/_index_long.html.haml +1 -24
  38. data/app/views/opportunities/_sidebar_show.html.haml +3 -3
  39. data/app/views/opportunities/_top_section.html.haml +1 -1
  40. data/db/schema.rb +0 -3
  41. data/fat_free_crm.gemspec +1 -1
  42. data/lib/fat_free_crm/core_ext/string.rb +1 -1
  43. data/lib/fat_free_crm/engine.rb +2 -2
  44. data/lib/fat_free_crm/fields.rb +1 -1
  45. data/lib/fat_free_crm/permissions.rb +0 -14
  46. data/lib/fat_free_crm/version.rb +2 -2
  47. data/lib/tasks/ffcrm/setup.rake +4 -4
  48. data/spec/controllers/admin/users_controller_spec.rb +27 -27
  49. data/spec/controllers/authentications_controller_spec.rb +7 -7
  50. data/spec/controllers/comments_controller_spec.rb +13 -13
  51. data/spec/controllers/emails_controller_spec.rb +2 -2
  52. data/spec/controllers/entities/accounts_controller_spec.rb +56 -56
  53. data/spec/controllers/entities/campaigns_controller_spec.rb +66 -66
  54. data/spec/controllers/entities/contacts_controller_spec.rb +67 -67
  55. data/spec/controllers/entities/leads_controller_spec.rb +125 -125
  56. data/spec/controllers/entities/opportunities_controller_spec.rb +100 -100
  57. data/spec/controllers/home_controller_spec.rb +26 -26
  58. data/spec/controllers/passwords_controller_spec.rb +1 -1
  59. data/spec/controllers/tasks_controller_spec.rb +37 -37
  60. data/spec/controllers/users_controller_spec.rb +18 -18
  61. data/spec/factories/account_factories.rb +8 -8
  62. data/spec/factories/campaign_factories.rb +5 -5
  63. data/spec/factories/contact_factories.rb +10 -10
  64. data/spec/factories/field_factories.rb +7 -7
  65. data/spec/factories/lead_factories.rb +8 -8
  66. data/spec/factories/list_factories.rb +1 -1
  67. data/spec/factories/opportunity_factories.rb +6 -6
  68. data/spec/factories/sequences.rb +1 -1
  69. data/spec/factories/setting_factories.rb +3 -3
  70. data/spec/factories/shared_factories.rb +14 -14
  71. data/spec/factories/subscription_factories.rb +1 -1
  72. data/spec/factories/tag_factories.rb +1 -1
  73. data/spec/factories/task_factories.rb +4 -4
  74. data/spec/factories/user_factories.rb +13 -13
  75. data/spec/features/accounts_spec.rb +17 -4
  76. data/spec/features/admin/groups_spec.rb +1 -1
  77. data/spec/features/admin/users_spec.rb +1 -1
  78. data/spec/features/campaigns_spec.rb +4 -4
  79. data/spec/features/contacts_spec.rb +10 -4
  80. data/spec/features/dashboard_spec.rb +7 -7
  81. data/spec/features/leads_spec.rb +4 -4
  82. data/spec/features/opportunities_overview_spec.rb +15 -15
  83. data/spec/features/opportunities_spec.rb +34 -8
  84. data/spec/features/support/autocomlete_helper.rb +17 -0
  85. data/spec/features/support/browser.rb +3 -8
  86. data/spec/features/support/helpers.rb +1 -1
  87. data/spec/features/tasks_spec.rb +4 -4
  88. data/spec/helpers/admin/field_groups_helper_spec.rb +1 -1
  89. data/spec/helpers/application_helper_spec.rb +1 -1
  90. data/spec/helpers/tasks_helper_spec.rb +1 -1
  91. data/spec/helpers/users_helper_spec.rb +3 -3
  92. data/spec/lib/comment_extensions_spec.rb +1 -1
  93. data/spec/lib/mail_processor/base_spec.rb +3 -3
  94. data/spec/lib/mail_processor/comment_replies_spec.rb +3 -3
  95. data/spec/lib/mail_processor/dropbox_spec.rb +16 -16
  96. data/spec/lib/permissions_spec.rb +7 -25
  97. data/spec/mailers/user_mailer_spec.rb +7 -7
  98. data/spec/models/entities/account_spec.rb +31 -32
  99. data/spec/models/entities/campaign_spec.rb +18 -25
  100. data/spec/models/entities/contact_spec.rb +18 -21
  101. data/spec/models/entities/lead_spec.rb +9 -11
  102. data/spec/models/entities/opportunity_spec.rb +45 -45
  103. data/spec/models/fields/custom_field_spec.rb +17 -17
  104. data/spec/models/list_spec.rb +2 -2
  105. data/spec/models/observers/entity_observer_spec.rb +6 -6
  106. data/spec/models/polymorphic/address_spec.rb +1 -1
  107. data/spec/models/polymorphic/avatar_spec.rb +5 -5
  108. data/spec/models/polymorphic/comment_spec.rb +5 -5
  109. data/spec/models/polymorphic/task_spec.rb +65 -58
  110. data/spec/models/polymorphic/version_spec.rb +26 -26
  111. data/spec/models/setting_spec.rb +2 -2
  112. data/spec/models/users/preference_spec.rb +6 -6
  113. data/spec/models/users/user_spec.rb +26 -26
  114. data/spec/shared/models.rb +22 -22
  115. data/spec/spec_helper.rb +2 -2
  116. data/spec/support/auth_macros.rb +1 -1
  117. data/spec/support/macros.rb +3 -3
  118. data/spec/views/accounts/_edit.haml_spec.rb +1 -1
  119. data/spec/views/accounts/create.js.haml_spec.rb +2 -2
  120. data/spec/views/accounts/destroy.js.haml_spec.rb +1 -1
  121. data/spec/views/accounts/edit.js.haml_spec.rb +2 -2
  122. data/spec/views/accounts/index.haml_spec.rb +2 -2
  123. data/spec/views/accounts/index.js.haml_spec.rb +1 -1
  124. data/spec/views/accounts/show.haml_spec.rb +4 -4
  125. data/spec/views/accounts/update.js.haml_spec.rb +1 -1
  126. data/spec/views/admin/field_groups/create.js.haml_spec.rb +1 -1
  127. data/spec/views/admin/field_groups/destroy.js.haml_spec.rb +1 -1
  128. data/spec/views/admin/field_groups/edit.js.haml_spec.rb +1 -1
  129. data/spec/views/admin/field_groups/new.js.haml_spec.rb +1 -1
  130. data/spec/views/admin/field_groups/update.js.haml_spec.rb +1 -1
  131. data/spec/views/admin/users/create.js.haml_spec.rb +2 -2
  132. data/spec/views/admin/users/destroy.js.haml_spec.rb +2 -2
  133. data/spec/views/admin/users/edit.js.haml_spec.rb +2 -2
  134. data/spec/views/admin/users/index.haml_spec.rb +1 -1
  135. data/spec/views/admin/users/index.js.haml_spec.rb +2 -2
  136. data/spec/views/admin/users/reactivate.js.haml_spec.rb +1 -1
  137. data/spec/views/admin/users/suspend.js.haml_spec.rb +1 -1
  138. data/spec/views/admin/users/update.js.haml_spec.rb +1 -1
  139. data/spec/views/application/auto_complete.haml_spec.rb +3 -3
  140. data/spec/views/campaigns/_edit.haml_spec.rb +1 -1
  141. data/spec/views/campaigns/create.js.haml_spec.rb +3 -3
  142. data/spec/views/campaigns/destroy.js.haml_spec.rb +1 -1
  143. data/spec/views/campaigns/edit.js.haml_spec.rb +2 -2
  144. data/spec/views/campaigns/index.haml_spec.rb +1 -1
  145. data/spec/views/campaigns/index.js.haml_spec.rb +1 -1
  146. data/spec/views/campaigns/show.haml_spec.rb +4 -4
  147. data/spec/views/campaigns/update.js.haml_spec.rb +1 -1
  148. data/spec/views/contacts/_edit.haml_spec.rb +7 -7
  149. data/spec/views/contacts/_new.haml_spec.rb +1 -1
  150. data/spec/views/contacts/create.js.haml_spec.rb +4 -4
  151. data/spec/views/contacts/destroy.js.haml_spec.rb +1 -1
  152. data/spec/views/contacts/edit.js.haml_spec.rb +3 -3
  153. data/spec/views/contacts/index.haml_spec.rb +1 -1
  154. data/spec/views/contacts/index.js.html_spec.rb +1 -1
  155. data/spec/views/contacts/new.js.haml_spec.rb +1 -1
  156. data/spec/views/contacts/show.haml_spec.rb +3 -3
  157. data/spec/views/contacts/update.js.haml_spec.rb +2 -2
  158. data/spec/views/home/index.haml_spec.rb +1 -1
  159. data/spec/views/home/index.js.haml_spec.rb +1 -1
  160. data/spec/views/home/options.js.haml_spec.rb +2 -2
  161. data/spec/views/leads/_convert.haml_spec.rb +3 -3
  162. data/spec/views/leads/_edit.haml_spec.rb +2 -2
  163. data/spec/views/leads/_new.haml_spec.rb +2 -2
  164. data/spec/views/leads/_sidebar_show.haml_spec.rb +5 -5
  165. data/spec/views/leads/convert.js.haml_spec.rb +4 -4
  166. data/spec/views/leads/create.js.haml_spec.rb +5 -5
  167. data/spec/views/leads/destroy.js.haml_spec.rb +2 -2
  168. data/spec/views/leads/edit.js.haml_spec.rb +4 -4
  169. data/spec/views/leads/index.haml_spec.rb +1 -1
  170. data/spec/views/leads/index.js.haml_spec.rb +1 -1
  171. data/spec/views/leads/new.js.haml_spec.rb +1 -1
  172. data/spec/views/leads/promote.js.haml_spec.rb +7 -7
  173. data/spec/views/leads/reject.js.haml_spec.rb +2 -2
  174. data/spec/views/leads/show.haml_spec.rb +2 -2
  175. data/spec/views/leads/update.js.haml_spec.rb +4 -4
  176. data/spec/views/opportunities/_edit.haml_spec.rb +7 -7
  177. data/spec/views/opportunities/_new.haml_spec.rb +2 -2
  178. data/spec/views/opportunities/create.js.haml_spec.rb +6 -6
  179. data/spec/views/opportunities/destroy.js.haml_spec.rb +3 -3
  180. data/spec/views/opportunities/edit.js.haml_spec.rb +3 -3
  181. data/spec/views/opportunities/index.haml_spec.rb +1 -1
  182. data/spec/views/opportunities/index.js.haml_spec.rb +1 -1
  183. data/spec/views/opportunities/new.js.haml_spec.rb +1 -1
  184. data/spec/views/opportunities/show.haml_spec.rb +3 -3
  185. data/spec/views/opportunities/update.js.haml_spec.rb +4 -4
  186. data/spec/views/tasks/_edit.haml_spec.rb +1 -1
  187. data/spec/views/tasks/complete.js.haml_spec.rb +4 -4
  188. data/spec/views/tasks/create.js.haml_spec.rb +6 -6
  189. data/spec/views/tasks/destroy.js.haml_spec.rb +2 -2
  190. data/spec/views/tasks/index.haml_spec.rb +4 -4
  191. data/spec/views/tasks/new.js.haml_spec.rb +1 -1
  192. data/spec/views/tasks/uncomplete.js.haml_spec.rb +2 -2
  193. data/spec/views/tasks/update.js.haml_spec.rb +18 -18
  194. data/spec/views/users/upload_avatar.js.haml_spec.rb +2 -2
  195. metadata +5 -3
@@ -12,13 +12,13 @@ describe "/accounts/show" do
12
12
 
13
13
  before do
14
14
  login
15
- @account = FactoryGirl.create(:account, id: 42,
16
- contacts: [FactoryGirl.create(:contact)],
17
- opportunities: [FactoryGirl.create(:opportunity)])
15
+ @account = create(:account, id: 42,
16
+ contacts: [create(:contact)],
17
+ opportunities: [create(:opportunity)])
18
18
  assign(:account, @account)
19
19
  assign(:users, [current_user])
20
20
  assign(:comment, Comment.new)
21
- assign(:timeline, [FactoryGirl.create(:comment, commentable: @account)])
21
+ assign(:timeline, [create(:comment, commentable: @account)])
22
22
 
23
23
  # controller#controller_name and controller#action_name are not set in view specs
24
24
  allow(view).to receive(:template_for_current_view).and_return(nil)
@@ -13,7 +13,7 @@ describe "/accounts/update" do
13
13
  before do
14
14
  login
15
15
 
16
- assign(:account, @account = FactoryGirl.build_stubbed(:account, user: current_user))
16
+ assign(:account, @account = build_stubbed(:account, user: current_user))
17
17
  assign(:users, [current_user])
18
18
  assign(:account_category_total, Hash.new(1))
19
19
  end
@@ -13,7 +13,7 @@ describe "admin/field_groups/create" do
13
13
  assign(:field_group, field_group)
14
14
  end
15
15
 
16
- let(:field_group) { FactoryGirl.build_stubbed(:field_group, label: 'test') }
16
+ let(:field_group) { build_stubbed(:field_group, label: 'test') }
17
17
 
18
18
  it "renders javascript" do
19
19
  render
@@ -13,7 +13,7 @@ describe "admin/field_groups/destroy" do
13
13
  assign(:field_group, field_group)
14
14
  end
15
15
 
16
- let(:field_group) { FactoryGirl.build(:field_group) }
16
+ let(:field_group) { build(:field_group) }
17
17
 
18
18
  it "renders destroy javascript" do
19
19
  allow(field_group).to receive(:destroyed?).and_return(true)
@@ -13,7 +13,7 @@ describe "admin/field_groups/edit" do
13
13
  assign(:field_group, field_group)
14
14
  end
15
15
 
16
- let(:field_group) { FactoryGirl.build_stubbed(:field_group, label: 'test') }
16
+ let(:field_group) { build_stubbed(:field_group, label: 'test') }
17
17
 
18
18
  it "renders javascript" do
19
19
  render
@@ -13,7 +13,7 @@ describe "admin/field_groups/new" do
13
13
  assign(:field_group, field_group)
14
14
  end
15
15
 
16
- let(:field_group) { FactoryGirl.build_stubbed(:field_group, label: 'test') }
16
+ let(:field_group) { build_stubbed(:field_group, label: 'test') }
17
17
 
18
18
  it "renders javascript" do
19
19
  render
@@ -13,7 +13,7 @@ describe "admin/field_groups/update" do
13
13
  assign(:field_group, field_group)
14
14
  end
15
15
 
16
- let(:field_group) { FactoryGirl.build_stubbed(:field_group, label: 'test') }
16
+ let(:field_group) { build_stubbed(:field_group, label: 'test') }
17
17
 
18
18
  it "renders javascript" do
19
19
  render
@@ -14,7 +14,7 @@ describe "admin/users/create" do
14
14
 
15
15
  describe "create success" do
16
16
  before do
17
- assign(:user, @user = FactoryGirl.build_stubbed(:user))
17
+ assign(:user, @user = build_stubbed(:user))
18
18
  assign(:users, [@user]) # .paginate
19
19
  end
20
20
 
@@ -31,7 +31,7 @@ describe "admin/users/create" do
31
31
 
32
32
  describe "create failure" do
33
33
  it "should re-render [create] template in :create_user div" do
34
- assign(:user, FactoryGirl.build(:user, username: nil)) # make it invalid
34
+ assign(:user, build(:user, username: nil)) # make it invalid
35
35
  assign(:users, [current_user])
36
36
  render
37
37
 
@@ -14,7 +14,7 @@ describe "admin/users/destroy" do
14
14
 
15
15
  describe "user got deleted" do
16
16
  before do
17
- @user = FactoryGirl.create(:user)
17
+ @user = create(:user)
18
18
  @user.destroy
19
19
  assign(:user, @user)
20
20
  end
@@ -28,7 +28,7 @@ describe "admin/users/destroy" do
28
28
 
29
29
  describe "user was not deleted" do
30
30
  before do
31
- assign(:user, @user = FactoryGirl.build_stubbed(:user))
31
+ assign(:user, @user = build_stubbed(:user))
32
32
  end
33
33
 
34
34
  it "should remove confirmation panel" do
@@ -10,7 +10,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
10
10
  describe "admin/users/edit" do
11
11
  before do
12
12
  login_admin
13
- assign(:user, @user = FactoryGirl.build_stubbed(:user))
13
+ assign(:user, @user = build_stubbed(:user))
14
14
  end
15
15
 
16
16
  it "cancel replaces [Edit User] form with user partial" do
@@ -21,7 +21,7 @@ describe "admin/users/edit" do
21
21
  end
22
22
 
23
23
  it "edit hides previously open [Edit User] and replaces it with user partial" do
24
- assign(:previous, previous = FactoryGirl.build_stubbed(:user))
24
+ assign(:previous, previous = build_stubbed(:user))
25
25
  render
26
26
 
27
27
  expect(rendered).to include("user_#{previous.id}")
@@ -13,7 +13,7 @@ describe "/admin/users/index" do
13
13
  end
14
14
 
15
15
  it "renders a list of users" do
16
- assign(:users, [FactoryGirl.build_stubbed(:user)].paginate)
16
+ assign(:users, [build_stubbed(:user)].paginate)
17
17
 
18
18
  render
19
19
  expect(view).to render_template(partial: "_user")
@@ -13,8 +13,8 @@ describe "admin/users/index" do
13
13
  end
14
14
 
15
15
  it "renders [admin/user] template with @users collection" do
16
- amy = FactoryGirl.build_stubbed(:user)
17
- bob = FactoryGirl.build_stubbed(:user)
16
+ amy = build_stubbed(:user)
17
+ bob = build_stubbed(:user)
18
18
  assign(:users, [amy, bob].paginate)
19
19
 
20
20
  render template: 'admin/users/index', formats: [:js]
@@ -10,7 +10,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
10
10
  describe "admin/users/reactivate" do
11
11
  before do
12
12
  login_admin
13
- assign(:user, @user = FactoryGirl.build_stubbed(:user, suspended_at: Time.now.yesterday))
13
+ assign(:user, @user = build_stubbed(:user, suspended_at: Time.now.yesterday))
14
14
  end
15
15
 
16
16
  it "reloads the requested user partial" do
@@ -10,7 +10,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
10
10
  describe "admin/users/suspend" do
11
11
  before do
12
12
  login_admin
13
- assign(:user, @user = FactoryGirl.build_stubbed(:user, suspended_at: nil))
13
+ assign(:user, @user = build_stubbed(:user, suspended_at: nil))
14
14
  end
15
15
 
16
16
  it "reloads the requested user partial" do
@@ -10,7 +10,7 @@ require 'spec_helper'
10
10
  describe "admin/users/update" do
11
11
  before do
12
12
  login_admin
13
- assign(:user, @user = FactoryGirl.build_stubbed(:user))
13
+ assign(:user, @user = build_stubbed(:user))
14
14
  end
15
15
 
16
16
  describe "no errors:" do
@@ -17,11 +17,11 @@ describe "/application/_auto_complete" do
17
17
  %i[account campaign contact lead opportunity].each do |model|
18
18
  it "should render autocomplete list if #{model} matches found" do
19
19
  @auto_complete = if model == :lead
20
- FactoryGirl.build_stubbed(:lead, first_name: "Billy", last_name: "Bones", company: "Hello, World!")
20
+ build_stubbed(:lead, first_name: "Billy", last_name: "Bones", company: "Hello, World!")
21
21
  elsif model == :contact
22
- FactoryGirl.build_stubbed(:contact, first_name: "Billy", last_name: "Bones")
22
+ build_stubbed(:contact, first_name: "Billy", last_name: "Bones")
23
23
  else
24
- FactoryGirl.build_stubbed(model, name: "Hello, World!")
24
+ build_stubbed(model, name: "Hello, World!")
25
25
  end
26
26
  assign(:auto_complete, [@auto_complete])
27
27
 
@@ -12,7 +12,7 @@ describe "/campaigns/_edit" do
12
12
 
13
13
  before do
14
14
  login
15
- assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign))
15
+ assign(:campaign, @campaign = build_stubbed(:campaign))
16
16
  assign(:users, [current_user])
17
17
  end
18
18
 
@@ -14,7 +14,7 @@ describe "/campaigns/create" do
14
14
 
15
15
  describe "create success" do
16
16
  before do
17
- assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign))
17
+ assign(:campaign, @campaign = build_stubbed(:campaign))
18
18
  assign(:campaigns, [@campaign].paginate)
19
19
  assign(:campaign_status_total, Hash.new(1))
20
20
  render
@@ -38,8 +38,8 @@ describe "/campaigns/create" do
38
38
 
39
39
  describe "create failure" do
40
40
  it "should re-render [create] template in :create_campaign div" do
41
- assign(:campaign, FactoryGirl.build(:campaign, name: nil)) # make it invalid
42
- assign(:users, [FactoryGirl.build_stubbed(:user)])
41
+ assign(:campaign, build(:campaign, name: nil)) # make it invalid
42
+ assign(:users, [build_stubbed(:user)])
43
43
 
44
44
  render
45
45
 
@@ -10,7 +10,7 @@ require 'spec_helper'
10
10
  describe "/campaigns/destroy" do
11
11
  before do
12
12
  login
13
- assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign, user: current_user))
13
+ assign(:campaign, @campaign = build_stubbed(:campaign, user: current_user))
14
14
  assign(:campaigns, [@campaign].paginate)
15
15
  assign(:campaign_status_total, Hash.new(1))
16
16
  render
@@ -12,7 +12,7 @@ describe "/campaigns/edit" do
12
12
 
13
13
  before do
14
14
  login
15
- assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign, user: current_user))
15
+ assign(:campaign, @campaign = build_stubbed(:campaign, user: current_user))
16
16
  assign(:users, [current_user])
17
17
  end
18
18
 
@@ -33,7 +33,7 @@ describe "/campaigns/edit" do
33
33
 
34
34
  it "edit: should hide previously open [Edit Campaign] for and replace it with campaign partial" do
35
35
  params[:cancel] = nil
36
- assign(:previous, previous = FactoryGirl.build_stubbed(:campaign, user: current_user))
36
+ assign(:previous, previous = build_stubbed(:campaign, user: current_user))
37
37
 
38
38
  render
39
39
  expect(rendered).to include("$('#campaign_#{previous.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{previous.id}\\'")
@@ -19,7 +19,7 @@ describe "/campaigns/index" do
19
19
  end
20
20
 
21
21
  it "should render list of accounts if list of campaigns is not empty" do
22
- assign(:campaigns, [FactoryGirl.build_stubbed(:campaign)].paginate)
22
+ assign(:campaigns, [build_stubbed(:campaign)].paginate)
23
23
 
24
24
  render
25
25
  expect(view).to render_template(partial: "_campaign")
@@ -15,7 +15,7 @@ describe "/campaigns/index" do
15
15
  end
16
16
 
17
17
  it "should render [campaign] template with @campaigns collection if there are campaigns" do
18
- assign(:campaigns, [FactoryGirl.build_stubbed(:campaign, id: 42)].paginate)
18
+ assign(:campaigns, [build_stubbed(:campaign, id: 42)].paginate)
19
19
 
20
20
  render template: 'campaigns/index', formats: [:js]
21
21
 
@@ -12,13 +12,13 @@ describe "/campaigns/show" do
12
12
 
13
13
  before do
14
14
  login
15
- @campaign = FactoryGirl.build_stubbed(:campaign, id: 42,
16
- leads: [FactoryGirl.build_stubbed(:lead)],
17
- opportunities: [FactoryGirl.build_stubbed(:opportunity)])
15
+ @campaign = build_stubbed(:campaign, id: 42,
16
+ leads: [build_stubbed(:lead)],
17
+ opportunities: [build_stubbed(:opportunity)])
18
18
  assign(:campaign, @campaign)
19
19
  assign(:users, [current_user])
20
20
  assign(:comment, Comment.new)
21
- assign(:timeline, [FactoryGirl.build_stubbed(:comment, commentable: @campaign)])
21
+ assign(:timeline, [build_stubbed(:comment, commentable: @campaign)])
22
22
  allow(view).to receive(:params) { { id: 123 } }
23
23
 
24
24
  # controller#controller_name and controller#action_name are not set in view specs
@@ -10,7 +10,7 @@ require 'spec_helper'
10
10
  describe "/campaigns/update" do
11
11
  before do
12
12
  login
13
- assign(:campaign, @campaign = FactoryGirl.build_stubbed(:campaign, user: current_user))
13
+ assign(:campaign, @campaign = build_stubbed(:campaign, user: current_user))
14
14
  assign(:users, [current_user])
15
15
  assign(:status, Setting.campaign_status)
16
16
  assign(:campaign_status_total, Hash.new(1))
@@ -12,12 +12,12 @@ describe "/contacts/_edit" do
12
12
 
13
13
  before do
14
14
  login
15
- assign(:account, @account = FactoryGirl.create(:account))
15
+ assign(:account, @account = create(:account))
16
16
  assign(:accounts, [@account])
17
17
  end
18
18
 
19
19
  it "should render [edit contact] form" do
20
- assign(:contact, @contact = FactoryGirl.create(:contact))
20
+ assign(:contact, @contact = create(:contact))
21
21
  assign(:users, [current_user])
22
22
 
23
23
  render
@@ -33,7 +33,7 @@ describe "/contacts/_edit" do
33
33
 
34
34
  it "should pick default assignee (Myself)" do
35
35
  assign(:users, [current_user])
36
- assign(:contact, FactoryGirl.create(:contact, assignee: nil))
36
+ assign(:contact, create(:contact, assignee: nil))
37
37
 
38
38
  render
39
39
  expect(rendered).to have_tag("select[id=contact_assigned_to]") do |options|
@@ -42,9 +42,9 @@ describe "/contacts/_edit" do
42
42
  end
43
43
 
44
44
  it "should show correct assignee" do
45
- @user = FactoryGirl.create(:user)
45
+ @user = create(:user)
46
46
  assign(:users, [current_user, @user])
47
- assign(:contact, FactoryGirl.create(:contact, assignee: @user))
47
+ assign(:contact, create(:contact, assignee: @user))
48
48
 
49
49
  render
50
50
  expect(rendered).to have_tag("select[id=contact_assigned_to]") do |_options|
@@ -55,7 +55,7 @@ describe "/contacts/_edit" do
55
55
 
56
56
  it "should render background info field if settings require so" do
57
57
  assign(:users, [current_user])
58
- assign(:contact, FactoryGirl.create(:contact))
58
+ assign(:contact, create(:contact))
59
59
  Setting.background_info = [:contact]
60
60
 
61
61
  render
@@ -64,7 +64,7 @@ describe "/contacts/_edit" do
64
64
 
65
65
  it "should not render background info field if settings do not require so" do
66
66
  assign(:users, [current_user])
67
- assign(:contact, FactoryGirl.create(:contact))
67
+ assign(:contact, create(:contact))
68
68
  Setting.background_info = []
69
69
 
70
70
  render
@@ -12,7 +12,7 @@ describe "/contacts/_new" do
12
12
 
13
13
  before do
14
14
  login
15
- @account = FactoryGirl.build_stubbed(:account)
15
+ @account = build_stubbed(:account)
16
16
  assign(:contact, Contact.new)
17
17
  assign(:users, [current_user])
18
18
  assign(:account, @account)
@@ -16,7 +16,7 @@ describe "/contacts/create" do
16
16
 
17
17
  describe "create success" do
18
18
  before do
19
- assign(:contact, @contact = FactoryGirl.build_stubbed(:contact))
19
+ assign(:contact, @contact = build_stubbed(:contact))
20
20
  assign(:contacts, [@contact].paginate)
21
21
  end
22
22
 
@@ -51,9 +51,9 @@ describe "/contacts/create" do
51
51
 
52
52
  describe "create failure" do
53
53
  it "create (failure): should re-render [create] template in :create_contact div" do
54
- assign(:contact, FactoryGirl.build(:contact, first_name: nil)) # make it invalid
55
- @account = FactoryGirl.build_stubbed(:account)
56
- assign(:users, [FactoryGirl.build_stubbed(:user)])
54
+ assign(:contact, build(:contact, first_name: nil)) # make it invalid
55
+ @account = build_stubbed(:account)
56
+ assign(:users, [build_stubbed(:user)])
57
57
  assign(:account, @account)
58
58
  assign(:accounts, [@account])
59
59
 
@@ -12,7 +12,7 @@ describe "/contacts/destroy" do
12
12
 
13
13
  before do
14
14
  login
15
- assign(:contact, @contact = FactoryGirl.build_stubbed(:contact))
15
+ assign(:contact, @contact = build_stubbed(:contact))
16
16
  assign(:contacts, [@contact].paginate)
17
17
  end
18
18
 
@@ -12,9 +12,9 @@ describe "/contacts/edit" do
12
12
 
13
13
  before do
14
14
  login
15
- assign(:contact, @contact = FactoryGirl.build_stubbed(:contact, user: current_user))
15
+ assign(:contact, @contact = build_stubbed(:contact, user: current_user))
16
16
  assign(:users, [current_user])
17
- assign(:account, @account = FactoryGirl.build_stubbed(:account))
17
+ assign(:account, @account = build_stubbed(:account))
18
18
  assign(:accounts, [@account])
19
19
  end
20
20
 
@@ -35,7 +35,7 @@ describe "/contacts/edit" do
35
35
 
36
36
  it "edit: should hide previously open [Edit Contact] for and replace it with contact partial" do
37
37
  params[:cancel] = nil
38
- assign(:previous, previous = FactoryGirl.build_stubbed(:contact, user: current_user))
38
+ assign(:previous, previous = build_stubbed(:contact, user: current_user))
39
39
 
40
40
  render
41
41
  expect(rendered).to include("$('#contact_#{previous.id}').replaceWith")
@@ -19,7 +19,7 @@ describe "/contacts/index" do
19
19
  end
20
20
 
21
21
  it "should render a list of contacts if it's not empty" do
22
- assign(:contacts, [FactoryGirl.build_stubbed(:contact)].paginate)
22
+ assign(:contacts, [build_stubbed(:contact)].paginate)
23
23
 
24
24
  render
25
25
  expect(view).to render_template(partial: "_contact")
@@ -15,7 +15,7 @@ describe "/contacts/index" do
15
15
  end
16
16
 
17
17
  it "should render [contact] template with @contacts collection if there are contacts" do
18
- assign(:contacts, [FactoryGirl.build_stubbed(:contact, id: 42)].paginate)
18
+ assign(:contacts, [build_stubbed(:contact, id: 42)].paginate)
19
19
 
20
20
  render template: 'contacts/index', formats: [:js]
21
21
 
@@ -12,7 +12,7 @@ describe "/contacts/new" do
12
12
 
13
13
  before do
14
14
  login
15
- @account = FactoryGirl.build_stubbed(:account)
15
+ @account = build_stubbed(:account)
16
16
  assign(:contact, Contact.new(user: current_user))
17
17
  assign(:users, [current_user])
18
18
  assign(:account, @account)