fat_free_crm 0.13.2 → 0.13.3

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 (407) hide show
  1. checksums.yaml +5 -13
  2. data/.travis.yml +3 -3
  3. data/Gemfile +5 -2
  4. data/Gemfile.lock +137 -119
  5. data/MIT-LICENSE +1 -1
  6. data/README.md +5 -3
  7. data/app/assets/javascripts/admin/fields.js.coffee +31 -8
  8. data/app/assets/javascripts/application.js.erb +6 -10
  9. data/app/assets/javascripts/crm.js.coffee +426 -0
  10. data/app/assets/javascripts/crm_chosen.js.coffee +19 -38
  11. data/app/assets/javascripts/crm_classes.js.coffee +215 -0
  12. data/app/assets/javascripts/crm_comments.js.coffee +20 -58
  13. data/app/assets/javascripts/crm_loginout.js.coffee +27 -0
  14. data/app/assets/javascripts/crm_select2.js.coffee +29 -0
  15. data/app/assets/javascripts/crm_sortable.js.coffee +32 -0
  16. data/app/assets/javascripts/crm_tags.js.coffee +22 -0
  17. data/app/assets/javascripts/crm_textarea_autocomplete.js.coffee +33 -0
  18. data/app/assets/javascripts/datepicker.js.coffee +2 -2
  19. data/app/assets/javascripts/format_buttons.js.coffee +23 -24
  20. data/app/assets/javascripts/lists.js.coffee +45 -76
  21. data/app/assets/javascripts/pagination.js.coffee +16 -0
  22. data/app/assets/javascripts/search.js.coffee +6 -22
  23. data/app/assets/javascripts/timeago.js.coffee +21 -0
  24. data/app/assets/stylesheets/application.css.erb +0 -1
  25. data/app/assets/stylesheets/common.scss +36 -29
  26. data/app/assets/stylesheets/lists.css.scss +17 -3
  27. data/app/controllers/admin/groups_controller.rb +2 -1
  28. data/app/controllers/application_controller.rb +5 -5
  29. data/app/controllers/entities/accounts_controller.rb +1 -1
  30. data/app/controllers/entities/campaigns_controller.rb +1 -1
  31. data/app/controllers/entities/contacts_controller.rb +1 -1
  32. data/app/controllers/entities/leads_controller.rb +1 -1
  33. data/app/controllers/entities/opportunities_controller.rb +1 -1
  34. data/app/controllers/home_controller.rb +10 -7
  35. data/app/controllers/tasks_controller.rb +15 -0
  36. data/app/controllers/users_controller.rb +6 -4
  37. data/app/helpers/accounts_helper.rb +8 -5
  38. data/app/helpers/application_helper.rb +53 -39
  39. data/app/helpers/campaigns_helper.rb +1 -0
  40. data/app/helpers/leads_helper.rb +3 -3
  41. data/app/helpers/opportunities_helper.rb +15 -0
  42. data/app/helpers/remote_link_pagination_helper.rb +8 -0
  43. data/app/helpers/tags_helper.rb +2 -2
  44. data/app/helpers/tasks_helper.rb +22 -15
  45. data/app/helpers/users_helper.rb +3 -2
  46. data/app/mailers/user_mailer.rb +9 -3
  47. data/app/models/entities/account_contact.rb +1 -1
  48. data/app/models/fields/custom_field.rb +1 -1
  49. data/app/models/list.rb +1 -0
  50. data/app/models/observers/entity_observer.rb +10 -1
  51. data/app/models/observers/lead_observer.rb +2 -0
  52. data/app/models/observers/opportunity_observer.rb +2 -0
  53. data/app/models/observers/task_observer.rb +2 -0
  54. data/app/models/polymorphic/avatar.rb +2 -0
  55. data/app/models/polymorphic/comment.rb +0 -1
  56. data/app/models/polymorphic/task.rb +41 -9
  57. data/app/models/users/ability.rb +1 -0
  58. data/app/models/users/group.rb +0 -5
  59. data/app/models/users/user.rb +0 -7
  60. data/app/views/accounts/_edit.html.haml +1 -0
  61. data/app/views/accounts/_index_brief.html.haml +2 -2
  62. data/app/views/accounts/_index_long.html.haml +2 -2
  63. data/app/views/accounts/_new.html.haml +1 -0
  64. data/app/views/accounts/_sidebar_index.html.haml +1 -1
  65. data/app/views/accounts/_sidebar_show.html.haml +1 -1
  66. data/app/views/accounts/_top_section.html.haml +1 -1
  67. data/app/views/accounts/create.js.haml +9 -9
  68. data/app/views/accounts/destroy.js.haml +2 -2
  69. data/app/views/accounts/edit.js.haml +5 -5
  70. data/app/views/accounts/index.js.haml +5 -5
  71. data/app/views/accounts/new.js.haml +1 -1
  72. data/app/views/accounts/show.html.haml +1 -1
  73. data/app/views/accounts/show.js.haml +1 -1
  74. data/app/views/accounts/update.js.haml +7 -5
  75. data/app/views/admin/field_groups/_field_group.html.haml +4 -5
  76. data/app/views/admin/field_groups/confirm.js.haml +2 -2
  77. data/app/views/admin/field_groups/create.js.haml +6 -12
  78. data/app/views/admin/field_groups/destroy.js.haml +3 -3
  79. data/app/views/admin/field_groups/edit.js.haml +1 -1
  80. data/app/views/admin/field_groups/new.js.haml +1 -1
  81. data/app/views/admin/field_groups/update.js.haml +2 -2
  82. data/app/views/admin/fields/_field.html.haml +1 -1
  83. data/app/views/admin/fields/_sort_by.html.haml +3 -3
  84. data/app/views/admin/fields/create.js.haml +9 -9
  85. data/app/views/admin/fields/destroy.js.haml +4 -4
  86. data/app/views/admin/fields/edit.js.haml +2 -2
  87. data/app/views/admin/fields/index.html.haml +1 -8
  88. data/app/views/admin/fields/show.html.haml +1 -1
  89. data/app/views/admin/fields/update.js.haml +8 -8
  90. data/app/views/admin/groups/_form.html.haml +1 -3
  91. data/app/views/admin/groups/create.js.haml +8 -8
  92. data/app/views/admin/groups/destroy.js.haml +3 -3
  93. data/app/views/admin/groups/edit.js.haml +3 -3
  94. data/app/views/admin/groups/index.js.haml +2 -2
  95. data/app/views/admin/groups/new.js.haml +2 -2
  96. data/app/views/admin/groups/update.js.haml +5 -5
  97. data/app/views/admin/tags/confirm.js.haml +2 -2
  98. data/app/views/admin/tags/create.js.haml +8 -8
  99. data/app/views/admin/tags/destroy.js.haml +3 -3
  100. data/app/views/admin/tags/edit.js.haml +4 -4
  101. data/app/views/admin/tags/new.js.haml +1 -1
  102. data/app/views/admin/tags/update.js.haml +5 -5
  103. data/app/views/admin/users/_profile.html.haml +3 -4
  104. data/app/views/admin/users/confirm.js.haml +2 -2
  105. data/app/views/admin/users/create.js.haml +8 -8
  106. data/app/views/admin/users/destroy.js.haml +3 -3
  107. data/app/views/admin/users/edit.js.haml +4 -4
  108. data/app/views/admin/users/index.js.haml +2 -2
  109. data/app/views/admin/users/new.js.haml +2 -2
  110. data/app/views/admin/users/reactivate.js.haml +2 -2
  111. data/app/views/admin/users/suspend.js.haml +2 -2
  112. data/app/views/admin/users/update.js.haml +5 -5
  113. data/app/views/campaigns/_edit.html.haml +1 -0
  114. data/app/views/campaigns/_index_brief.html.haml +1 -1
  115. data/app/views/campaigns/_index_long.html.haml +1 -1
  116. data/app/views/campaigns/_new.html.haml +1 -0
  117. data/app/views/campaigns/_sidebar_index.html.haml +1 -1
  118. data/app/views/campaigns/_sidebar_show.html.haml +1 -1
  119. data/app/views/campaigns/_status.html.haml +1 -1
  120. data/app/views/campaigns/_top_section.html.haml +1 -1
  121. data/app/views/campaigns/create.js.haml +10 -10
  122. data/app/views/campaigns/destroy.js.haml +2 -2
  123. data/app/views/campaigns/edit.js.haml +6 -6
  124. data/app/views/campaigns/index.js.haml +5 -5
  125. data/app/views/campaigns/new.js.haml +1 -1
  126. data/app/views/campaigns/show.html.haml +1 -1
  127. data/app/views/campaigns/show.js.haml +1 -1
  128. data/app/views/campaigns/update.js.haml +8 -6
  129. data/app/views/comments/_edit.html.haml +1 -1
  130. data/app/views/comments/_new.html.haml +1 -1
  131. data/app/views/comments/create.js.haml +9 -9
  132. data/app/views/comments/destroy.js.haml +2 -2
  133. data/app/views/comments/edit.js.haml +3 -3
  134. data/app/views/comments/update.js.haml +5 -5
  135. data/app/views/contacts/_contacts.html.haml +1 -1
  136. data/app/views/contacts/_edit.html.haml +1 -0
  137. data/app/views/contacts/_index_brief.html.haml +2 -2
  138. data/app/views/contacts/_index_full.html.haml +2 -2
  139. data/app/views/contacts/_index_long.html.haml +2 -2
  140. data/app/views/contacts/_new.html.haml +1 -0
  141. data/app/views/contacts/_section_general.html.haml +4 -3
  142. data/app/views/contacts/_sidebar_show.html.haml +1 -1
  143. data/app/views/contacts/_top_section.html.haml +1 -1
  144. data/app/views/contacts/create.js.haml +10 -10
  145. data/app/views/contacts/destroy.js.haml +3 -3
  146. data/app/views/contacts/edit.js.haml +5 -5
  147. data/app/views/contacts/index.js.haml +5 -5
  148. data/app/views/contacts/new.js.haml +1 -1
  149. data/app/views/contacts/show.html.haml +1 -1
  150. data/app/views/contacts/show.js.haml +1 -1
  151. data/app/views/contacts/update.js.haml +8 -6
  152. data/app/views/emails/destroy.js.haml +2 -2
  153. data/app/views/entities/_basic_search.html.haml +15 -12
  154. data/app/views/entities/_permissions.html.haml +6 -11
  155. data/app/views/entities/attach.js.haml +3 -3
  156. data/app/views/entities/contacts.js.haml +2 -2
  157. data/app/views/entities/discard.js.haml +1 -1
  158. data/app/views/entities/leads.js.haml +2 -2
  159. data/app/views/entities/opportunities.js.haml +2 -2
  160. data/app/views/entities/subscription_update.js.haml +1 -1
  161. data/app/views/entities/versions.js.haml +2 -2
  162. data/app/views/fields/group.js.erb +1 -1
  163. data/app/views/home/_account.html.haml +2 -2
  164. data/app/views/home/_assets_menu.html.haml +3 -3
  165. data/app/views/home/_duration_menu.html.haml +3 -3
  166. data/app/views/home/_events_menu.html.haml +3 -3
  167. data/app/views/home/_opportunity.html.haml +2 -2
  168. data/app/views/home/_options.html.haml +0 -1
  169. data/app/views/home/_users_menu.html.haml +3 -3
  170. data/app/views/home/index.js.haml +4 -4
  171. data/app/views/home/options.js.haml +1 -1
  172. data/app/views/layouts/_about.html.haml +3 -3
  173. data/app/views/layouts/_footer.html.haml +1 -1
  174. data/app/views/layouts/_header.html.haml +1 -1
  175. data/app/views/layouts/_jumpbox.html.haml +23 -21
  176. data/app/views/layouts/_sidebar.html.haml +1 -2
  177. data/app/views/layouts/admin/application.html.haml +1 -1
  178. data/app/views/layouts/application.html.haml +3 -3
  179. data/app/views/leads/_convert.html.haml +1 -11
  180. data/app/views/leads/_convert_permissions.html.haml +4 -9
  181. data/app/views/leads/_edit.html.haml +1 -0
  182. data/app/views/leads/_index_brief.html.haml +1 -1
  183. data/app/views/leads/_index_long.html.haml +1 -1
  184. data/app/views/leads/_leads.html.haml +1 -1
  185. data/app/views/leads/_new.html.haml +1 -0
  186. data/app/views/leads/_sidebar_index.html.haml +1 -1
  187. data/app/views/leads/_sidebar_show.html.haml +1 -1
  188. data/app/views/leads/_top_section.html.haml +1 -1
  189. data/app/views/leads/convert.js.haml +5 -5
  190. data/app/views/leads/create.js.haml +9 -9
  191. data/app/views/leads/destroy.js.haml +2 -2
  192. data/app/views/leads/edit.js.haml +5 -5
  193. data/app/views/leads/index.js.haml +5 -5
  194. data/app/views/leads/new.js.haml +1 -1
  195. data/app/views/leads/promote.js.haml +7 -7
  196. data/app/views/leads/reject.js.haml +2 -2
  197. data/app/views/leads/show.html.haml +1 -1
  198. data/app/views/leads/show.js.haml +1 -1
  199. data/app/views/leads/update.js.haml +9 -7
  200. data/app/views/lists/_lists.html.haml +6 -0
  201. data/app/views/lists/_sidebar.html.haml +18 -17
  202. data/app/views/lists/create.js.haml +6 -7
  203. data/app/views/lists/destroy.js.haml +1 -1
  204. data/app/views/opportunities/_edit.html.haml +2 -1
  205. data/app/views/opportunities/_index_brief.html.haml +1 -1
  206. data/app/views/opportunities/_index_long.html.haml +1 -1
  207. data/app/views/opportunities/_new.html.haml +2 -1
  208. data/app/views/opportunities/_opportunities.html.haml +1 -1
  209. data/app/views/opportunities/_sidebar_index.html.haml +1 -1
  210. data/app/views/opportunities/_sidebar_show.html.haml +1 -1
  211. data/app/views/opportunities/_top_section.html.haml +2 -2
  212. data/app/views/opportunities/contacts.js.haml +2 -2
  213. data/app/views/opportunities/create.js.haml +10 -10
  214. data/app/views/opportunities/destroy.js.haml +3 -3
  215. data/app/views/opportunities/edit.js.haml +5 -5
  216. data/app/views/opportunities/index.html.haml +1 -1
  217. data/app/views/opportunities/index.js.haml +5 -5
  218. data/app/views/opportunities/new.js.haml +1 -1
  219. data/app/views/opportunities/show.html.haml +1 -1
  220. data/app/views/opportunities/show.js.haml +1 -1
  221. data/app/views/opportunities/update.js.haml +8 -6
  222. data/app/views/shared/_address.html.haml +1 -1
  223. data/app/views/shared/_inline_styles.html.haml +1 -1
  224. data/app/views/shared/_naming.html.haml +3 -3
  225. data/app/views/shared/_paginate.haml +2 -1
  226. data/app/views/shared/_paginate_with_per_page.html.haml +10 -12
  227. data/app/views/shared/_search.html.haml +7 -3
  228. data/app/views/shared/_select_popup.html.haml +9 -11
  229. data/app/views/shared/_tags.html.haml +5 -4
  230. data/app/views/tasks/_completed.html.haml +3 -1
  231. data/app/views/tasks/_selector.html.haml +1 -1
  232. data/app/views/tasks/_top_section.html.haml +1 -1
  233. data/app/views/tasks/complete.js.haml +7 -7
  234. data/app/views/tasks/create.js.haml +17 -17
  235. data/app/views/tasks/destroy.js.haml +2 -2
  236. data/app/views/tasks/discard.js.haml +1 -1
  237. data/app/views/tasks/edit.js.haml +4 -4
  238. data/app/views/tasks/filter.js.haml +2 -2
  239. data/app/views/tasks/new.js.haml +1 -1
  240. data/app/views/tasks/uncomplete.js.haml +12 -0
  241. data/app/views/tasks/update.js.haml +4 -4
  242. data/app/views/users/_avatar.html.haml +1 -1
  243. data/app/views/users/_languages.html.haml +3 -3
  244. data/app/views/users/_profile.html.haml +1 -1
  245. data/app/views/users/avatar.js.haml +1 -1
  246. data/app/views/users/change_password.js.haml +5 -5
  247. data/app/views/users/edit.js.haml +1 -1
  248. data/app/views/users/password.js.haml +2 -2
  249. data/app/views/users/show.html.haml +1 -1
  250. data/app/views/users/update.js.haml +5 -5
  251. data/app/views/users/upload_avatar.js.haml +3 -3
  252. data/app/views/versions/_versions.html.haml +1 -1
  253. data/config/application.rb +3 -0
  254. data/config/environments/production.rb +1 -1
  255. data/config/environments/staging.rb +58 -13
  256. data/config/initializers/locale.rb +2 -0
  257. data/config/locales/cz_fat_free_crm.yml +1 -0
  258. data/config/locales/de_fat_free_crm.yml +1 -0
  259. data/config/locales/en-GB_fat_free_crm.yml +1 -0
  260. data/config/locales/en-US_fat_free_crm.yml +2 -0
  261. data/config/locales/es_fat_free_crm.yml +1 -0
  262. data/config/locales/fr-CA_fat_free_crm.yml +1 -0
  263. data/config/locales/fr_fat_free_crm.yml +1 -0
  264. data/config/locales/it_fat_free_crm.yml +1 -0
  265. data/config/locales/ja_fat_free_crm.yml +1 -0
  266. data/config/locales/pl_fat_free_crm.yml +1 -0
  267. data/config/locales/pt-BR_fat_free_crm.yml +1 -0
  268. data/config/locales/ru_fat_free_crm.yml +444 -61
  269. data/config/locales/sv-SE_fat_free_crm.yml +1 -0
  270. data/config/locales/th_fat_free_crm.yml +1 -0
  271. data/config/locales/zh-CN_fat_free_crm.yml +1 -0
  272. data/config/routes.rb +20 -19
  273. data/config/settings.default.yml +11 -10
  274. data/fat_free_crm.gemspec +5 -4
  275. data/lib/{plugins/country_select/lib/country_select.rb → country_select.rb} +0 -0
  276. data/lib/fat_free_crm.rb +3 -1
  277. data/lib/fat_free_crm/engine.rb +2 -4
  278. data/lib/fat_free_crm/gem_dependencies.rb +1 -1
  279. data/lib/fat_free_crm/gem_ext.rb +0 -2
  280. data/lib/fat_free_crm/permissions.rb +2 -3
  281. data/lib/fat_free_crm/version.rb +1 -1
  282. data/lib/{plugins/gravatar_image_tag/lib/gravatar_image_tag.rb → gravatar_image_tag.rb} +0 -0
  283. data/lib/tasks/ffcrm/settings.rake +4 -16
  284. data/public/favicon.ico +0 -0
  285. data/spec/controllers/entities/accounts_controller_spec.rb +5 -5
  286. data/spec/controllers/entities/campaigns_controller_spec.rb +5 -5
  287. data/spec/controllers/entities/contacts_controller_spec.rb +42 -5
  288. data/spec/controllers/entities/leads_controller_spec.rb +7 -7
  289. data/spec/controllers/entities/opportunities_controller_spec.rb +5 -5
  290. data/spec/controllers/home_controller_spec.rb +3 -3
  291. data/spec/controllers/tasks_controller_spec.rb +29 -0
  292. data/spec/factories/shared_factories.rb +1 -3
  293. data/spec/features/support/selector_helpers.rb +4 -4
  294. data/spec/helpers/tasks_helper_spec.rb +10 -5
  295. data/spec/lib/permissions_spec.rb +10 -22
  296. data/spec/mailers/user_mailer_spec.rb +5 -4
  297. data/spec/models/observers/entity_observer_spec.rb +13 -8
  298. data/spec/models/polymorphic/task_spec.rb +111 -32
  299. data/spec/routing/accounts_routing_spec.rb +1 -1
  300. data/spec/routing/campaigns_routing_spec.rb +1 -1
  301. data/spec/routing/contacts_routing_spec.rb +1 -1
  302. data/spec/routing/leads_routing_spec.rb +1 -1
  303. data/spec/routing/opportunities_routing_spec.rb +1 -1
  304. data/spec/shared/controllers.rb +2 -2
  305. data/spec/spec_helper.rb +1 -0
  306. data/spec/views/accounts/create.js.haml_spec.rb +3 -3
  307. data/spec/views/accounts/index.js.haml_spec.rb +4 -4
  308. data/spec/views/accounts/update.js.haml_spec.rb +5 -5
  309. data/spec/views/admin/field_groups/create.js.haml_spec.rb +2 -2
  310. data/spec/views/admin/field_groups/edit.js.haml_spec.rb +1 -1
  311. data/spec/views/admin/field_groups/new.js.haml_spec.rb +1 -1
  312. data/spec/views/admin/field_groups/update.js.haml_spec.rb +1 -1
  313. data/spec/views/admin/users/create.js.haml_spec.rb +2 -2
  314. data/spec/views/admin/users/destroy.js.haml_spec.rb +1 -1
  315. data/spec/views/admin/users/edit.js.haml_spec.rb +1 -1
  316. data/spec/views/admin/users/index.js.haml_spec.rb +1 -1
  317. data/spec/views/admin/users/new.js.haml_spec.rb +1 -1
  318. data/spec/views/admin/users/reactivate.js.haml_spec.rb +1 -1
  319. data/spec/views/admin/users/suspend.js.haml_spec.rb +1 -1
  320. data/spec/views/admin/users/update.js.haml_spec.rb +3 -3
  321. data/spec/views/campaigns/create.js.haml_spec.rb +4 -4
  322. data/spec/views/campaigns/destroy.js.haml_spec.rb +1 -1
  323. data/spec/views/campaigns/edit.js.haml_spec.rb +4 -4
  324. data/spec/views/campaigns/index.js.haml_spec.rb +2 -2
  325. data/spec/views/campaigns/new.js.haml_spec.rb +1 -1
  326. data/spec/views/campaigns/update.js.haml_spec.rb +7 -7
  327. data/spec/views/contacts/create.js.haml_spec.rb +4 -4
  328. data/spec/views/contacts/edit.js.haml_spec.rb +4 -4
  329. data/spec/views/contacts/index.js.html_spec.rb +2 -2
  330. data/spec/views/contacts/new.js.haml_spec.rb +2 -2
  331. data/spec/views/contacts/update.js.haml_spec.rb +11 -11
  332. data/spec/views/home/index.js.haml_spec.rb +1 -1
  333. data/spec/views/home/options.js.haml_spec.rb +3 -3
  334. data/spec/views/leads/convert.js.haml_spec.rb +3 -3
  335. data/spec/views/leads/create.js.haml_spec.rb +5 -5
  336. data/spec/views/leads/destroy.js.haml_spec.rb +1 -1
  337. data/spec/views/leads/edit.js.haml_spec.rb +4 -4
  338. data/spec/views/leads/index.js.haml_spec.rb +2 -2
  339. data/spec/views/leads/new.js.haml_spec.rb +1 -1
  340. data/spec/views/leads/promote.js.haml_spec.rb +13 -13
  341. data/spec/views/leads/reject.js.haml_spec.rb +6 -6
  342. data/spec/views/leads/update.js.haml_spec.rb +11 -11
  343. data/spec/views/opportunities/create.js.haml_spec.rb +4 -4
  344. data/spec/views/opportunities/destroy.js.haml_spec.rb +1 -1
  345. data/spec/views/opportunities/edit.js.haml_spec.rb +4 -4
  346. data/spec/views/opportunities/index.js.haml_spec.rb +2 -2
  347. data/spec/views/opportunities/update.js.haml_spec.rb +11 -11
  348. data/spec/views/tasks/complete.js.haml_spec.rb +5 -5
  349. data/spec/views/tasks/create.js.haml_spec.rb +13 -13
  350. data/spec/views/tasks/destroy.js.haml_spec.rb +3 -3
  351. data/spec/views/tasks/edit.js.haml_spec.rb +4 -4
  352. data/spec/views/tasks/new.js.haml_spec.rb +2 -2
  353. data/spec/views/tasks/uncomplete.js.haml_spec.rb +44 -0
  354. data/spec/views/tasks/update.js.haml_spec.rb +17 -17
  355. data/spec/views/users/avatar.js.haml_spec.rb +1 -1
  356. data/spec/views/users/change_password.js.haml_spec.rb +4 -4
  357. data/spec/views/users/edit.js.haml_spec.rb +1 -1
  358. data/spec/views/users/password.js.haml_spec.rb +2 -2
  359. data/spec/views/users/update.js.haml_spec.rb +5 -5
  360. data/spec/views/users/upload_avatar.js.haml_spec.rb +2 -2
  361. data/vendor/assets/javascripts/ajax-chosen.jquery.coffee +166 -76
  362. data/vendor/assets/javascripts/chosen.jquery.coffee +2 -2
  363. data/vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-pt-BR.js +22 -0
  364. data/vendor/assets/javascripts/jquery_ui_datepicker/{jquery-ui-timepicker-sv.js → jquery-ui-timepicker-sv-SE.js} +0 -0
  365. data/vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-th.js +19 -0
  366. data/vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-fr-CA.js +21 -0
  367. data/vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-pt.js +21 -0
  368. data/vendor/assets/javascripts/rating.js +2 -2
  369. metadata +101 -122
  370. data/app/assets/images/facebook-close.gif +0 -0
  371. data/app/assets/javascripts/crm.js +0 -495
  372. data/app/assets/javascripts/crm_classes.js +0 -218
  373. data/app/assets/javascripts/crm_fields.js +0 -34
  374. data/app/assets/javascripts/crm_loginout.js +0 -29
  375. data/app/assets/javascripts/crm_textarea_autocomplete.js +0 -32
  376. data/app/assets/javascripts/groups.js.coffee +0 -8
  377. data/app/assets/javascripts/jquery-noconflict.js +0 -6
  378. data/app/assets/javascripts/timeago.js +0 -17
  379. data/app/views/lists/_personal_sidebar.html.haml +0 -28
  380. data/lib/fat_free_crm/gem_ext/active_model/serializers/xml/serializer/attribute.rb +0 -17
  381. data/lib/fat_free_crm/gem_ext/authlogic/session/cookies.rb +0 -16
  382. data/lib/fat_free_crm/plugin_dependencies.rb +0 -12
  383. data/lib/plugins/country_select/MIT-LICENSE +0 -20
  384. data/lib/plugins/country_select/README +0 -14
  385. data/lib/plugins/country_select/init.rb +0 -1
  386. data/lib/plugins/country_select/install.rb +0 -2
  387. data/lib/plugins/country_select/uninstall.rb +0 -2
  388. data/lib/plugins/gravatar_image_tag/Gemfile +0 -8
  389. data/lib/plugins/gravatar_image_tag/README.textile +0 -108
  390. data/lib/plugins/gravatar_image_tag/ROADMAP.textile +0 -33
  391. data/lib/plugins/gravatar_image_tag/Rakefile +0 -50
  392. data/lib/plugins/gravatar_image_tag/VERSION +0 -1
  393. data/lib/plugins/gravatar_image_tag/gravatar_image_tag.gemspec +0 -45
  394. data/lib/plugins/gravatar_image_tag/init.rb +0 -2
  395. data/lib/plugins/gravatar_image_tag/spec/gravatar_image_tag_spec.rb +0 -83
  396. data/lib/plugins/gravatar_image_tag/spec/test_helper.rb +0 -12
  397. data/lib/tasks/db/migrate.rake +0 -66
  398. data/lib/tasks/db/schema.rake +0 -20
  399. data/vendor/assets/javascripts/ajax-chosen-prototype.js +0 -2
  400. data/vendor/assets/javascripts/ajax-chosen.proto.coffee +0 -98
  401. data/vendor/assets/javascripts/chosen-prototype.js +0 -3
  402. data/vendor/assets/javascripts/chosen.proto.coffee +0 -580
  403. data/vendor/assets/javascripts/event.simulate.js +0 -64
  404. data/vendor/assets/javascripts/facebooklist.js +0 -548
  405. data/vendor/assets/javascripts/facebooklist.simulate.js +0 -28
  406. data/vendor/assets/javascripts/modalbox.js +0 -506
  407. data/vendor/assets/stylesheets/facebooklist.css +0 -47
@@ -53,7 +53,7 @@ describe AccountsController do
53
53
  end
54
54
 
55
55
  it "recognizes and generates #auto_complete" do
56
- { :post => "/accounts/auto_complete" }.should route_to( :controller => "accounts", :action => "auto_complete" )
56
+ { :get => "/accounts/auto_complete" }.should route_to( :controller => "accounts", :action => "auto_complete" )
57
57
  end
58
58
  end
59
59
  end
@@ -53,7 +53,7 @@ describe CampaignsController do
53
53
  end
54
54
 
55
55
  it "recognizes and generates #auto_complete" do
56
- { :post => "/campaigns/auto_complete" }.should route_to( :controller => "campaigns", :action => "auto_complete" )
56
+ { :get => "/campaigns/auto_complete" }.should route_to( :controller => "campaigns", :action => "auto_complete" )
57
57
  end
58
58
 
59
59
  it "recognizes and generates #filter" do
@@ -53,7 +53,7 @@ describe ContactsController do
53
53
  end
54
54
 
55
55
  it "recognizes and generates #auto_complete" do
56
- { :post => "/contacts/auto_complete" }.should route_to( :controller => "contacts", :action => "auto_complete" )
56
+ { :get => "/contacts/auto_complete" }.should route_to( :controller => "contacts", :action => "auto_complete" )
57
57
  end
58
58
  end
59
59
  end
@@ -53,7 +53,7 @@ describe LeadsController do
53
53
  end
54
54
 
55
55
  it "recognizes and generates #auto_complete" do
56
- { :post => "/leads/auto_complete" }.should route_to( :controller => "leads", :action => "auto_complete" )
56
+ { :get => "/leads/auto_complete" }.should route_to( :controller => "leads", :action => "auto_complete" )
57
57
  end
58
58
 
59
59
  it "recognizes and generates #filter" do
@@ -53,7 +53,7 @@ describe OpportunitiesController do
53
53
  end
54
54
 
55
55
  it "recognizes and generates #auto_complete" do
56
- { :post => "/opportunities/auto_complete" }.should route_to( :controller => "opportunities", :action => "auto_complete" )
56
+ { :get => "/opportunities/auto_complete" }.should route_to( :controller => "opportunities", :action => "auto_complete" )
57
57
  end
58
58
 
59
59
  it "recognizes and generates #filter" do
@@ -10,13 +10,13 @@ shared_examples "auto complete" do
10
10
  end
11
11
 
12
12
  it "should do the search and find records that match autocomplete query" do
13
- post :auto_complete, :auto_complete_query => @query
13
+ get :auto_complete, :auto_complete_query => @query
14
14
  assigns[:query].should == @query
15
15
  assigns[:auto_complete].should == @auto_complete_matches # Each controller must define it.
16
16
  end
17
17
 
18
18
  it "should save current autocomplete controller in a session" do
19
- post :auto_complete, :auto_complete_query => @query
19
+ get :auto_complete, :auto_complete_query => @query
20
20
 
21
21
  # We don't save Admin/Users autocomplete controller in a session since Users are not
22
22
  # exposed through the Jumpbox.
@@ -13,6 +13,7 @@ require 'capybara/rails'
13
13
  require 'acts_as_fu'
14
14
  require 'factory_girl_rails'
15
15
  require 'ffaker'
16
+ require 'timecop'
16
17
 
17
18
  require 'coveralls'
18
19
  Coveralls.wear!
@@ -23,8 +23,8 @@ describe "/accounts/create" do
23
23
  end
24
24
 
25
25
  it "should hide [Create Account] form and insert account partial" do
26
- rendered.should include("jQuery('#accounts').prepend('<li class=\\'account highlight\\' id=\\'account_#{@account.id}\\'")
27
- rendered.should include(%Q/jQuery('#account_#{@account.id}').effect("highlight"/)
26
+ rendered.should include("$('#accounts').prepend('<li class=\\'account highlight\\' id=\\'account_#{@account.id}\\'")
27
+ rendered.should include(%Q/$('#account_#{@account.id}').effect("highlight"/)
28
28
  end
29
29
 
30
30
  it "should update pagination" do
@@ -45,7 +45,7 @@ describe "/accounts/create" do
45
45
  render
46
46
 
47
47
  rendered.should include("#create_account")
48
- rendered.should include(%Q/jQuery('#create_account').effect("shake"/)
48
+ rendered.should include(%Q/$('#create_account').effect("shake"/)
49
49
  end
50
50
  end
51
51
 
@@ -17,8 +17,8 @@ describe "/accounts/index" do
17
17
 
18
18
  render :template => 'accounts/index', :formats => [:js]
19
19
 
20
- rendered.should include("jQuery('#accounts').html")
21
- rendered.should include("jQuery('#paginate').html")
20
+ rendered.should include("$('#accounts').html")
21
+ rendered.should include("$('#paginate').html")
22
22
  end
23
23
 
24
24
  it "should render [empty] template if @accounts collection if there are no accounts" do
@@ -26,8 +26,8 @@ describe "/accounts/index" do
26
26
 
27
27
  render :template => 'accounts/index', :formats => [:js]
28
28
 
29
- rendered.should include("jQuery('#accounts').html('<div id=\\'empty\\'")
30
- rendered.should include("jQuery('#paginate').html")
29
+ rendered.should include("$('#accounts').html('<div id=\\'empty\\'")
30
+ rendered.should include("$('#paginate').html")
31
31
  end
32
32
 
33
33
  end
@@ -30,9 +30,9 @@ describe "/accounts/update" do
30
30
 
31
31
  it "should update sidebar" do
32
32
  render
33
- rendered.should include("jQuery('#sidebar').html")
33
+ rendered.should include("$('#sidebar').html")
34
34
  rendered.should have_text("Recent Items")
35
- rendered.should include("jQuery('#summary').effect('shake'")
35
+ rendered.should include("$('#summary').effect('shake'")
36
36
  end
37
37
  end
38
38
 
@@ -53,7 +53,7 @@ describe "/accounts/update" do
53
53
  render
54
54
 
55
55
  rendered.should include("#account_#{@account.id}")
56
- rendered.should include(%Q/jQuery('#account_#{@account.id}').effect("highlight"/)
56
+ rendered.should include(%Q/$('#account_#{@account.id}').effect("highlight"/)
57
57
  end
58
58
  end
59
59
  end # no errors
@@ -72,7 +72,7 @@ describe "/accounts/update" do
72
72
  render
73
73
 
74
74
  rendered.should include("#edit_account")
75
- rendered.should include(%Q/jQuery('#edit_account').effect("shake"/)
75
+ rendered.should include(%Q/$('#edit_account').effect("shake"/)
76
76
  rendered.should include('focus()')
77
77
  end
78
78
  end
@@ -86,7 +86,7 @@ describe "/accounts/update" do
86
86
  render
87
87
 
88
88
  rendered.should include("account_#{@account.id}")
89
- rendered.should include(%Q/jQuery('#account_#{@account.id}').effect("shake"/)
89
+ rendered.should include(%Q/$('#account_#{@account.id}').effect("shake"/)
90
90
  rendered.should include('focus()')
91
91
  end
92
92
  end
@@ -17,8 +17,8 @@ describe "admin/field_groups/create" do
17
17
  it "renders javascript" do
18
18
  render
19
19
  view.should render_template("admin/field_groups/create")
20
- rendered.should have_text("jQuery('##{field_group.klass_name.downcase}_create_field_group_arrow')")
21
- rendered.should have_text("jQuery('##{dom_id(field_group)}').effect('highlight', { duration:1500 });")
20
+ rendered.should have_text("$('##{field_group.klass_name.downcase}_create_field_group_arrow')")
21
+ rendered.should have_text("$('##{dom_id(field_group)}').effect('highlight', { duration:1500 });")
22
22
  end
23
23
 
24
24
  it "renders javascript for invalid field group" do
@@ -18,7 +18,7 @@ describe "admin/field_groups/edit" do
18
18
  render
19
19
  view.should render_template("admin/field_groups/edit")
20
20
  rendered.should have_text("crm.show_form('#{dom_id(field_group, :edit)}')")
21
- rendered.should have_text("jQuery('##{dom_id(field_group, :edit)}').html")
21
+ rendered.should have_text("$('##{dom_id(field_group, :edit)}').html")
22
22
  end
23
23
 
24
24
  end
@@ -19,7 +19,7 @@ describe "admin/field_groups/new" do
19
19
  view.should render_template("admin/field_groups/new")
20
20
  rendered.should have_text("crm.flick('empty', 'toggle')")
21
21
  rendered.should have_text("crm.flip_form('#{field_group.klass_name.downcase}_create_field_group')")
22
- rendered.should have_text("jQuery('##{field_group.klass_name.downcase}_create_field_group').html")
22
+ rendered.should have_text("$('##{field_group.klass_name.downcase}_create_field_group').html")
23
23
  end
24
24
 
25
25
  end
@@ -24,7 +24,7 @@ describe "admin/field_groups/update" do
24
24
  it "renders javascript for invalid field group" do
25
25
  field_group.errors.stub(:empty?).and_return(false)
26
26
  render
27
- rendered.should have_text("jQuery('##{dom_id(field_group, :edit)}').effect('shake', { distance:5 }, 250);")
27
+ rendered.should have_text("$('##{dom_id(field_group, :edit)}').effect('shake', { distance:5 }, 250);")
28
28
  end
29
29
 
30
30
  end
@@ -21,7 +21,7 @@ describe "admin/users/create" do
21
21
 
22
22
  rendered.should include(@user.full_name)
23
23
  rendered.should include(@user.username)
24
- rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("highlight"/)
24
+ rendered.should include(%Q/$('#user_#{@user.id}').effect("highlight"/)
25
25
  end
26
26
 
27
27
  # it "should update pagination" do
@@ -36,7 +36,7 @@ describe "admin/users/create" do
36
36
  render
37
37
 
38
38
  rendered.should include('Please specify username')
39
- rendered.should include(%Q/jQuery('#create_user').effect("shake"/)
39
+ rendered.should include(%Q/$('#create_user').effect("shake"/)
40
40
  end
41
41
  end
42
42
 
@@ -38,7 +38,7 @@ describe "admin/users/destroy" do
38
38
  it "should shake user partial" do
39
39
  render
40
40
 
41
- rendered.should include(%Q/jQuery('#user_#{@user.id}').effect('shake'/)
41
+ rendered.should include(%Q/$('#user_#{@user.id}').effect('shake'/)
42
42
  end
43
43
 
44
44
  it "should show flash message" do
@@ -15,7 +15,7 @@ describe "admin/users/edit" do
15
15
  params[:cancel] = "true"
16
16
  render
17
17
 
18
- rendered.should include("jQuery('#user_#{@user.id}').replaceWith")
18
+ rendered.should include("$('#user_#{@user.id}').replaceWith")
19
19
  end
20
20
 
21
21
  it "edit hides previously open [Edit User] and replaces it with user partial" do
@@ -19,7 +19,7 @@ describe "admin/users/index" do
19
19
 
20
20
  rendered.should include("id=\\'user_#{amy.id}\\'")
21
21
  rendered.should include("id=\\'user_#{bob.id}\\'")
22
- rendered.should include("jQuery('#paginate')")
22
+ rendered.should include("$('#paginate')")
23
23
  end
24
24
 
25
25
  end
@@ -16,7 +16,7 @@ describe "admin/users/new" do
16
16
  params[:cancel] = nil
17
17
  render
18
18
 
19
- rendered.should include("jQuery('#create_user').html")
19
+ rendered.should include("$('#create_user').html")
20
20
  end
21
21
  end
22
22
 
@@ -15,6 +15,6 @@ describe "admin/users/reactivate" do
15
15
  render
16
16
 
17
17
  rendered.should include("user_#{@user.id}")
18
- rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("highlight"/)
18
+ rendered.should include(%Q/$('#user_#{@user.id}').effect("highlight"/)
19
19
  end
20
20
  end
@@ -15,6 +15,6 @@ describe "admin/users/suspend" do
15
15
  render
16
16
 
17
17
  rendered.should include("user_#{@user.id}")
18
- rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("highlight"/)
18
+ rendered.should include(%Q/$('#user_#{@user.id}').effect("highlight"/)
19
19
  end
20
20
  end
@@ -16,7 +16,7 @@ describe "admin/users/update" do
16
16
  render
17
17
 
18
18
  rendered.should include("user_#{@user.id}")
19
- rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("highlight"/)
19
+ rendered.should include(%Q/$('#user_#{@user.id}').effect("highlight"/)
20
20
  end
21
21
  end # no errors
22
22
 
@@ -29,8 +29,8 @@ describe "admin/users/update" do
29
29
  render
30
30
 
31
31
  rendered.should include("user_#{@user.id}")
32
- rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("shake"/)
33
- rendered.should include(%Q/jQuery('#user_username').focus()/)
32
+ rendered.should include(%Q/$('#user_#{@user.id}').effect("shake"/)
33
+ rendered.should include(%Q/$('#user_username').focus()/)
34
34
  end
35
35
  end # errors
36
36
  end
@@ -19,8 +19,8 @@ describe "/campaigns/create" do
19
19
  end
20
20
 
21
21
  it "should hide [Create Campaign] form and insert campaign partial" do
22
- rendered.should include("jQuery('#campaigns').prepend('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
23
- rendered.should include(%Q/jQuery('#campaign_#{@campaign.id}').effect("highlight"/)
22
+ rendered.should include("$('#campaigns').prepend('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
23
+ rendered.should include(%Q/$('#campaign_#{@campaign.id}').effect("highlight"/)
24
24
  end
25
25
 
26
26
  it "should update pagination" do
@@ -41,8 +41,8 @@ describe "/campaigns/create" do
41
41
 
42
42
  render
43
43
 
44
- rendered.should include("jQuery('#create_campaign').html")
45
- rendered.should include(%Q/jQuery('#create_campaign').effect("shake"/)
44
+ rendered.should include("$('#create_campaign').html")
45
+ rendered.should include(%Q/$('#create_campaign').effect("shake"/)
46
46
  end
47
47
  end
48
48
 
@@ -21,7 +21,7 @@ describe "/campaigns/destroy" do
21
21
  it "should update Campaigns sidebar" do
22
22
  rendered.should include("#sidebar")
23
23
  rendered.should have_text("Recent Items")
24
- rendered.should include(%Q/jQuery('#filters').effect('shake'/)
24
+ rendered.should include(%Q/$('#filters').effect('shake'/)
25
25
  end
26
26
 
27
27
  it "should update pagination" do
@@ -18,7 +18,7 @@ describe "/campaigns/edit" do
18
18
  params[:cancel] = "true"
19
19
 
20
20
  render
21
- rendered.should include("jQuery('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
21
+ rendered.should include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
22
22
  end
23
23
 
24
24
  it "cancel from campaign landing page: should hide [Edit Campaign] form" do
@@ -34,7 +34,7 @@ describe "/campaigns/edit" do
34
34
  assign(:previous, previous = FactoryGirl.create(:campaign, :user => current_user))
35
35
 
36
36
  render
37
- rendered.should include("jQuery('#campaign_#{previous.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{previous.id}\\'")
37
+ rendered.should include("$('#campaign_#{previous.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{previous.id}\\'")
38
38
  end
39
39
 
40
40
  it "edit: should remove previously open [Edit Campaign] if it's no longer available" do
@@ -51,14 +51,14 @@ describe "/campaigns/edit" do
51
51
  render
52
52
  rendered.should include(%Q/crm.highlight_off('campaign_#{@campaign.id}');/)
53
53
  rendered.should include("crm.hide_form('create_campaign')")
54
- rendered.should include("jQuery('#campaign_#{@campaign.id}').html")
54
+ rendered.should include("$('#campaign_#{@campaign.id}').html")
55
55
  end
56
56
 
57
57
  it "edit from campaign landing page: should show [Edit Campaign] form" do
58
58
  params[:cancel] = "false"
59
59
 
60
60
  render
61
- rendered.should include("jQuery('#edit_campaign').html")
61
+ rendered.should include("$('#edit_campaign').html")
62
62
  rendered.should include("crm.flip_form('edit_campaign')")
63
63
  end
64
64
 
@@ -17,7 +17,7 @@ describe "/campaigns/index" do
17
17
 
18
18
  render :template => 'campaigns/index', :formats => [:js]
19
19
 
20
- rendered.should include("jQuery('#campaigns').html('<li class=\\'campaign highlight\\' id=\\'campaign_42\\'")
20
+ rendered.should include("$('#campaigns').html('<li class=\\'campaign highlight\\' id=\\'campaign_42\\'")
21
21
  rendered.should include("#paginate")
22
22
  end
23
23
 
@@ -26,7 +26,7 @@ describe "/campaigns/index" do
26
26
 
27
27
  render :template => 'campaigns/index', :formats => [:js]
28
28
 
29
- rendered.should include("jQuery('#campaigns').html('<div id=\\'empty\\'>")
29
+ rendered.should include("$('#campaigns').html('<div id=\\'empty\\'>")
30
30
  rendered.should include("#paginate")
31
31
  end
32
32
 
@@ -25,7 +25,7 @@ describe "/campaigns/new" do
25
25
  params[:cancel] = nil
26
26
  render
27
27
 
28
- rendered.should include("jQuery('#create_campaign').html")
28
+ rendered.should include("$('#create_campaign').html")
29
29
  end
30
30
 
31
31
  it "should call JavaScript functions to load Calendar popup" do
@@ -31,7 +31,7 @@ describe "/campaigns/update" do
31
31
  rendered.should include("#sidebar")
32
32
  rendered.should have_text("Campaign Summary")
33
33
  rendered.should have_text("Recent Items")
34
- rendered.should include("jQuery('#summary').effect('shake'")
34
+ rendered.should include("$('#summary').effect('shake'")
35
35
  end
36
36
  end
37
37
 
@@ -42,8 +42,8 @@ describe "/campaigns/update" do
42
42
 
43
43
  it "should replace [Edit Campaign] with campaign partial and highlight it" do
44
44
  render
45
- rendered.should include("jQuery('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
46
- rendered.should include(%Q/jQuery('#campaign_#{@campaign.id}').effect("highlight"/)
45
+ rendered.should include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
46
+ rendered.should include(%Q/$('#campaign_#{@campaign.id}').effect("highlight"/)
47
47
  end
48
48
  end
49
49
  end # no errors
@@ -57,8 +57,8 @@ describe "/campaigns/update" do
57
57
 
58
58
  it "should redraw the [edit_campaign] form and shake it" do
59
59
  render
60
- rendered.should include("jQuery('#edit_campaign').html")
61
- rendered.should include(%Q/jQuery('#edit_campaign').effect("shake"/)
60
+ rendered.should include("$('#edit_campaign').html")
61
+ rendered.should include(%Q/$('#edit_campaign').effect("shake"/)
62
62
  rendered.should include('focus()')
63
63
  end
64
64
  end
@@ -71,8 +71,8 @@ describe "/campaigns/update" do
71
71
 
72
72
  it "should redraw the [edit_campaign] form and shake it" do
73
73
  render
74
- rendered.should include("jQuery('#campaign_#{@campaign.id}').html")
75
- rendered.should include(%Q/jQuery('#campaign_#{@campaign.id}').effect("shake"/)
74
+ rendered.should include("$('#campaign_#{@campaign.id}').html")
75
+ rendered.should include(%Q/$('#campaign_#{@campaign.id}').effect("shake"/)
76
76
  rendered.should include('focus()')
77
77
  end
78
78
  end
@@ -21,8 +21,8 @@ describe "/contacts/create" do
21
21
  it "should hide [Create Contact] form and insert contact partial" do
22
22
  render
23
23
 
24
- rendered.should include("jQuery('#contacts').prepend('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
25
- rendered.should include(%Q/jQuery('#contact_#{@contact.id}').effect("highlight"/)
24
+ rendered.should include("$('#contacts').prepend('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
25
+ rendered.should include(%Q/$('#contact_#{@contact.id}').effect("highlight"/)
26
26
  end
27
27
 
28
28
  it "should refresh sidebar when called from contacts index" do
@@ -57,8 +57,8 @@ describe "/contacts/create" do
57
57
 
58
58
  render
59
59
 
60
- rendered.should include("jQuery('#create_contact').html")
61
- rendered.should include(%Q/jQuery('#create_contact').effect("shake"/)
60
+ rendered.should include("$('#create_contact').html")
61
+ rendered.should include(%Q/$('#create_contact').effect("shake"/)
62
62
  end
63
63
  end
64
64