fat_free_crm 0.17.2 → 0.19.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 (363) hide show
  1. checksums.yaml +5 -5
  2. data/.rubocop.yml +1 -1
  3. data/.rubocop_todo.yml +71 -148
  4. data/.travis.yml +35 -14
  5. data/CHANGELOG.md +88 -5
  6. data/CONTRIBUTORS.md +96 -53
  7. data/Dockerfile +45 -14
  8. data/Gemfile +23 -13
  9. data/Gemfile.lock +249 -241
  10. data/Procfile +1 -1
  11. data/README.md +9 -6
  12. data/Rakefile +1 -1
  13. data/app/assets/javascripts/crm.js.coffee +3 -3
  14. data/app/assets/javascripts/crm_select2.js.coffee +15 -14
  15. data/app/assets/stylesheets/common.scss +1 -1
  16. data/app/controllers/admin/application_controller.rb +1 -1
  17. data/app/controllers/admin/field_groups_controller.rb +9 -4
  18. data/app/controllers/admin/fields_controller.rb +4 -4
  19. data/app/controllers/admin/groups_controller.rb +1 -1
  20. data/app/controllers/admin/tags_controller.rb +2 -4
  21. data/app/controllers/admin/users_controller.rb +5 -8
  22. data/app/controllers/application_controller.rb +22 -45
  23. data/app/controllers/comments_controller.rb +16 -11
  24. data/{config/initializers/authlogic.rb → app/controllers/confirmations_controller.rb} +4 -2
  25. data/app/controllers/emails_controller.rb +0 -2
  26. data/app/controllers/entities/accounts_controller.rb +1 -3
  27. data/app/controllers/entities/campaigns_controller.rb +8 -5
  28. data/app/controllers/entities/contacts_controller.rb +4 -24
  29. data/app/controllers/entities/leads_controller.rb +16 -12
  30. data/app/controllers/entities/opportunities_controller.rb +17 -16
  31. data/app/controllers/entities_controller.rb +31 -12
  32. data/app/controllers/home_controller.rb +2 -4
  33. data/app/controllers/lists_controller.rb +5 -1
  34. data/app/controllers/passwords_controller.rb +3 -59
  35. data/{spec/features/support/maintain_sessions.rb → app/controllers/registrations_controller.rb} +12 -5
  36. data/{lib/development_tasks/gem.rake → app/controllers/sessions_controller.rb} +6 -6
  37. data/app/controllers/tasks_controller.rb +22 -17
  38. data/app/controllers/users_controller.rb +8 -29
  39. data/app/helpers/accounts_helper.rb +1 -1
  40. data/app/helpers/admin/users_helper.rb +1 -1
  41. data/app/helpers/application_helper.rb +28 -33
  42. data/app/helpers/campaigns_helper.rb +1 -1
  43. data/app/helpers/contacts_helper.rb +1 -3
  44. data/app/helpers/leads_helper.rb +1 -1
  45. data/app/helpers/opportunities_helper.rb +48 -3
  46. data/app/helpers/tags_helper.rb +1 -1
  47. data/app/helpers/tasks_helper.rb +1 -1
  48. data/app/helpers/users_helper.rb +1 -3
  49. data/{config/initializers/paper_trail.rb → app/mailers/devise_mailer.rb} +5 -1
  50. data/app/mailers/user_mailer.rb +0 -9
  51. data/app/models/entities/account.rb +10 -10
  52. data/app/models/entities/campaign.rb +4 -6
  53. data/app/models/entities/contact.rb +24 -12
  54. data/app/models/entities/lead.rb +7 -14
  55. data/app/models/entities/opportunity.rb +10 -11
  56. data/app/models/fields/custom_field.rb +1 -0
  57. data/app/models/fields/custom_field_date_pair.rb +2 -0
  58. data/app/models/fields/field.rb +1 -3
  59. data/app/models/list.rb +1 -1
  60. data/app/models/observers/entity_observer.rb +3 -7
  61. data/app/models/observers/lead_observer.rb +2 -4
  62. data/app/models/observers/opportunity_observer.rb +5 -7
  63. data/app/models/observers/task_observer.rb +1 -1
  64. data/app/models/polymorphic/email.rb +2 -2
  65. data/app/models/polymorphic/task.rb +13 -9
  66. data/app/models/polymorphic/version.rb +3 -2
  67. data/app/models/setting.rb +2 -0
  68. data/app/models/users/ability.rb +3 -4
  69. data/app/models/users/permission.rb +3 -3
  70. data/app/models/users/preference.rb +2 -1
  71. data/app/models/users/user.rb +67 -42
  72. data/app/views/accounts/_top_section.html.haml +1 -1
  73. data/app/views/accounts/edit.js.haml +1 -1
  74. data/app/views/accounts/update.js.haml +2 -2
  75. data/app/views/admin/users/_user.html.haml +4 -4
  76. data/app/views/campaigns/_metrics.html.haml +3 -3
  77. data/app/views/contacts/_index_brief.html.haml +1 -1
  78. data/app/views/contacts/_index_full.html.haml +1 -1
  79. data/app/views/contacts/_index_long.html.haml +1 -1
  80. data/app/views/devise/confirmations/new.html.haml +9 -0
  81. data/app/views/devise/mailer/confirmation_instructions.html.haml +4 -0
  82. data/app/views/devise/mailer/password_change.html.haml +3 -0
  83. data/app/views/devise/mailer/reset_password_instructions.html.haml +6 -0
  84. data/app/views/devise/passwords/edit.html.haml +18 -0
  85. data/app/views/devise/passwords/new.html.haml +10 -0
  86. data/app/views/devise/registrations/new.html.haml +21 -0
  87. data/app/views/devise/sessions/new.html.haml +32 -0
  88. data/app/views/home/_opportunity.html.haml +4 -19
  89. data/app/views/layouts/_about.html.haml +5 -5
  90. data/app/views/layouts/_header.html.haml +3 -3
  91. data/app/views/layouts/admin/_header.html.haml +1 -1
  92. data/app/views/opportunities/_index_long.html.haml +1 -24
  93. data/app/views/opportunities/_sidebar_show.html.haml +3 -3
  94. data/app/views/opportunities/_top_section.html.haml +1 -1
  95. data/app/views/shared/_address.html.haml +5 -5
  96. data/app/views/shared/_paginate_with_per_page.html.haml +1 -0
  97. data/app/views/users/_avatar.html.haml +1 -1
  98. data/bin/bundle +1 -1
  99. data/bin/rails +1 -1
  100. data/bin/setup +38 -0
  101. data/bin/update +33 -0
  102. data/bin/yarn +13 -0
  103. data/config/application.rb +8 -6
  104. data/config/boot.rb +1 -1
  105. data/config/brakeman.ignore +2 -2
  106. data/config/database.postgres.docker.yml +5 -5
  107. data/config/environment.rb +1 -1
  108. data/config/environments/development.rb +1 -0
  109. data/config/environments/test.rb +7 -0
  110. data/config/initializers/action_mailer.rb +1 -3
  111. data/config/initializers/application_controller_renderer.rb +9 -0
  112. data/config/initializers/assets.rb +6 -11
  113. data/config/initializers/backtrace_silencers.rb +0 -6
  114. data/config/initializers/content_security_policy.rb +26 -0
  115. data/config/initializers/cookies_serializer.rb +3 -6
  116. data/config/initializers/devise.rb +289 -0
  117. data/config/initializers/filter_parameter_logging.rb +0 -5
  118. data/config/initializers/gravatar.rb +0 -1
  119. data/config/initializers/inflections.rb +0 -6
  120. data/config/initializers/mime_types.rb +1 -9
  121. data/config/initializers/new_framework_defaults_5_2.rb +40 -0
  122. data/config/initializers/relative_url_root.rb +1 -3
  123. data/config/initializers/session_store.rb +1 -3
  124. data/config/initializers/wrap_parameters.rb +4 -9
  125. data/config/locales/fat_free_crm.en-GB.yml +5 -5
  126. data/config/locales/fat_free_crm.en-US.yml +5 -5
  127. data/config/locales/fat_free_crm.fr.yml +1 -1
  128. data/config/locales/fat_free_crm.ru.yml +1 -0
  129. data/config/routes.rb +20 -9
  130. data/db/demo/users.yml +62 -81
  131. data/db/migrate/20100928030620_remove_uuid.rb +1 -2
  132. data/db/migrate/20120316045804_activities_to_versions.rb +1 -0
  133. data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb +1 -0
  134. data/db/migrate/20180107082701_authlogic_to_devise.rb +58 -0
  135. data/db/schema.rb +48 -46
  136. data/docker-compose.yml +10 -0
  137. data/fat_free_crm.gemspec +12 -14
  138. data/lib/development_tasks/license.rake +2 -2
  139. data/lib/fat_free_crm/callback.rb +2 -2
  140. data/lib/fat_free_crm/comment_extensions.rb +2 -4
  141. data/lib/fat_free_crm/core_ext/string.rb +1 -1
  142. data/lib/fat_free_crm/engine.rb +2 -2
  143. data/lib/fat_free_crm/errors.rb +1 -1
  144. data/lib/fat_free_crm/export_csv.rb +1 -0
  145. data/lib/fat_free_crm/exportable.rb +1 -1
  146. data/lib/fat_free_crm/fields.rb +2 -2
  147. data/lib/fat_free_crm/gem_dependencies.rb +1 -1
  148. data/lib/fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper.rb +1 -3
  149. data/lib/fat_free_crm/i18n.rb +2 -2
  150. data/lib/fat_free_crm/mail_processor/base.rb +4 -10
  151. data/lib/fat_free_crm/mail_processor/dropbox.rb +5 -15
  152. data/lib/fat_free_crm/permissions.rb +7 -18
  153. data/lib/fat_free_crm/sortable.rb +1 -1
  154. data/lib/fat_free_crm/tabs.rb +2 -2
  155. data/lib/fat_free_crm/version.rb +2 -2
  156. data/lib/gravatar_image_tag.rb +7 -8
  157. data/lib/missing_translation_detector.rb +1 -0
  158. data/lib/tasks/ffcrm/missing_translations.rake +1 -0
  159. data/lib/tasks/ffcrm/setup.rake +13 -4
  160. data/lib/tasks/ffcrm/update_data.rake +2 -2
  161. data/script/rails +2 -2
  162. data/spec/controllers/admin/users_controller_spec.rb +25 -81
  163. data/spec/controllers/comments_controller_spec.rb +19 -19
  164. data/spec/controllers/emails_controller_spec.rb +2 -2
  165. data/spec/controllers/entities/accounts_controller_spec.rb +56 -56
  166. data/spec/controllers/entities/campaigns_controller_spec.rb +66 -66
  167. data/spec/controllers/entities/contacts_controller_spec.rb +69 -68
  168. data/spec/controllers/entities/leads_controller_spec.rb +126 -126
  169. data/spec/controllers/entities/opportunities_controller_spec.rb +101 -101
  170. data/spec/controllers/entities_controller_spec.rb +5 -0
  171. data/spec/controllers/home_controller_spec.rb +30 -30
  172. data/spec/controllers/tasks_controller_spec.rb +42 -40
  173. data/spec/controllers/users_controller_spec.rb +43 -113
  174. data/spec/factories/account_factories.rb +13 -13
  175. data/spec/factories/campaign_factories.rb +8 -8
  176. data/spec/factories/contact_factories.rb +18 -18
  177. data/spec/factories/field_factories.rb +11 -10
  178. data/spec/factories/lead_factories.rb +13 -13
  179. data/spec/factories/list_factories.rb +3 -3
  180. data/spec/factories/opportunity_factories.rb +9 -9
  181. data/spec/factories/sequences.rb +1 -1
  182. data/spec/factories/setting_factories.rb +5 -5
  183. data/spec/factories/shared_factories.rb +25 -23
  184. data/spec/factories/subscription_factories.rb +1 -1
  185. data/spec/factories/tag_factories.rb +1 -1
  186. data/spec/factories/task_factories.rb +11 -11
  187. data/spec/factories/user_factories.rb +27 -30
  188. data/spec/features/accounts_spec.rb +17 -4
  189. data/spec/features/admin/groups_spec.rb +2 -2
  190. data/spec/features/admin/users_spec.rb +4 -2
  191. data/spec/features/campaigns_spec.rb +5 -5
  192. data/spec/features/contacts_spec.rb +11 -5
  193. data/spec/features/dashboard_spec.rb +8 -8
  194. data/spec/features/devise/sign_in_spec.rb +58 -0
  195. data/spec/features/devise/sign_up_spec.rb +36 -0
  196. data/spec/features/leads_spec.rb +5 -5
  197. data/spec/features/opportunities_overview_spec.rb +16 -16
  198. data/spec/features/opportunities_spec.rb +35 -9
  199. data/spec/features/support/autocomlete_helper.rb +17 -0
  200. data/spec/features/support/browser.rb +5 -9
  201. data/spec/features/tasks_spec.rb +5 -5
  202. data/spec/helpers/admin/field_groups_helper_spec.rb +1 -1
  203. data/spec/helpers/application_helper_spec.rb +1 -1
  204. data/spec/helpers/tasks_helper_spec.rb +1 -1
  205. data/spec/helpers/users_helper_spec.rb +7 -7
  206. data/spec/lib/comment_extensions_spec.rb +11 -5
  207. data/spec/lib/errors_spec.rb +2 -2
  208. data/spec/lib/mail_processor/base_spec.rb +3 -3
  209. data/spec/lib/mail_processor/comment_replies_spec.rb +3 -3
  210. data/spec/lib/mail_processor/dropbox_spec.rb +17 -17
  211. data/spec/lib/mail_processor/sample_emails/dropbox.rb +8 -8
  212. data/spec/lib/permissions_spec.rb +15 -28
  213. data/spec/mailers/devise_mailer_spec.rb +35 -0
  214. data/spec/mailers/user_mailer_spec.rb +6 -32
  215. data/spec/models/entities/account_spec.rb +58 -32
  216. data/spec/models/entities/campaign_spec.rb +18 -25
  217. data/spec/models/entities/contact_spec.rb +113 -21
  218. data/spec/models/entities/lead_spec.rb +9 -11
  219. data/spec/models/entities/opportunity_spec.rb +45 -45
  220. data/spec/models/fields/custom_field_date_pair_spec.rb +4 -2
  221. data/spec/models/fields/custom_field_spec.rb +21 -19
  222. data/spec/models/list_spec.rb +2 -2
  223. data/spec/models/observers/entity_observer_spec.rb +7 -7
  224. data/spec/models/polymorphic/address_spec.rb +1 -1
  225. data/spec/models/polymorphic/avatar_spec.rb +5 -5
  226. data/spec/models/polymorphic/comment_spec.rb +5 -5
  227. data/spec/models/polymorphic/task_spec.rb +65 -58
  228. data/spec/models/polymorphic/version_spec.rb +31 -31
  229. data/spec/models/setting_spec.rb +2 -2
  230. data/spec/models/users/preference_spec.rb +6 -6
  231. data/spec/models/users/user_spec.rb +46 -50
  232. data/spec/routing/users_routing_spec.rb +30 -8
  233. data/spec/shared/controllers.rb +3 -9
  234. data/spec/shared/models.rb +22 -22
  235. data/spec/spec_helper.rb +12 -4
  236. data/spec/support/assert_select.rb +1 -0
  237. data/spec/support/devise_helpers.rb +28 -0
  238. data/spec/{features/support/helpers.rb → support/feature_helpers.rb} +11 -11
  239. data/spec/support/macros.rb +7 -4
  240. data/spec/views/accounts/_edit.haml_spec.rb +1 -1
  241. data/spec/views/accounts/create.js.haml_spec.rb +2 -2
  242. data/spec/views/accounts/destroy.js.haml_spec.rb +1 -1
  243. data/spec/views/accounts/edit.js.haml_spec.rb +2 -2
  244. data/spec/views/accounts/index.haml_spec.rb +2 -2
  245. data/spec/views/accounts/index.js.haml_spec.rb +1 -1
  246. data/spec/views/accounts/show.haml_spec.rb +4 -4
  247. data/spec/views/accounts/update.js.haml_spec.rb +1 -1
  248. data/spec/views/admin/field_groups/create.js.haml_spec.rb +1 -1
  249. data/spec/views/admin/field_groups/destroy.js.haml_spec.rb +1 -1
  250. data/spec/views/admin/field_groups/edit.js.haml_spec.rb +1 -1
  251. data/spec/views/admin/field_groups/new.js.haml_spec.rb +1 -1
  252. data/spec/views/admin/field_groups/update.js.haml_spec.rb +1 -1
  253. data/spec/views/admin/users/create.js.haml_spec.rb +2 -2
  254. data/spec/views/admin/users/destroy.js.haml_spec.rb +2 -2
  255. data/spec/views/admin/users/edit.js.haml_spec.rb +2 -2
  256. data/spec/views/admin/users/index.haml_spec.rb +1 -1
  257. data/spec/views/admin/users/index.js.haml_spec.rb +2 -2
  258. data/spec/views/admin/users/reactivate.js.haml_spec.rb +1 -1
  259. data/spec/views/admin/users/suspend.js.haml_spec.rb +1 -1
  260. data/spec/views/admin/users/update.js.haml_spec.rb +1 -1
  261. data/spec/views/application/auto_complete.haml_spec.rb +3 -3
  262. data/spec/views/campaigns/_edit.haml_spec.rb +1 -1
  263. data/spec/views/campaigns/create.js.haml_spec.rb +3 -3
  264. data/spec/views/campaigns/destroy.js.haml_spec.rb +1 -1
  265. data/spec/views/campaigns/edit.js.haml_spec.rb +2 -2
  266. data/spec/views/campaigns/index.haml_spec.rb +1 -1
  267. data/spec/views/campaigns/index.js.haml_spec.rb +1 -1
  268. data/spec/views/campaigns/show.haml_spec.rb +4 -4
  269. data/spec/views/campaigns/update.js.haml_spec.rb +1 -1
  270. data/spec/views/contacts/_edit.haml_spec.rb +7 -7
  271. data/spec/views/contacts/_new.haml_spec.rb +1 -1
  272. data/spec/views/contacts/create.js.haml_spec.rb +4 -4
  273. data/spec/views/contacts/destroy.js.haml_spec.rb +1 -1
  274. data/spec/views/contacts/edit.js.haml_spec.rb +3 -3
  275. data/spec/views/contacts/index.haml_spec.rb +1 -1
  276. data/spec/views/contacts/index.js.html_spec.rb +1 -1
  277. data/spec/views/contacts/new.js.haml_spec.rb +1 -1
  278. data/spec/views/contacts/show.haml_spec.rb +3 -3
  279. data/spec/views/contacts/update.js.haml_spec.rb +3 -3
  280. data/spec/views/home/index.haml_spec.rb +1 -1
  281. data/spec/views/home/index.js.haml_spec.rb +1 -1
  282. data/spec/views/home/options.js.haml_spec.rb +2 -2
  283. data/spec/views/leads/_convert.haml_spec.rb +3 -3
  284. data/spec/views/leads/_edit.haml_spec.rb +2 -2
  285. data/spec/views/leads/_new.haml_spec.rb +2 -2
  286. data/spec/views/leads/_sidebar_show.haml_spec.rb +5 -5
  287. data/spec/views/leads/convert.js.haml_spec.rb +4 -4
  288. data/spec/views/leads/create.js.haml_spec.rb +5 -5
  289. data/spec/views/leads/destroy.js.haml_spec.rb +2 -2
  290. data/spec/views/leads/edit.js.haml_spec.rb +4 -4
  291. data/spec/views/leads/index.haml_spec.rb +1 -1
  292. data/spec/views/leads/index.js.haml_spec.rb +1 -1
  293. data/spec/views/leads/new.js.haml_spec.rb +1 -1
  294. data/spec/views/leads/promote.js.haml_spec.rb +7 -7
  295. data/spec/views/leads/reject.js.haml_spec.rb +2 -2
  296. data/spec/views/leads/show.haml_spec.rb +2 -2
  297. data/spec/views/leads/update.js.haml_spec.rb +4 -4
  298. data/spec/views/opportunities/_edit.haml_spec.rb +7 -7
  299. data/spec/views/opportunities/_new.haml_spec.rb +2 -2
  300. data/spec/views/opportunities/create.js.haml_spec.rb +6 -6
  301. data/spec/views/opportunities/destroy.js.haml_spec.rb +3 -3
  302. data/spec/views/opportunities/edit.js.haml_spec.rb +3 -3
  303. data/spec/views/opportunities/index.haml_spec.rb +1 -1
  304. data/spec/views/opportunities/index.js.haml_spec.rb +1 -1
  305. data/spec/views/opportunities/new.js.haml_spec.rb +1 -1
  306. data/spec/views/opportunities/show.haml_spec.rb +3 -3
  307. data/spec/views/opportunities/update.js.haml_spec.rb +5 -5
  308. data/spec/views/tasks/_edit.haml_spec.rb +1 -1
  309. data/spec/views/tasks/complete.js.haml_spec.rb +4 -4
  310. data/spec/views/tasks/create.js.haml_spec.rb +6 -6
  311. data/spec/views/tasks/destroy.js.haml_spec.rb +2 -2
  312. data/spec/views/tasks/index.haml_spec.rb +4 -4
  313. data/spec/views/tasks/new.js.haml_spec.rb +1 -1
  314. data/spec/views/tasks/uncomplete.js.haml_spec.rb +2 -2
  315. data/spec/views/tasks/update.js.haml_spec.rb +18 -18
  316. data/spec/views/users/upload_avatar.js.haml_spec.rb +2 -2
  317. data/vendor/gems/ransack_ui-1.3.4/.gitignore +17 -0
  318. data/vendor/gems/ransack_ui-1.3.4/Gemfile +7 -0
  319. data/vendor/gems/ransack_ui-1.3.4/LICENSE.txt +22 -0
  320. data/vendor/gems/ransack_ui-1.3.4/README.md +57 -0
  321. data/vendor/gems/ransack_ui-1.3.4/Rakefile +1 -0
  322. data/vendor/gems/ransack_ui-1.3.4/app/assets/images/ransack_ui/calendar.png +0 -0
  323. data/vendor/gems/ransack_ui-1.3.4/app/assets/images/ransack_ui/delete.png +0 -0
  324. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack/predicates.js.coffee +41 -0
  325. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack_ui_bootstrap/button_group_select.js.coffee +26 -0
  326. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack_ui_bootstrap/index.js.coffee +2 -0
  327. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack_ui_jquery/index.js +2 -0
  328. data/vendor/gems/ransack_ui-1.3.4/app/assets/javascripts/ransack_ui_jquery/search_form.js.coffee.erb +499 -0
  329. data/vendor/gems/ransack_ui-1.3.4/app/assets/stylesheets/ransack_ui_bootstrap/index.css +3 -0
  330. data/vendor/gems/ransack_ui-1.3.4/app/assets/stylesheets/ransack_ui_bootstrap/search.css.scss +41 -0
  331. data/vendor/gems/ransack_ui-1.3.4/app/views/ransack_ui/_condition_fields.html.erb +15 -0
  332. data/vendor/gems/ransack_ui-1.3.4/app/views/ransack_ui/_grouping_fields.html.erb +16 -0
  333. data/vendor/gems/ransack_ui-1.3.4/app/views/ransack_ui/_search.html.erb +29 -0
  334. data/vendor/gems/ransack_ui-1.3.4/app/views/ransack_ui/_sort_fields.html.erb +4 -0
  335. data/vendor/gems/ransack_ui-1.3.4/config/locales/en.yml +24 -0
  336. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui.rb +9 -0
  337. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/adapters/active_record.rb +6 -0
  338. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/adapters/active_record/base.rb +46 -0
  339. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/controller_helpers.rb +18 -0
  340. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/rails/engine.rb +21 -0
  341. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb +47 -0
  342. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/configuration.rb +15 -0
  343. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/context.rb +9 -0
  344. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/helpers/form_builder.rb +262 -0
  345. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/nodes/attribute.rb +13 -0
  346. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/nodes/condition.rb +13 -0
  347. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/ransack_overrides/nodes/grouping.rb +20 -0
  348. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/version.rb +3 -0
  349. data/vendor/gems/ransack_ui-1.3.4/lib/ransack_ui/view_helpers.rb +30 -0
  350. data/vendor/gems/ransack_ui-1.3.4/ransack_ui.gemspec +23 -0
  351. metadata +83 -70
  352. data/app/controllers/authentications_controller.rb +0 -53
  353. data/app/models/users/authentication.rb +0 -56
  354. data/app/views/authentications/new.html.haml +0 -19
  355. data/app/views/passwords/edit.html.haml +0 -15
  356. data/app/views/passwords/new.html.haml +0 -10
  357. data/app/views/user_mailer/password_reset_instructions.html.haml +0 -6
  358. data/app/views/users/new.html.haml +0 -19
  359. data/spec/controllers/authentications_controller_spec.rb +0 -150
  360. data/spec/controllers/passwords_controller_spec.rb +0 -32
  361. data/spec/models/users/authentication_spec.rb +0 -19
  362. data/spec/support/auth_macros.rb +0 -49
  363. data/spec/views/authentications/new.haml_spec.rb +0 -31
@@ -19,7 +19,7 @@ describe "/leads/index" do
19
19
  end
20
20
 
21
21
  it "should render list of accounts if list of leads is not empty" do
22
- assign(:leads, [FactoryGirl.build_stubbed(:lead)].paginate(page: 1, per_page: 20))
22
+ assign(:leads, [build_stubbed(:lead)].paginate(page: 1, per_page: 20))
23
23
 
24
24
  render
25
25
  expect(view).to render_template(partial: "_lead")
@@ -15,7 +15,7 @@ describe "/leads/index" do
15
15
  end
16
16
 
17
17
  it "should render [lead] template with @leads collection if there are leads" do
18
- assign(:leads, [FactoryGirl.build_stubbed(:lead, id: 42)].paginate(page: 1, per_page: 20))
18
+ assign(:leads, [build_stubbed(:lead, id: 42)].paginate(page: 1, per_page: 20))
19
19
 
20
20
  render template: 'leads/index', formats: [:js]
21
21
 
@@ -12,7 +12,7 @@ describe "/leads/new" do
12
12
 
13
13
  before do
14
14
  login
15
- @campaign = FactoryGirl.build_stubbed(:campaign)
15
+ @campaign = build_stubbed(:campaign)
16
16
  assign(:lead, Lead.new(user: current_user))
17
17
  assign(:users, [current_user])
18
18
  assign(:campaign, @campaign)
@@ -11,16 +11,16 @@ describe "/leads/promote" do
11
11
  before do
12
12
  login
13
13
  assign(:users, [current_user])
14
- assign(:account, @account = FactoryGirl.build_stubbed(:account))
14
+ assign(:account, @account = build_stubbed(:account))
15
15
  assign(:accounts, [@account])
16
- assign(:contact, FactoryGirl.build_stubbed(:contact))
17
- assign(:opportunity, FactoryGirl.build_stubbed(:opportunity))
16
+ assign(:contact, build_stubbed(:contact))
17
+ assign(:opportunity, build_stubbed(:opportunity))
18
18
  assign(:lead_status_total, Hash.new(1))
19
19
  end
20
20
 
21
21
  describe "no errors :" do
22
22
  before do
23
- assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, status: "converted", user: current_user, assignee: current_user))
23
+ assign(:lead, @lead = build_stubbed(:lead, status: "converted", user: current_user, assignee: current_user))
24
24
  end
25
25
 
26
26
  describe "from lead landing page -" do
@@ -66,9 +66,9 @@ describe "/leads/promote" do
66
66
  describe "from related campaign page -" do
67
67
  before do
68
68
  controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
69
- assign(:campaign, FactoryGirl.build_stubbed(:campaign))
69
+ assign(:campaign, build_stubbed(:campaign))
70
70
  assign(:stage, Setting.unroll(:opportunity_stage))
71
- assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity))
71
+ assign(:opportunity, @opportunity = build_stubbed(:opportunity))
72
72
  end
73
73
 
74
74
  it "should replace [Convert Lead] with lead partial and highlight it" do
@@ -95,7 +95,7 @@ describe "/leads/promote" do
95
95
 
96
96
  describe "validation errors:" do
97
97
  before do
98
- assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, status: "new", user: current_user, assignee: current_user))
98
+ assign(:lead, @lead = build_stubbed(:lead, status: "new", user: current_user, assignee: current_user))
99
99
  end
100
100
 
101
101
  describe "from lead landing page -" do
@@ -10,7 +10,7 @@ require 'spec_helper'
10
10
  describe "/leads/reject" do
11
11
  before do
12
12
  login
13
- assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, status: "new"))
13
+ assign(:lead, @lead = build_stubbed(:lead, status: "new"))
14
14
  assign(:lead_status_total, Hash.new(1))
15
15
  end
16
16
 
@@ -37,7 +37,7 @@ describe "/leads/reject" do
37
37
  end
38
38
 
39
39
  it "should update campaign sidebar if called from campaign landing page" do
40
- assign(:campaign, campaign = FactoryGirl.build_stubbed(:campaign))
40
+ assign(:campaign, campaign = build_stubbed(:campaign))
41
41
  controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
42
42
  render
43
43
 
@@ -12,10 +12,10 @@ describe "/leads/show" do
12
12
 
13
13
  before do
14
14
  login
15
- assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, id: 42))
15
+ assign(:lead, @lead = build_stubbed(:lead, id: 42))
16
16
  assign(:users, [current_user])
17
17
  assign(:comment, Comment.new)
18
- assign(:timeline, [FactoryGirl.build_stubbed(:comment, commentable: @lead)])
18
+ assign(:timeline, [build_stubbed(:comment, commentable: @lead)])
19
19
 
20
20
  # controller#controller_name and controller#action_name are not set in view specs
21
21
  allow(view).to receive(:template_for_current_view).and_return(nil)
@@ -10,9 +10,9 @@ require 'spec_helper'
10
10
  describe "/leads/update" do
11
11
  before do
12
12
  login
13
- assign(:lead, @lead = FactoryGirl.build_stubbed(:lead, user: current_user, assignee: FactoryGirl.build_stubbed(:user)))
13
+ assign(:lead, @lead = build_stubbed(:lead, user: current_user, assignee: build_stubbed(:user)))
14
14
  assign(:users, [current_user])
15
- assign(:campaigns, [FactoryGirl.build_stubbed(:campaign)])
15
+ assign(:campaigns, [build_stubbed(:campaign)])
16
16
  assign(:lead_status_total, Hash.new(1))
17
17
  end
18
18
 
@@ -58,7 +58,7 @@ describe "/leads/update" do
58
58
 
59
59
  describe "on related asset page -" do
60
60
  before do
61
- assign(:campaign, FactoryGirl.build_stubbed(:campaign))
61
+ assign(:campaign, build_stubbed(:campaign))
62
62
  controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
63
63
  end
64
64
 
@@ -69,7 +69,7 @@ describe "/leads/update" do
69
69
  end
70
70
 
71
71
  it "should update campaign sidebar" do
72
- assign(:campaign, FactoryGirl.build_stubbed(:campaign))
72
+ assign(:campaign, build_stubbed(:campaign))
73
73
  render
74
74
 
75
75
  expect(rendered).to include("sidebar")
@@ -12,14 +12,14 @@ describe "/opportunities/_edit" do
12
12
 
13
13
  before do
14
14
  login
15
- assign(:account, @account = FactoryGirl.build_stubbed(:account))
15
+ assign(:account, @account = build_stubbed(:account))
16
16
  assign(:accounts, [@account])
17
17
  assign(:stage, Setting.unroll(:opportunity_stage))
18
18
  end
19
19
 
20
20
  it "should render [edit opportunity] form" do
21
21
  assign(:users, [current_user])
22
- assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity, campaign: @campaign = FactoryGirl.build_stubbed(:campaign)))
22
+ assign(:opportunity, @opportunity = build_stubbed(:opportunity, campaign: @campaign = build_stubbed(:campaign)))
23
23
  render
24
24
 
25
25
  expect(rendered).to have_tag("form[class=edit_opportunity]") do
@@ -30,7 +30,7 @@ describe "/opportunities/_edit" do
30
30
 
31
31
  it "should pick default assignee (Myself)" do
32
32
  assign(:users, [current_user])
33
- assign(:opportunity, FactoryGirl.build_stubbed(:opportunity, assignee: nil))
33
+ assign(:opportunity, build_stubbed(:opportunity, assignee: nil))
34
34
  render
35
35
 
36
36
  expect(rendered).to have_tag("select[id=opportunity_assigned_to]") do |options|
@@ -39,9 +39,9 @@ describe "/opportunities/_edit" do
39
39
  end
40
40
 
41
41
  it "should show correct assignee" do
42
- @user = FactoryGirl.create(:user)
42
+ @user = create(:user)
43
43
  assign(:users, [current_user, @user])
44
- assign(:opportunity, FactoryGirl.create(:opportunity, assignee: @user))
44
+ assign(:opportunity, create(:opportunity, assignee: @user))
45
45
  render
46
46
 
47
47
  expect(rendered).to have_tag("select[id=opportunity_assigned_to]") do |_options|
@@ -52,7 +52,7 @@ describe "/opportunities/_edit" do
52
52
 
53
53
  it "should render background info field if settings require so" do
54
54
  assign(:users, [current_user])
55
- assign(:opportunity, FactoryGirl.build_stubbed(:opportunity))
55
+ assign(:opportunity, build_stubbed(:opportunity))
56
56
  Setting.background_info = [:opportunity]
57
57
 
58
58
  render
@@ -61,7 +61,7 @@ describe "/opportunities/_edit" do
61
61
 
62
62
  it "should not render background info field if settings do not require so" do
63
63
  assign(:users, [current_user])
64
- assign(:opportunity, FactoryGirl.build_stubbed(:opportunity))
64
+ assign(:opportunity, build_stubbed(:opportunity))
65
65
  Setting.background_info = []
66
66
 
67
67
  render
@@ -12,8 +12,8 @@ describe "/opportunities/_new" do
12
12
 
13
13
  before do
14
14
  login
15
- assign(:opportunity, FactoryGirl.build(:opportunity))
16
- @account = FactoryGirl.build_stubbed(:account)
15
+ assign(:opportunity, build(:opportunity))
16
+ @account = build_stubbed(:account)
17
17
  assign(:account, @account)
18
18
  assign(:accounts, [@account])
19
19
  assign(:users, [current_user])
@@ -15,7 +15,7 @@ describe "/opportunities/create" do
15
15
 
16
16
  describe "create success" do
17
17
  before do
18
- assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity))
18
+ assign(:opportunity, @opportunity = build_stubbed(:opportunity))
19
19
  assign(:opportunities, [@opportunities].paginate)
20
20
  assign(:opportunity_stage_total, Hash.new(1))
21
21
  end
@@ -44,7 +44,7 @@ describe "/opportunities/create" do
44
44
  end
45
45
 
46
46
  it "should update related account sidebar when called from related account" do
47
- assign(:account, account = FactoryGirl.create(:account))
47
+ assign(:account, account = create(:account))
48
48
  controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/#{account.id}"
49
49
  render
50
50
 
@@ -53,7 +53,7 @@ describe "/opportunities/create" do
53
53
  end
54
54
 
55
55
  it "should update related campaign sidebar when called from related campaign" do
56
- assign(:campaign, campaign = FactoryGirl.create(:campaign))
56
+ assign(:campaign, campaign = create(:campaign))
57
57
  controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
58
58
  render
59
59
 
@@ -72,9 +72,9 @@ describe "/opportunities/create" do
72
72
 
73
73
  describe "create failure" do
74
74
  it "should re-render [create] template in :create_opportunity div" do
75
- assign(:opportunity, FactoryGirl.build(:opportunity, name: nil)) # make it invalid
76
- @account = FactoryGirl.build_stubbed(:account)
77
- assign(:users, [FactoryGirl.build_stubbed(:user)])
75
+ assign(:opportunity, build(:opportunity, name: nil)) # make it invalid
76
+ @account = build_stubbed(:account)
77
+ assign(:users, [build_stubbed(:user)])
78
78
  assign(:account, @account)
79
79
  assign(:accounts, [@account])
80
80
 
@@ -10,7 +10,7 @@ require 'spec_helper'
10
10
  describe "/opportunities/destroy" do
11
11
  before do
12
12
  login
13
- assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity))
13
+ assign(:opportunity, @opportunity = build_stubbed(:opportunity))
14
14
  assign(:stage, Setting.unroll(:opportunity_stage))
15
15
  assign(:opportunity_stage_total, Hash.new(1))
16
16
  end
@@ -39,7 +39,7 @@ describe "/opportunities/destroy" do
39
39
  end
40
40
 
41
41
  it "should update related account sidebar when called from related account" do
42
- assign(:account, account = FactoryGirl.build_stubbed(:account))
42
+ assign(:account, account = build_stubbed(:account))
43
43
  controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/#{account.id}"
44
44
  render
45
45
 
@@ -49,7 +49,7 @@ describe "/opportunities/destroy" do
49
49
  end
50
50
 
51
51
  it "should update related campaign sidebar when called from related campaign" do
52
- assign(:campaign, campaign = FactoryGirl.build_stubbed(:campaign))
52
+ assign(:campaign, campaign = build_stubbed(:campaign))
53
53
  controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
54
54
  render
55
55
 
@@ -13,9 +13,9 @@ describe "/opportunities/edit" do
13
13
  before do
14
14
  login
15
15
 
16
- assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity, user: current_user))
16
+ assign(:opportunity, @opportunity = build_stubbed(:opportunity, user: current_user))
17
17
  assign(:users, [current_user])
18
- assign(:account, @account = FactoryGirl.build_stubbed(:account))
18
+ assign(:account, @account = build_stubbed(:account))
19
19
  assign(:accounts, [@account])
20
20
  assign(:stage, Setting.unroll(:opportunity_stage))
21
21
  end
@@ -37,7 +37,7 @@ describe "/opportunities/edit" do
37
37
 
38
38
  it "edit: should hide previously open [Edit Opportunity] for and replace it with opportunity partial" do
39
39
  params[:cancel] = nil
40
- assign(:previous, previous = FactoryGirl.build_stubbed(:opportunity, user: current_user))
40
+ assign(:previous, previous = build_stubbed(:opportunity, user: current_user))
41
41
 
42
42
  render
43
43
  expect(rendered).to include("$('#opportunity_#{previous.id}').replaceWith")
@@ -20,7 +20,7 @@ describe "/opportunities/index" do
20
20
  end
21
21
 
22
22
  it "should render list of accounts if list of opportunities is not empty" do
23
- assign(:opportunities, [FactoryGirl.build_stubbed(:opportunity)].paginate)
23
+ assign(:opportunities, [build_stubbed(:opportunity)].paginate)
24
24
 
25
25
  render
26
26
  expect(view).to render_template(partial: "_opportunity")
@@ -16,7 +16,7 @@ describe "/opportunities/index" do
16
16
  end
17
17
 
18
18
  it "should render [opportunity] template with @opportunities collection if there are opportunities" do
19
- assign(:opportunities, [FactoryGirl.build_stubbed(:opportunity, id: 42)].paginate)
19
+ assign(:opportunities, [build_stubbed(:opportunity, id: 42)].paginate)
20
20
 
21
21
  render template: 'opportunities/index', formats: [:js]
22
22
 
@@ -12,7 +12,7 @@ describe "/opportunities/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(:opportunity, Opportunity.new(user: current_user))
17
17
  assign(:users, [current_user])
18
18
  assign(:account, @account)
@@ -12,12 +12,12 @@ describe "/opportunities/show" do
12
12
 
13
13
  before do
14
14
  login
15
- @opportunity = FactoryGirl.create(:opportunity, id: 42,
16
- contacts: [FactoryGirl.create(:contact)])
15
+ @opportunity = create(:opportunity, id: 42,
16
+ contacts: [create(:contact)])
17
17
  assign(:opportunity, @opportunity)
18
18
  assign(:users, [current_user])
19
19
  assign(:comment, Comment.new)
20
- assign(:timeline, [FactoryGirl.create(:comment, commentable: @opportunity)])
20
+ assign(:timeline, [create(:comment, commentable: @opportunity)])
21
21
 
22
22
  # controller#controller_name and controller#action_name are not set in view specs
23
23
  allow(view).to receive(:template_for_current_view).and_return(nil)
@@ -11,9 +11,9 @@ describe "/opportunities/update" do
11
11
  before do
12
12
  login
13
13
 
14
- assign(:opportunity, @opportunity = FactoryGirl.build_stubbed(:opportunity, user: current_user, assignee: FactoryGirl.build_stubbed(:user)))
14
+ assign(:opportunity, @opportunity = build_stubbed(:opportunity, user: current_user, assignee: build_stubbed(:user)))
15
15
  assign(:users, [current_user])
16
- assign(:account, @account = FactoryGirl.build_stubbed(:account))
16
+ assign(:account, @account = build_stubbed(:account))
17
17
  assign(:accounts, [@account])
18
18
  assign(:stage, Setting.unroll(:opportunity_stage))
19
19
  assign(:opportunity_stage_total, Hash.new(1))
@@ -62,7 +62,7 @@ describe "/opportunities/update" do
62
62
 
63
63
  describe "on related asset page -" do
64
64
  it "should update account sidebar" do
65
- assign(:account, account = FactoryGirl.build_stubbed(:account))
65
+ assign(:account, account = build_stubbed(:account))
66
66
  controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/#{account.id}"
67
67
  render
68
68
 
@@ -72,7 +72,7 @@ describe "/opportunities/update" do
72
72
  end
73
73
 
74
74
  it "should update campaign sidebar" do
75
- assign(:campaign, campaign = FactoryGirl.build_stubbed(:campaign))
75
+ assign(:campaign, campaign = build_stubbed(:campaign))
76
76
  controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
77
77
  render
78
78
 
@@ -137,7 +137,7 @@ describe "/opportunities/update" do
137
137
 
138
138
  it "should show disabled accounts dropdown when called from accounts landing page" do
139
139
  render
140
- expect(rendered).to include("crm.create_or_select_account(#{@referer =~ /\/accounts\//})")
140
+ expect(rendered).to include("crm.create_or_select_account(#{@referer =~ %r{/accounts/}})")
141
141
  end
142
142
 
143
143
  it "should redraw the [edit_opportunity] form and shake it" do
@@ -12,7 +12,7 @@ describe "/tasks/_edit" do
12
12
 
13
13
  before do
14
14
  login
15
- assign(:task, FactoryGirl.build_stubbed(:task, asset: FactoryGirl.build_stubbed(:account), bucket: "due_asap"))
15
+ assign(:task, build_stubbed(:task, asset: build_stubbed(:account), bucket: "due_asap"))
16
16
  assign(:users, [current_user])
17
17
  assign(:bucket, %w[due_asap due_today])
18
18
  assign(:category, %w[meeting money])
@@ -17,7 +17,7 @@ describe "/tasks/complete" do
17
17
 
18
18
  describe "complete from Tasks tab (pending view)" do
19
19
  before do
20
- @task = FactoryGirl.build_stubbed(:task)
20
+ @task = build_stubbed(:task)
21
21
  assign(:task, @task)
22
22
  assign(:view, "pending")
23
23
  assign(:empty_bucket, :due_asap)
@@ -33,7 +33,7 @@ describe "/tasks/complete" do
33
33
  end
34
34
 
35
35
  it "should update tasks sidebar" do
36
- assign(:task, FactoryGirl.build_stubbed(:task))
36
+ assign(:task, build_stubbed(:task))
37
37
  assign(:view, "pending")
38
38
  assign(:empty_bucket, :due_asap)
39
39
  controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
@@ -48,7 +48,7 @@ describe "/tasks/complete" do
48
48
 
49
49
  describe "complete from related asset" do
50
50
  it "should replace pending partial with the completed one" do
51
- @task = FactoryGirl.build_stubbed(:task, completed_at: Time.now, completor: current_user)
51
+ @task = build_stubbed(:task, completed_at: Time.now, completor: current_user)
52
52
  assign(:task, @task)
53
53
 
54
54
  render
@@ -57,7 +57,7 @@ describe "/tasks/complete" do
57
57
  end
58
58
 
59
59
  it "should update recently viewed items" do
60
- @task = FactoryGirl.build_stubbed(:task, completed_at: Time.now, completor: current_user)
60
+ @task = build_stubbed(:task, completed_at: Time.now, completor: current_user)
61
61
  assign(:task, @task)
62
62
  controller.request.env["HTTP_REFERER"] = "http://localhost/leads/123"
63
63
 
@@ -48,7 +48,7 @@ describe "/tasks/create" do
48
48
 
49
49
  it "should show flash message when assigning a task from pending tasks view" do
50
50
  assign(:view, "pending")
51
- assign(:task, FactoryGirl.build_stubbed(:task, id: 42, assignee: FactoryGirl.build_stubbed(:user)))
51
+ assign(:task, build_stubbed(:task, id: 42, assignee: build_stubbed(:user)))
52
52
  controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
53
53
  render
54
54
 
@@ -58,7 +58,7 @@ describe "/tasks/create" do
58
58
 
59
59
  it "should update recent items when assigning a task from pending tasks view" do
60
60
  assign(:view, "pending")
61
- assign(:task, FactoryGirl.build_stubbed(:task, id: 42, assignee: FactoryGirl.build_stubbed(:user)))
61
+ assign(:task, build_stubbed(:task, id: 42, assignee: build_stubbed(:user)))
62
62
  controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
63
63
  render
64
64
 
@@ -68,7 +68,7 @@ describe "/tasks/create" do
68
68
 
69
69
  it "should show flash message when creating a pending task from assigned tasks view" do
70
70
  assign(:view, "assigned")
71
- assign(:task, FactoryGirl.build_stubbed(:task, id: 42, assignee: nil))
71
+ assign(:task, build_stubbed(:task, id: 42, assignee: nil))
72
72
  controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
73
73
  render
74
74
 
@@ -78,7 +78,7 @@ describe "/tasks/create" do
78
78
 
79
79
  it "should update recent items when creating a pending task from assigned tasks view" do
80
80
  assign(:view, "assigned")
81
- assign(:task, FactoryGirl.build_stubbed(:task, id: 42, assignee: nil))
81
+ assign(:task, build_stubbed(:task, id: 42, assignee: nil))
82
82
  controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
83
83
  render
84
84
 
@@ -89,7 +89,7 @@ describe "/tasks/create" do
89
89
  (TASK_STATUSES - ['assigned']).each do |status|
90
90
  describe "create from outside the Tasks tab" do
91
91
  before do
92
- @task = FactoryGirl.build_stubbed(:task, id: 42)
92
+ @task = build_stubbed(:task, id: 42)
93
93
  assign(:view, status)
94
94
  assign(:task, @task)
95
95
  render
@@ -112,7 +112,7 @@ describe "/tasks/create" do
112
112
  end
113
113
 
114
114
  it "create failure: should re-render [create] template in :create_task div" do
115
- assign(:task, FactoryGirl.build(:task, name: nil)) # make it invalid
115
+ assign(:task, build(:task, name: nil)) # make it invalid
116
116
  render
117
117
 
118
118
  expect(rendered).to include(%/$('#create_task').effect("shake"/)