fat_free_crm 0.13.6 → 0.14.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.
- checksums.yaml +4 -4
- data/.rubocop.yml +5 -0
- data/.travis.yml +8 -5
- data/CHANGELOG +26 -0
- data/Gemfile +26 -26
- data/Gemfile.lock +280 -250
- data/Guardfile +0 -1
- data/README.md +7 -9
- data/Rakefile +1 -1
- data/app/assets/javascripts/application.js.erb +1 -0
- data/app/assets/javascripts/crm.js.coffee +6 -7
- data/app/assets/javascripts/search.js.coffee +7 -1
- data/app/assets/stylesheets/about.css.scss +10 -0
- data/app/assets/stylesheets/application.css.erb +2 -0
- data/app/assets/stylesheets/common.scss +1 -1
- data/app/controllers/admin/application_controller.rb +3 -3
- data/app/controllers/admin/field_groups_controller.rb +12 -7
- data/app/controllers/admin/fields_controller.rb +21 -17
- data/app/controllers/admin/groups_controller.rb +10 -4
- data/app/controllers/admin/plugins_controller.rb +1 -2
- data/app/controllers/admin/settings_controller.rb +1 -2
- data/app/controllers/admin/tags_controller.rb +10 -4
- data/app/controllers/admin/users_controller.rb +32 -12
- data/app/controllers/application_controller.rb +58 -38
- data/app/controllers/authentications_controller.rb +5 -8
- data/app/controllers/comments_controller.rb +15 -11
- data/app/controllers/emails_controller.rb +1 -2
- data/app/controllers/entities/accounts_controller.rb +20 -20
- data/app/controllers/entities/campaigns_controller.rb +25 -22
- data/app/controllers/entities/contacts_controller.rb +25 -24
- data/app/controllers/entities/leads_controller.rb +33 -31
- data/app/controllers/entities/opportunities_controller.rb +31 -28
- data/app/controllers/entities_controller.rb +26 -22
- data/app/controllers/home_controller.rb +18 -18
- data/app/controllers/lists_controller.rb +11 -7
- data/app/controllers/passwords_controller.rb +5 -6
- data/app/controllers/tasks_controller.rb +23 -18
- data/app/controllers/users_controller.rb +31 -7
- data/app/helpers/accounts_helper.rb +40 -42
- data/app/helpers/addresses_helper.rb +1 -3
- data/app/helpers/admin/application_helper.rb +4 -4
- data/app/helpers/admin/field_groups_helper.rb +5 -7
- data/app/helpers/admin/fields_helper.rb +2 -3
- data/app/helpers/admin/plugins_helper.rb +0 -1
- data/app/helpers/admin/settings_helper.rb +0 -1
- data/app/helpers/admin/tags_helper.rb +1 -1
- data/app/helpers/admin/users_helper.rb +16 -18
- data/app/helpers/application_helper.rb +127 -119
- data/app/helpers/authentications_helper.rb +0 -1
- data/app/helpers/campaigns_helper.rb +5 -7
- data/app/helpers/comments_helper.rb +0 -1
- data/app/helpers/contacts_helper.rb +0 -1
- data/app/helpers/home_helper.rb +14 -14
- data/app/helpers/javascript_helper.rb +30 -0
- data/app/helpers/leads_helper.rb +7 -7
- data/app/helpers/opportunities_helper.rb +8 -10
- data/app/helpers/passwords_helper.rb +0 -1
- data/app/helpers/tags_helper.rb +1 -3
- data/app/helpers/tasks_helper.rb +24 -26
- data/app/helpers/users_helper.rb +6 -7
- data/app/helpers/versions_helper.rb +3 -5
- data/app/inputs/date_pair_input.rb +6 -7
- data/app/inputs/date_time_input.rb +3 -4
- data/app/inputs/datetime_pair_input.rb +0 -1
- data/app/inputs/text_input.rb +2 -2
- data/app/mailers/dropbox_mailer.rb +4 -7
- data/app/mailers/subscription_mailer.rb +4 -5
- data/app/mailers/user_mailer.rb +7 -9
- data/app/models/entities/account.rb +31 -28
- data/app/models/entities/account_contact.rb +2 -1
- data/app/models/entities/account_opportunity.rb +1 -1
- data/app/models/entities/campaign.rb +22 -19
- data/app/models/entities/contact.rb +55 -53
- data/app/models/entities/contact_opportunity.rb +1 -1
- data/app/models/entities/lead.rb +49 -41
- data/app/models/entities/opportunity.rb +38 -38
- data/app/models/fields/custom_field.rb +21 -27
- data/app/models/fields/custom_field_date_pair.rb +7 -8
- data/app/models/fields/custom_field_datetime_pair.rb +0 -2
- data/app/models/fields/custom_field_pair.rb +8 -10
- data/app/models/fields/field.rb +29 -30
- data/app/models/fields/field_group.rb +4 -4
- data/app/models/list.rb +1 -1
- data/app/models/observers/entity_observer.rb +1 -1
- data/app/models/observers/lead_observer.rb +1 -1
- data/app/models/observers/opportunity_observer.rb +1 -1
- data/app/models/observers/task_observer.rb +1 -1
- data/app/models/polymorphic/address.rb +7 -7
- data/app/models/polymorphic/avatar.rb +8 -9
- data/app/models/polymorphic/comment.rb +16 -10
- data/app/models/polymorphic/email.rb +13 -6
- data/app/models/polymorphic/tag.rb +2 -2
- data/app/models/polymorphic/task.rb +45 -45
- data/{config/initializers/paper_trail.rb → app/models/polymorphic/version.rb} +26 -31
- data/app/models/setting.rb +12 -17
- data/app/models/users/ability.rb +5 -6
- data/app/models/users/authentication.rb +6 -5
- data/app/models/users/group.rb +1 -3
- data/app/models/users/permission.rb +3 -3
- data/app/models/users/preference.rb +7 -7
- data/app/models/users/user.rb +36 -43
- data/app/views/accounts/_top_section.html.haml +2 -2
- data/app/views/accounts/edit.js.haml +0 -1
- data/app/views/admin/fields/_field.html.haml +1 -1
- data/app/views/admin/tags/_tag.html.haml +1 -1
- data/app/views/admin/users/_user.html.haml +4 -4
- data/app/views/campaigns/_top_section.html.haml +1 -1
- data/app/views/campaigns/edit.js.haml +0 -2
- data/app/views/contacts/_top_section.html.haml +1 -1
- data/app/views/contacts/edit.js.haml +0 -1
- data/app/views/entities/_basic_search.html.haml +1 -1
- data/app/views/home/_account.html.haml +2 -2
- data/app/views/home/_opportunity.html.haml +2 -2
- data/app/views/layouts/_about.html.haml +1 -1
- data/app/views/leads/_top_section.html.haml +1 -1
- data/app/views/leads/edit.js.haml +0 -2
- data/app/views/lists/_sidebar.html.haml +1 -1
- data/app/views/opportunities/_top_section.html.haml +2 -2
- data/app/views/opportunities/edit.js.haml +0 -1
- data/app/views/shared/_tags.html.haml +2 -1
- data/app/views/tasks/_edit.html.haml +2 -3
- data/app/views/tasks/_top_section.html.haml +1 -1
- data/app/views/users/_user.html.haml +2 -1
- data/app/views/users/opportunities_overview.html.haml +2 -2
- data/bin/bundle +3 -0
- data/bin/rails +4 -0
- data/bin/rake +4 -0
- data/config/application.rb +16 -33
- data/config/boot.rb +1 -1
- data/config/database.mysql.mac.yml +1 -0
- data/config/database.mysql.yml +1 -0
- data/config/database.postgres.docker.yml +1 -1
- data/config/database.postgres.yml +1 -0
- data/config/database.sqlite.yml +1 -0
- data/config/deploy.example.rb +3 -5
- data/config/environments/development.rb +13 -14
- data/config/environments/production.rb +8 -7
- data/config/environments/staging.rb +43 -41
- data/config/environments/test.rb +12 -14
- data/config/initializers/assets.rb +14 -0
- data/config/initializers/backtrace_silencers.rb +7 -0
- data/config/initializers/cookies_serializer.rb +3 -0
- data/config/initializers/custom_field_ransack_translations.rb +1 -1
- data/config/initializers/filter_parameter_logging.rb +4 -0
- data/config/initializers/inflections.rb +16 -0
- data/config/initializers/mime_types.rb +0 -1
- data/config/initializers/paginate_arrays.rb +0 -1
- data/config/initializers/ransack.rb +5 -5
- data/config/initializers/session_store.rb +5 -0
- data/config/initializers/simple_form.rb +1 -1
- data/config/initializers/views.rb +33 -33
- data/config/initializers/wrap_parameters.rb +14 -0
- data/config/locales/cz_fat_free_crm.yml +1 -1
- data/config/locales/de_fat_free_crm.yml +2 -2
- data/config/locales/en-GB_fat_free_crm.yml +2 -3
- data/config/locales/en-US_fat_free_crm.yml +2 -3
- data/config/locales/en.yml +23 -0
- data/config/locales/es-CL.yml +227 -0
- data/config/locales/es-CL_fat_free_crm.yml +929 -0
- data/config/locales/es-CL_ransack.yml +91 -0
- data/config/locales/es.yml +53 -59
- data/config/locales/es_fat_free_crm.yml +708 -370
- data/config/locales/es_ransack.yml +91 -0
- data/config/locales/fr-CA_fat_free_crm.yml +7 -7
- data/config/locales/fr_fat_free_crm.yml +285 -81
- data/config/locales/it_fat_free_crm.yml +1 -1
- data/config/locales/ja_fat_free_crm.yml +1 -1
- data/config/locales/nl.yml +210 -0
- data/config/locales/nl_fat_free_crm.yml +920 -0
- data/config/locales/nl_ransack.yml +91 -0
- data/config/locales/pl_fat_free_crm.yml +1 -1
- data/config/locales/pt-BR_fat_free_crm.yml +111 -38
- data/config/locales/ru_fat_free_crm.yml +3 -4
- data/config/locales/sv-SE_fat_free_crm.yml +1 -1
- data/config/locales/th.rb +157 -158
- data/config/locales/th_fat_free_crm.yml +1 -1
- data/config/locales/zh-CN_fat_free_crm.yml +3 -4
- data/config/routes.rb +93 -94
- data/config/unicorn.rb +25 -2
- data/custom_plan.rb +0 -2
- data/db/demo/accounts.yml +4 -5
- data/db/demo/addresses.yml +5 -5
- data/db/demo/campaigns.yml +2 -2
- data/db/demo/comments.yml +1 -1
- data/db/demo/contacts.yml +8 -8
- data/db/demo/emails.yml +5 -5
- data/db/demo/leads.yml +10 -10
- data/db/demo/opportunities.yml +2 -2
- data/db/demo/tasks.yml +2 -2
- data/db/demo/users.yml +12 -16
- data/db/migrate/20100928030598_create_sessions.rb +1 -2
- data/db/migrate/20100928030599_create_users.rb +24 -25
- data/db/migrate/20100928030600_create_openid_tables.rb +11 -12
- data/db/migrate/20100928030601_create_accounts.rb +14 -15
- data/db/migrate/20100928030602_create_permissions.rb +2 -3
- data/db/migrate/20100928030603_create_settings.rb +4 -5
- data/db/migrate/20100928030604_create_preferences.rb +3 -4
- data/db/migrate/20100928030605_create_campaigns.rb +19 -20
- data/db/migrate/20100928030606_create_leads.rb +26 -27
- data/db/migrate/20100928030607_create_contacts.rb +26 -27
- data/db/migrate/20100928030608_create_opportunities.rb +15 -16
- data/db/migrate/20100928030609_create_account_contacts.rb +2 -3
- data/db/migrate/20100928030610_create_account_opportunities.rb +2 -3
- data/db/migrate/20100928030611_create_contact_opportunities.rb +3 -4
- data/db/migrate/20100928030612_create_tasks.rb +14 -15
- data/db/migrate/20100928030613_create_comments.rb +6 -7
- data/db/migrate/20100928030614_create_activities.rb +6 -7
- data/db/migrate/20100928030615_create_avatars.rb +5 -6
- data/db/migrate/20100928030616_rename_remember_token.rb +0 -1
- data/db/migrate/20100928030617_drop_openid_tables.rb +11 -11
- data/db/migrate/20100928030618_add_admin_to_users.rb +1 -2
- data/db/migrate/20100928030619_add_suspended_to_users.rb +0 -1
- data/db/migrate/20100928030620_remove_uuid.rb +3 -3
- data/db/migrate/20100928030621_add_email_to_accounts.rb +1 -2
- data/db/migrate/20100928030622_add_background_info_to_models.rb +0 -1
- data/db/migrate/20100928030623_create_addresses.rb +14 -16
- data/db/migrate/20100928030624_add_index_on_permissions.rb +2 -3
- data/db/migrate/20100928030625_create_emails.rb +15 -16
- data/db/migrate/20100928030626_add_state_to_timeline_objects.rb +2 -3
- data/db/migrate/20100928030627_acts_as_taggable_on_migration.rb +2 -3
- data/db/migrate/20101221123456_add_single_access_token_to_users.rb +0 -1
- data/db/migrate/20101221345678_add_rating_and_category_to_accounts.rb +2 -3
- data/db/migrate/20110719082054_add_skype_to_contacts_and_leads.rb +2 -3
- data/db/migrate/20111101083437_create_fields.rb +14 -15
- data/db/migrate/20111101090312_create_field_groups.rb +4 -5
- data/db/migrate/20111116091952_add_field_groups_tag_id.rb +0 -1
- data/db/migrate/20111117041311_change_fields_collection_to_text.rb +0 -1
- data/db/migrate/20111201030535_add_field_groups_klass_name.rb +4 -4
- data/db/migrate/20120121054235_create_lists.rb +1 -1
- data/db/migrate/20120216031616_create_versions.rb +5 -5
- data/db/migrate/20120216042541_is_paranoid_to_paper_trail.rb +1 -3
- data/db/migrate/20120224073107_remove_default_value_and_clear_settings.rb +1 -1
- data/db/migrate/20120316045804_activities_to_versions.rb +6 -6
- data/db/migrate/20120405080727_change_subscribed_users_to_set.rb +5 -5
- data/db/migrate/20120405080742_change_further_subscribed_users_to_set.rb +5 -5
- data/db/migrate/20120406082136_create_groups.rb +1 -1
- data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb +2 -1
- data/db/migrate/20120528102124_increase_length_of_version_events.rb +2 -2
- data/db/migrate/20121003063155_add_settings_to_custom_fields.rb +1 -1
- data/db/migrate/20121221033947_fix_country_mapping.rb +0 -1
- data/db/migrate/20131207033244_add_user_id_to_lists.rb +1 -1
- data/db/migrate/20141126031837_increase_email_to254_chars.rb +14 -14
- data/db/migrate/20141230021159_add_transaction_id_column_to_versions.rb +11 -0
- data/db/migrate/20141230205453_add_missing_unique_indices.acts_as_taggable_on_engine.rb +20 -0
- data/db/migrate/20141230205454_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +15 -0
- data/db/migrate/20141230205455_add_missing_taggable_index.acts_as_taggable_on_engine.rb +10 -0
- data/db/migrate/20150123060900_convert_radio_to_radio_buttons.rb +10 -0
- data/db/migrate/20150227123054_remove_last_request_at_from_users.rb +5 -0
- data/db/migrate/20150427131956_create_index_related_type.rb +9 -0
- data/db/migrate/20160511053730_add_account_contacts_index.rb +5 -0
- data/db/schema.rb +236 -228
- data/db/seeds.rb +1 -2
- data/db/seeds/fields.rb +36 -37
- data/{fig.yml → docker-compose.yml} +0 -0
- data/fat_free_crm.gemspec +31 -18
- data/lib/development_tasks/license.rake +29 -29
- data/lib/fat_free_crm.rb +1 -5
- data/lib/fat_free_crm/callback.rb +28 -20
- data/lib/fat_free_crm/comment_extensions.rb +1 -1
- data/lib/fat_free_crm/core_ext.rb +1 -1
- data/lib/fat_free_crm/core_ext/nil.rb +0 -3
- data/lib/fat_free_crm/core_ext/string.rb +7 -21
- data/lib/fat_free_crm/custom_fields.rb +2 -2
- data/lib/fat_free_crm/engine.rb +14 -0
- data/lib/fat_free_crm/errors.rb +0 -2
- data/lib/fat_free_crm/exceptions.rb +3 -4
- data/lib/fat_free_crm/export_csv.rb +0 -2
- data/lib/fat_free_crm/exportable.rb +5 -7
- data/lib/fat_free_crm/fields.rb +7 -8
- data/lib/fat_free_crm/gem_dependencies.rb +4 -1
- data/lib/fat_free_crm/gem_ext/active_record/schema_dumper.rb +2 -2
- data/lib/fat_free_crm/gem_ext/active_support/buffered_logger.rb +0 -3
- data/lib/fat_free_crm/gem_ext/rails/engine.rb +5 -12
- data/lib/fat_free_crm/gem_ext/rake/task.rb +1 -1
- data/lib/fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper.rb +1 -2
- data/lib/fat_free_crm/i18n.rb +2 -3
- data/lib/fat_free_crm/load_settings.rb +0 -2
- data/lib/fat_free_crm/mail_processor/base.rb +15 -16
- data/lib/fat_free_crm/mail_processor/comment_replies.rb +5 -10
- data/lib/fat_free_crm/mail_processor/dropbox.rb +56 -59
- data/lib/fat_free_crm/permissions.rb +18 -15
- data/lib/fat_free_crm/renderers.rb +2 -2
- data/lib/fat_free_crm/secret_token_generator.rb +3 -9
- data/lib/fat_free_crm/sortable.rb +4 -8
- data/lib/fat_free_crm/version.rb +2 -2
- data/lib/fat_free_crm/view_factory.rb +3 -8
- data/lib/gravatar_image_tag.rb +19 -24
- data/lib/missing_translation_detector.rb +10 -10
- data/lib/tasks/ffcrm/comment_replies.rake +3 -5
- data/lib/tasks/ffcrm/config.rake +3 -5
- data/lib/tasks/ffcrm/demo.rake +14 -16
- data/lib/tasks/ffcrm/dropbox.rake +3 -5
- data/lib/tasks/ffcrm/missing_translations.rake +1 -1
- data/lib/tasks/ffcrm/secret.rake +1 -3
- data/lib/tasks/ffcrm/settings.rake +2 -4
- data/lib/tasks/ffcrm/setup.rake +3 -6
- data/lib/tasks/ffcrm/update_data.rake +110 -116
- data/spec/controllers/admin/groups_controller_spec.rb +0 -1
- data/spec/controllers/admin/users_controller_spec.rb +98 -102
- data/spec/controllers/applications_controller_spec.rb +17 -21
- data/spec/controllers/authentications_controller_spec.rb +57 -61
- data/spec/controllers/comments_controller_spec.rb +32 -39
- data/spec/controllers/emails_controller_spec.rb +6 -7
- data/spec/controllers/entities/accounts_controller_spec.rb +204 -214
- data/spec/controllers/entities/campaigns_controller_spec.rb +210 -224
- data/spec/controllers/entities/contacts_controller_spec.rb +250 -270
- data/spec/controllers/entities/leads_controller_spec.rb +415 -438
- data/spec/controllers/entities/opportunities_controller_spec.rb +344 -359
- data/spec/controllers/entities_controller_spec.rb +10 -14
- data/spec/controllers/home_controller_spec.rb +85 -92
- data/spec/controllers/lists_controller_spec.rb +0 -1
- data/spec/controllers/passwords_controller_spec.rb +5 -9
- data/spec/controllers/tasks_controller_spec.rb +193 -210
- data/spec/controllers/users_controller_spec.rb +137 -146
- data/spec/factories/account_factories.rb +11 -13
- data/spec/factories/campaign_factories.rb +6 -6
- data/spec/factories/contact_factories.rb +21 -22
- data/spec/factories/field_factories.rb +8 -10
- data/spec/factories/lead_factories.rb +16 -16
- data/spec/factories/list_factories.rb +2 -2
- data/spec/factories/opportunity_factories.rb +8 -10
- data/spec/factories/sequences.rb +8 -9
- data/spec/factories/setting_factories.rb +2 -2
- data/spec/factories/shared_factories.rb +26 -30
- data/spec/factories/tag_factories.rb +1 -1
- data/spec/factories/task_factories.rb +11 -11
- data/spec/factories/user_factories.rb +22 -27
- data/spec/features/acceptance_helper.rb +1 -1
- data/spec/features/accounts_spec.rb +65 -61
- data/spec/features/admin/groups_spec.rb +11 -12
- data/spec/features/admin/users_spec.rb +17 -19
- data/spec/features/campaigns_spec.rb +61 -57
- data/spec/features/contacts_spec.rb +90 -59
- data/spec/features/dashboard_spec.rb +20 -21
- data/spec/features/leads_spec.rb +88 -67
- data/spec/features/opportunities_overview_spec.rb +31 -31
- data/spec/features/opportunities_spec.rb +64 -60
- data/spec/features/support/browser.rb +2 -2
- data/spec/features/support/headless.rb +1 -1
- data/spec/features/support/helpers.rb +5 -6
- data/spec/features/support/paths.rb +1 -2
- data/spec/features/support/selector_helpers.rb +2 -2
- data/spec/features/tasks_spec.rb +60 -54
- data/spec/helpers/accounts_helper_spec.rb +2 -5
- data/spec/helpers/admin/field_groups_helper_spec.rb +4 -4
- data/spec/helpers/admin/plugins_helper_spec.rb +0 -1
- data/spec/helpers/admin/settings_helper_spec.rb +0 -1
- data/spec/helpers/admin/users_helper_spec.rb +0 -1
- data/spec/helpers/application_helper_spec.rb +30 -33
- data/spec/helpers/authentications_helper_spec.rb +2 -5
- data/spec/helpers/campaigns_helper_spec.rb +2 -5
- data/spec/helpers/comments_helper_spec.rb +2 -5
- data/spec/helpers/contacts_helper_spec.rb +2 -5
- data/spec/helpers/emails_helper_spec.rb +0 -1
- data/spec/helpers/fields_helper_spec.rb +0 -1
- data/spec/helpers/groups_helper_spec.rb +0 -1
- data/spec/helpers/home_helper_spec.rb +2 -5
- data/spec/helpers/leads_helper_spec.rb +2 -5
- data/spec/helpers/lists_helper_spec.rb +0 -1
- data/spec/helpers/opportunities_helper_spec.rb +2 -5
- data/spec/helpers/passwords_helper_spec.rb +2 -5
- data/spec/helpers/tasks_helper_spec.rb +1 -5
- data/spec/helpers/users_helper_spec.rb +9 -11
- data/spec/lib/comment_extensions_spec.rb +3 -3
- data/spec/lib/core_ext/string_spec.rb +1 -1
- data/spec/lib/errors_spec.rb +10 -10
- data/spec/lib/fields_spec.rb +23 -33
- data/spec/lib/mail_processor/base_spec.rb +41 -43
- data/spec/lib/mail_processor/comment_replies_spec.rb +17 -17
- data/spec/lib/mail_processor/dropbox_spec.rb +91 -95
- data/spec/lib/mail_processor/sample_emails/dropbox.rb +13 -14
- data/spec/lib/permissions_spec.rb +44 -47
- data/spec/lib/secret_token_generator_spec.rb +16 -28
- data/spec/lib/view_factory_spec.rb +18 -24
- data/spec/mailers/subscription_mailer_spec.rb +14 -16
- data/spec/mailers/user_mailer_spec.rb +33 -34
- data/spec/models/entities/account_contact_spec.rb +2 -3
- data/spec/models/entities/account_opportunity_spec.rb +2 -3
- data/spec/models/entities/account_spec.rb +52 -59
- data/spec/models/entities/campaign_spec.rb +32 -39
- data/spec/models/entities/contact_opportunity_spec.rb +2 -3
- data/spec/models/entities/contact_spec.rb +71 -72
- data/spec/models/entities/lead_spec.rb +15 -22
- data/spec/models/entities/opportunity_spec.rb +104 -103
- data/spec/models/fields/custom_field_date_pair_spec.rb +38 -44
- data/spec/models/fields/custom_field_pair_spec.rb +28 -36
- data/spec/models/fields/custom_field_spec.rb +50 -56
- data/spec/models/fields/field_group_spec.rb +1 -2
- data/spec/models/fields/field_spec.rb +13 -15
- data/spec/models/list_spec.rb +4 -4
- data/spec/models/observers/entity_observer_spec.rb +18 -21
- data/spec/models/polymorphic/address_spec.rb +1 -3
- data/spec/models/polymorphic/avatar_spec.rb +6 -8
- data/spec/models/polymorphic/comment_spec.rb +7 -9
- data/spec/models/polymorphic/email_spec.rb +1 -2
- data/spec/models/polymorphic/task_spec.rb +130 -142
- data/spec/models/polymorphic/version_spec.rb +84 -91
- data/spec/models/setting_spec.rb +17 -19
- data/spec/models/users/abilities/user_ability_spec.rb +25 -20
- data/spec/models/users/authentication_spec.rb +0 -1
- data/spec/models/users/group_spec.rb +0 -1
- data/spec/models/users/permission_spec.rb +12 -13
- data/spec/models/users/preference_spec.rb +15 -15
- data/spec/models/users/user_spec.rb +53 -55
- data/spec/routing/accounts_routing_spec.rb +12 -14
- data/spec/routing/admin/users_routing_spec.rb +7 -9
- data/spec/routing/campaigns_routing_spec.rb +13 -14
- data/spec/routing/comments_routing_spec.rb +5 -6
- data/spec/routing/contacts_routing_spec.rb +12 -14
- data/spec/routing/emails_routing_spec.rb +7 -8
- data/spec/routing/leads_routing_spec.rb +19 -21
- data/spec/routing/opportunities_routing_spec.rb +13 -15
- data/spec/routing/tasks_routing_spec.rb +14 -15
- data/spec/routing/users_routing_spec.rb +18 -19
- data/spec/shared/controllers.rb +35 -35
- data/spec/shared/models.rb +52 -55
- data/spec/spec_helper.rb +21 -42
- data/spec/support/assert_select.rb +19 -18
- data/spec/support/auth_macros.rb +3 -3
- data/spec/support/macros.rb +5 -6
- data/spec/support/mail_processor_mocks.rb +11 -11
- data/spec/views/accounts/_edit.haml_spec.rb +9 -9
- data/spec/views/accounts/_new.haml_spec.rb +8 -9
- data/spec/views/accounts/create.js.haml_spec.rb +11 -12
- data/spec/views/accounts/destroy.js.haml_spec.rb +6 -7
- data/spec/views/accounts/edit.js.haml_spec.rb +12 -13
- data/spec/views/accounts/index.haml_spec.rb +8 -8
- data/spec/views/accounts/index.js.haml_spec.rb +7 -8
- data/spec/views/accounts/new.js.haml_spec.rb +7 -8
- data/spec/views/accounts/show.haml_spec.rb +11 -12
- data/spec/views/accounts/update.js.haml_spec.rb +18 -18
- data/spec/views/admin/field_groups/create.js.haml_spec.rb +8 -10
- data/spec/views/admin/field_groups/destroy.js.haml_spec.rb +7 -9
- data/spec/views/admin/field_groups/edit.js.haml_spec.rb +5 -7
- data/spec/views/admin/field_groups/new.js.haml_spec.rb +6 -8
- data/spec/views/admin/field_groups/update.js.haml_spec.rb +7 -9
- data/spec/views/admin/users/_create.haml_spec.rb +4 -4
- data/spec/views/admin/users/create.js.haml_spec.rb +8 -9
- data/spec/views/admin/users/destroy.js.haml_spec.rb +6 -6
- data/spec/views/admin/users/edit.js.haml_spec.rb +7 -9
- data/spec/views/admin/users/index.haml_spec.rb +4 -5
- data/spec/views/admin/users/index.js.haml_spec.rb +6 -8
- data/spec/views/admin/users/new.js.haml_spec.rb +4 -6
- data/spec/views/admin/users/reactivate.js.haml_spec.rb +4 -4
- data/spec/views/admin/users/show.haml_spec.rb +0 -1
- data/spec/views/admin/users/suspend.js.haml_spec.rb +4 -4
- data/spec/views/admin/users/update.js.haml_spec.rb +6 -7
- data/spec/views/application/auto_complete.haml_spec.rb +12 -14
- data/spec/views/authentications/new.haml_spec.rb +6 -7
- data/spec/views/campaigns/_edit.haml_spec.rb +9 -9
- data/spec/views/campaigns/_new.haml_spec.rb +8 -8
- data/spec/views/campaigns/create.js.haml_spec.rb +11 -12
- data/spec/views/campaigns/destroy.js.haml_spec.rb +7 -8
- data/spec/views/campaigns/edit.js.haml_spec.rb +12 -20
- data/spec/views/campaigns/index.haml_spec.rb +6 -7
- data/spec/views/campaigns/index.js.haml_spec.rb +9 -10
- data/spec/views/campaigns/new.js.haml_spec.rb +7 -8
- data/spec/views/campaigns/show.haml_spec.rb +12 -13
- data/spec/views/campaigns/update.js.haml_spec.rb +16 -16
- data/spec/views/comments/edit.js.haml_spec.rb +7 -7
- data/spec/views/contacts/_edit.haml_spec.rb +21 -21
- data/spec/views/contacts/_new.haml_spec.rb +12 -13
- data/spec/views/contacts/create.js.haml_spec.rb +12 -13
- data/spec/views/contacts/destroy.js.haml_spec.rb +6 -7
- data/spec/views/contacts/edit.js.haml_spec.rb +15 -17
- data/spec/views/contacts/index.haml_spec.rb +6 -7
- data/spec/views/contacts/index.js.html_spec.rb +7 -8
- data/spec/views/contacts/new.js.haml_spec.rb +8 -9
- data/spec/views/contacts/show.haml_spec.rb +9 -10
- data/spec/views/contacts/update.js.haml_spec.rb +26 -26
- data/spec/views/home/index.haml_spec.rb +4 -5
- data/spec/views/home/index.js.haml_spec.rb +6 -7
- data/spec/views/home/options.js.haml_spec.rb +10 -10
- data/spec/views/leads/_convert.haml_spec.rb +5 -6
- data/spec/views/leads/_edit.haml_spec.rb +13 -13
- data/spec/views/leads/_new.haml_spec.rb +11 -11
- data/spec/views/leads/_sidebar_show.haml_spec.rb +9 -9
- data/spec/views/leads/convert.js.haml_spec.rb +16 -17
- data/spec/views/leads/create.js.haml_spec.rb +16 -17
- data/spec/views/leads/destroy.js.haml_spec.rb +10 -11
- data/spec/views/leads/edit.js.haml_spec.rb +16 -17
- data/spec/views/leads/index.haml_spec.rb +7 -8
- data/spec/views/leads/index.js.haml_spec.rb +10 -11
- data/spec/views/leads/new.js.haml_spec.rb +8 -9
- data/spec/views/leads/promote.js.haml_spec.rb +30 -31
- data/spec/views/leads/reject.js.haml_spec.rb +10 -11
- data/spec/views/leads/show.haml_spec.rb +7 -8
- data/spec/views/leads/update.js.haml_spec.rb +28 -29
- data/spec/views/opportunities/_edit.haml_spec.rb +19 -19
- data/spec/views/opportunities/_new.haml_spec.rb +10 -10
- data/spec/views/opportunities/create.js.haml_spec.rb +19 -20
- data/spec/views/opportunities/destroy.js.haml_spec.rb +14 -15
- data/spec/views/opportunities/edit.js.haml_spec.rb +14 -16
- data/spec/views/opportunities/index.haml_spec.rb +6 -7
- data/spec/views/opportunities/index.js.haml_spec.rb +7 -8
- data/spec/views/opportunities/new.js.haml_spec.rb +8 -9
- data/spec/views/opportunities/show.haml_spec.rb +9 -10
- data/spec/views/opportunities/update.js.haml_spec.rb +35 -35
- data/spec/views/tasks/_edit.haml_spec.rb +9 -9
- data/spec/views/tasks/complete.js.haml_spec.rb +11 -12
- data/spec/views/tasks/create.js.haml_spec.rb +29 -31
- data/spec/views/tasks/destroy.js.haml_spec.rb +8 -8
- data/spec/views/tasks/edit.js.haml_spec.rb +12 -15
- data/spec/views/tasks/index.haml_spec.rb +7 -7
- data/spec/views/tasks/new.js.haml_spec.rb +7 -8
- data/spec/views/tasks/uncomplete.js.haml_spec.rb +6 -6
- data/spec/views/tasks/update.js.haml_spec.rb +41 -44
- data/spec/views/users/avatar.js.haml_spec.rb +7 -8
- data/spec/views/users/change_password.js.haml_spec.rb +9 -10
- data/spec/views/users/edit.js.haml_spec.rb +7 -8
- data/spec/views/users/password.js.haml_spec.rb +8 -9
- data/spec/views/users/update.js.haml_spec.rb +6 -7
- data/spec/views/users/upload_avatar.js.haml_spec.rb +9 -9
- data/vendor/assets/javascripts/jquery_timeago/index.js +2 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.es-CL.js +18 -0
- data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.nl.js +20 -0
- data/vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-es-CL.js +20 -0
- data/vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-es-CL.js +23 -0
- data/vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-nl.js +21 -0
- data/vendor/assets/stylesheets/{jquery-ui.custom.css → jquery-ui.custom.scss} +52 -51
- data/vendor/gems/globby-0.1.2/LICENSE.txt +20 -0
- data/vendor/gems/globby-0.1.2/README.md +65 -0
- data/vendor/gems/globby-0.1.2/Rakefile +9 -0
- data/vendor/gems/globby-0.1.2/lib/globby.rb +47 -0
- data/vendor/gems/globby-0.1.2/lib/globby/glob.rb +90 -0
- data/vendor/gems/globby-0.1.2/lib/globby/globject.rb +18 -0
- data/vendor/gems/globby-0.1.2/lib/globby/result.rb +20 -0
- data/vendor/gems/globby-0.1.2/spec/gitignore_spec.rb +109 -0
- data/vendor/gems/globby-0.1.2/spec/globby_spec.rb +93 -0
- metadata +177 -55
- data/Gemfile.ci +0 -13
- data/config/initializers/sass.rb +0 -18
- data/lib/country_select.rb +0 -570
- data/lib/fat_free_crm/plugin.rb +0 -94
@@ -11,16 +11,16 @@ describe "/leads/new" do
|
|
11
11
|
before do
|
12
12
|
login_and_assign
|
13
13
|
@campaign = FactoryGirl.create(:campaign)
|
14
|
-
assign(:lead, Lead.new(:
|
15
|
-
assign(:users, [
|
14
|
+
assign(:lead, Lead.new(user: current_user))
|
15
|
+
assign(:users, [current_user])
|
16
16
|
assign(:campaign, @campaign)
|
17
|
-
assign(:campaigns, [
|
17
|
+
assign(:campaigns, [@campaign])
|
18
18
|
end
|
19
19
|
|
20
20
|
it "should toggle empty message div if it exists" do
|
21
21
|
render
|
22
22
|
|
23
|
-
rendered.
|
23
|
+
expect(rendered).to include("crm.flick('empty', 'toggle')")
|
24
24
|
end
|
25
25
|
|
26
26
|
describe "new lead" do
|
@@ -28,8 +28,8 @@ describe "/leads/new" do
|
|
28
28
|
params[:cancel] = nil
|
29
29
|
render
|
30
30
|
|
31
|
-
rendered.
|
32
|
-
rendered.
|
31
|
+
expect(rendered).to include("$('#create_lead').html")
|
32
|
+
expect(rendered).to include("crm.flip_form('create_lead')")
|
33
33
|
end
|
34
34
|
end
|
35
35
|
|
@@ -38,9 +38,8 @@ describe "/leads/new" do
|
|
38
38
|
params[:cancel] = "true"
|
39
39
|
render
|
40
40
|
|
41
|
-
rendered.
|
42
|
-
rendered.
|
41
|
+
expect(rendered).not_to include("#create_lead")
|
42
|
+
expect(rendered).to include("crm.flip_form('create_lead');")
|
43
43
|
end
|
44
44
|
end
|
45
|
-
|
46
45
|
end
|
@@ -8,9 +8,9 @@ require 'spec_helper'
|
|
8
8
|
describe "/leads/promote" do
|
9
9
|
before do
|
10
10
|
login_and_assign
|
11
|
-
assign(:users, [
|
11
|
+
assign(:users, [current_user])
|
12
12
|
assign(:account, @account = FactoryGirl.create(:account))
|
13
|
-
assign(:accounts, [
|
13
|
+
assign(:accounts, [@account])
|
14
14
|
assign(:contact, FactoryGirl.create(:contact))
|
15
15
|
assign(:opportunity, FactoryGirl.create(:opportunity))
|
16
16
|
assign(:lead_status_total, Hash.new(1))
|
@@ -18,7 +18,7 @@ describe "/leads/promote" do
|
|
18
18
|
|
19
19
|
describe "no errors :" do
|
20
20
|
before do
|
21
|
-
assign(:lead, @lead = FactoryGirl.create(:lead, :
|
21
|
+
assign(:lead, @lead = FactoryGirl.create(:lead, status: "converted", user: current_user, assignee: current_user))
|
22
22
|
end
|
23
23
|
|
24
24
|
describe "from lead landing page -" do
|
@@ -28,16 +28,16 @@ describe "/leads/promote" do
|
|
28
28
|
|
29
29
|
it "should flip [Convert Lead] form" do
|
30
30
|
render
|
31
|
-
rendered.
|
32
|
-
rendered.
|
31
|
+
expect(rendered).not_to include("lead_#{@lead.id}")
|
32
|
+
expect(rendered).to include("crm.flip_form('convert_lead'")
|
33
33
|
end
|
34
34
|
|
35
35
|
it "should update sidebar" do
|
36
36
|
render
|
37
|
-
rendered.
|
38
|
-
rendered.
|
39
|
-
rendered.
|
40
|
-
rendered.
|
37
|
+
expect(rendered).to include("#sidebar")
|
38
|
+
expect(rendered).to have_text("Lead Summary")
|
39
|
+
expect(rendered).to have_text("Recent Items")
|
40
|
+
expect(rendered).to include("$('#summary').effect('shake'")
|
41
41
|
end
|
42
42
|
end
|
43
43
|
|
@@ -48,16 +48,16 @@ describe "/leads/promote" do
|
|
48
48
|
|
49
49
|
it "should replace [Convert Lead] with lead partial and highlight it" do
|
50
50
|
render
|
51
|
-
rendered.
|
52
|
-
rendered.
|
51
|
+
expect(rendered).to include("$('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
|
52
|
+
expect(rendered).to include("$('#filters').effect('shake'")
|
53
53
|
end
|
54
54
|
|
55
55
|
it "should update sidebar" do
|
56
56
|
render
|
57
|
-
rendered.
|
58
|
-
rendered.
|
59
|
-
rendered.
|
60
|
-
rendered.
|
57
|
+
expect(rendered).to include("#sidebar")
|
58
|
+
expect(rendered).to have_text("Lead Status")
|
59
|
+
expect(rendered).to have_text("Recent Items")
|
60
|
+
expect(rendered).to include("$('#filters').effect('shake'")
|
61
61
|
end
|
62
62
|
end
|
63
63
|
|
@@ -71,30 +71,29 @@ describe "/leads/promote" do
|
|
71
71
|
|
72
72
|
it "should replace [Convert Lead] with lead partial and highlight it" do
|
73
73
|
render
|
74
|
-
rendered.
|
75
|
-
rendered.
|
74
|
+
expect(rendered).to include("$('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
|
75
|
+
expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("highlight"/)
|
76
76
|
end
|
77
77
|
|
78
78
|
it "should update campaign sidebar" do
|
79
79
|
render
|
80
80
|
|
81
|
-
rendered.
|
82
|
-
rendered.
|
83
|
-
rendered.
|
81
|
+
expect(rendered).to include("#sidebar")
|
82
|
+
expect(rendered).to have_text("Summary")
|
83
|
+
expect(rendered).to have_text("Recent Items")
|
84
84
|
end
|
85
85
|
|
86
86
|
it "should insert new opportunity if any" do
|
87
87
|
render
|
88
88
|
|
89
|
-
rendered.
|
89
|
+
expect(rendered).to include("$('#opportunities').prepend('<li class=\\'highlight opportunity\\' id=\\'opportunity_#{@opportunity.id}")
|
90
90
|
end
|
91
|
-
|
92
91
|
end
|
93
92
|
end # no errors
|
94
93
|
|
95
94
|
describe "validation errors:" do
|
96
95
|
before do
|
97
|
-
assign(:lead, @lead = FactoryGirl.create(:lead, :
|
96
|
+
assign(:lead, @lead = FactoryGirl.create(:lead, status: "new", user: current_user, assignee: current_user))
|
98
97
|
end
|
99
98
|
|
100
99
|
describe "from lead landing page -" do
|
@@ -104,8 +103,8 @@ describe "/leads/promote" do
|
|
104
103
|
|
105
104
|
it "should redraw the [Convert Lead] form and shake it" do
|
106
105
|
render
|
107
|
-
rendered.
|
108
|
-
rendered.
|
106
|
+
expect(rendered).to include("$('#convert_lead').html")
|
107
|
+
expect(rendered).to include(%/$('#convert_lead').effect("shake"/)
|
109
108
|
end
|
110
109
|
end
|
111
110
|
|
@@ -116,8 +115,8 @@ describe "/leads/promote" do
|
|
116
115
|
|
117
116
|
it "should redraw the [Convert Lead] form and shake it" do
|
118
117
|
render
|
119
|
-
rendered.
|
120
|
-
rendered.
|
118
|
+
expect(rendered).to include("$('#lead_#{@lead.id}').html")
|
119
|
+
expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("shake"/)
|
121
120
|
end
|
122
121
|
end
|
123
122
|
|
@@ -128,15 +127,15 @@ describe "/leads/promote" do
|
|
128
127
|
|
129
128
|
it "should redraw the [Convert Lead] form and shake it" do
|
130
129
|
render
|
131
|
-
rendered.
|
132
|
-
rendered.
|
130
|
+
expect(rendered).to include("$('#lead_#{@lead.id}').html")
|
131
|
+
expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("shake"/)
|
133
132
|
end
|
134
133
|
end
|
135
134
|
|
136
135
|
it "should handle new or existing account and set up calendar field" do
|
137
136
|
render
|
138
|
-
rendered.
|
139
|
-
rendered.
|
137
|
+
expect(rendered).to include("crm.create_or_select_account")
|
138
|
+
expect(rendered).to include('focus()')
|
140
139
|
end
|
141
140
|
end # errors
|
142
141
|
end
|
@@ -8,30 +8,30 @@ require 'spec_helper'
|
|
8
8
|
describe "/leads/reject" do
|
9
9
|
before do
|
10
10
|
login_and_assign
|
11
|
-
assign(:lead, @lead = FactoryGirl.create(:lead, :
|
11
|
+
assign(:lead, @lead = FactoryGirl.create(:lead, status: "new"))
|
12
12
|
assign(:lead_status_total, Hash.new(1))
|
13
13
|
end
|
14
14
|
|
15
15
|
it "should refresh current lead partial" do
|
16
16
|
render
|
17
17
|
|
18
|
-
rendered.
|
19
|
-
rendered.
|
18
|
+
expect(rendered).to include("$('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
|
19
|
+
expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("highlight"/)
|
20
20
|
end
|
21
21
|
|
22
22
|
it "should update sidebar filters when called from index page" do
|
23
23
|
controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
|
24
24
|
render
|
25
25
|
|
26
|
-
rendered.
|
27
|
-
rendered.
|
26
|
+
expect(rendered).to include("$('#sidebar').html")
|
27
|
+
expect(rendered).to include("$('#filters').effect('shake'")
|
28
28
|
end
|
29
29
|
|
30
30
|
it "should update sidebar summary when called from landing page" do
|
31
31
|
render
|
32
32
|
|
33
|
-
rendered.
|
34
|
-
rendered.
|
33
|
+
expect(rendered).to include("$('#sidebar').html")
|
34
|
+
expect(rendered).to include("$('#summary').effect('shake'")
|
35
35
|
end
|
36
36
|
|
37
37
|
it "should update campaign sidebar if called from campaign landing page" do
|
@@ -39,9 +39,8 @@ describe "/leads/reject" do
|
|
39
39
|
controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
|
40
40
|
render
|
41
41
|
|
42
|
-
rendered.
|
43
|
-
rendered.
|
44
|
-
rendered.
|
42
|
+
expect(rendered).to include("#sidebar")
|
43
|
+
expect(rendered).to have_text("Summary")
|
44
|
+
expect(rendered).to have_text("Recent Items")
|
45
45
|
end
|
46
|
-
|
47
46
|
end
|
@@ -10,19 +10,18 @@ describe "/leads/show" do
|
|
10
10
|
|
11
11
|
before do
|
12
12
|
login_and_assign
|
13
|
-
assign(:lead, @lead = FactoryGirl.create(:lead, :
|
14
|
-
assign(:users, [
|
13
|
+
assign(:lead, @lead = FactoryGirl.create(:lead, id: 42))
|
14
|
+
assign(:users, [current_user])
|
15
15
|
assign(:comment, Comment.new)
|
16
|
-
assign(:timeline, [
|
16
|
+
assign(:timeline, [FactoryGirl.create(:comment, commentable: @lead)])
|
17
17
|
end
|
18
18
|
|
19
19
|
it "should render lead landing page" do
|
20
20
|
render
|
21
|
-
view.
|
22
|
-
view.
|
23
|
-
view.
|
21
|
+
expect(view).to render_template(partial: "comments/_new")
|
22
|
+
expect(view).to render_template(partial: "shared/_timeline")
|
23
|
+
expect(view).to render_template(partial: "shared/_tasks")
|
24
24
|
|
25
|
-
rendered.
|
25
|
+
expect(rendered).to have_tag("div[id=edit_lead]")
|
26
26
|
end
|
27
|
-
|
28
27
|
end
|
@@ -8,9 +8,9 @@ require 'spec_helper'
|
|
8
8
|
describe "/leads/update" do
|
9
9
|
before do
|
10
10
|
login_and_assign
|
11
|
-
assign(:lead, @lead = FactoryGirl.create(:lead, :
|
12
|
-
assign(:users, [
|
13
|
-
assign(:campaigns, [
|
11
|
+
assign(:lead, @lead = FactoryGirl.create(:lead, user: current_user, assignee: FactoryGirl.create(:user)))
|
12
|
+
assign(:users, [current_user])
|
13
|
+
assign(:campaigns, [FactoryGirl.create(:campaign)])
|
14
14
|
assign(:lead_status_total, Hash.new(1))
|
15
15
|
end
|
16
16
|
|
@@ -22,15 +22,15 @@ describe "/leads/update" do
|
|
22
22
|
|
23
23
|
it "should flip [edit_lead] form" do
|
24
24
|
render
|
25
|
-
rendered.
|
26
|
-
rendered.
|
25
|
+
expect(rendered).not_to include("lead_#{@lead.id}x")
|
26
|
+
expect(rendered).to include("crm.flip_form('edit_lead'")
|
27
27
|
end
|
28
28
|
|
29
29
|
it "should update sidebar" do
|
30
30
|
render
|
31
|
-
rendered.
|
32
|
-
rendered.
|
33
|
-
rendered.
|
31
|
+
expect(rendered).to include("#sidebar")
|
32
|
+
expect(rendered).to have_text("Lead Summary")
|
33
|
+
expect(rendered).to include("$('#summary').effect('shake'")
|
34
34
|
end
|
35
35
|
end
|
36
36
|
|
@@ -41,16 +41,16 @@ describe "/leads/update" do
|
|
41
41
|
|
42
42
|
it "should replace [Edit Lead] with lead partial and highlight it" do
|
43
43
|
render
|
44
|
-
rendered.
|
45
|
-
rendered.
|
44
|
+
expect(rendered).to include("$('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
|
45
|
+
expect(rendered).to include("$('#filters').effect('shake'")
|
46
46
|
end
|
47
47
|
|
48
48
|
it "should update sidebar" do
|
49
49
|
render
|
50
|
-
rendered.
|
51
|
-
rendered.
|
52
|
-
rendered.
|
53
|
-
rendered.
|
50
|
+
expect(rendered).to include("#sidebar")
|
51
|
+
expect(rendered).to have_text("Lead Statuses")
|
52
|
+
expect(rendered).to have_text("Recent Items")
|
53
|
+
expect(rendered).to include("$('#filters').effect('shake'")
|
54
54
|
end
|
55
55
|
end
|
56
56
|
|
@@ -62,20 +62,19 @@ describe "/leads/update" do
|
|
62
62
|
|
63
63
|
it "should replace [Edit Lead] with lead partial and highlight it" do
|
64
64
|
render
|
65
|
-
rendered.
|
66
|
-
rendered.
|
65
|
+
expect(rendered).to include("$('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
|
66
|
+
expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("highlight"/)
|
67
67
|
end
|
68
68
|
|
69
69
|
it "should update campaign sidebar" do
|
70
70
|
assign(:campaign, campaign = FactoryGirl.create(:campaign))
|
71
71
|
render
|
72
72
|
|
73
|
-
rendered.
|
74
|
-
rendered.
|
75
|
-
rendered.
|
73
|
+
expect(rendered).to include("sidebar")
|
74
|
+
expect(rendered).to have_text("Campaign Summary")
|
75
|
+
expect(rendered).to have_text("Recent Items")
|
76
76
|
end
|
77
77
|
end
|
78
|
-
|
79
78
|
end # no errors
|
80
79
|
|
81
80
|
describe "validation errors :" do
|
@@ -90,9 +89,9 @@ describe "/leads/update" do
|
|
90
89
|
|
91
90
|
it "should redraw the [edit_lead] form and shake it" do
|
92
91
|
render
|
93
|
-
rendered.
|
94
|
-
rendered.
|
95
|
-
rendered.
|
92
|
+
expect(rendered).to include("#edit_lead")
|
93
|
+
expect(rendered).to include(%/$('#edit_lead').effect("shake"/)
|
94
|
+
expect(rendered).to include('focus()')
|
96
95
|
end
|
97
96
|
end
|
98
97
|
|
@@ -103,9 +102,9 @@ describe "/leads/update" do
|
|
103
102
|
|
104
103
|
it "should redraw the [edit_lead] form and shake it" do
|
105
104
|
render
|
106
|
-
rendered.
|
107
|
-
rendered.
|
108
|
-
rendered.
|
105
|
+
expect(rendered).to include("$('#lead_#{@lead.id}').html")
|
106
|
+
expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("shake"/)
|
107
|
+
expect(rendered).to include('focus()')
|
109
108
|
end
|
110
109
|
end
|
111
110
|
|
@@ -116,9 +115,9 @@ describe "/leads/update" do
|
|
116
115
|
|
117
116
|
it "should redraw the [edit_lead] form and shake it" do
|
118
117
|
render
|
119
|
-
rendered.
|
120
|
-
rendered.
|
121
|
-
rendered.
|
118
|
+
expect(rendered).to include("$('#lead_#{@lead.id}').html")
|
119
|
+
expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("shake"/)
|
120
|
+
expect(rendered).to include('focus()')
|
122
121
|
end
|
123
122
|
end
|
124
123
|
end # errors
|
@@ -11,58 +11,58 @@ describe "/opportunities/_edit" do
|
|
11
11
|
before do
|
12
12
|
login_and_assign
|
13
13
|
assign(:account, @account = FactoryGirl.create(:account))
|
14
|
-
assign(:accounts, [
|
14
|
+
assign(:accounts, [@account])
|
15
15
|
assign(:stage, Setting.unroll(:opportunity_stage))
|
16
16
|
end
|
17
17
|
|
18
18
|
it "should render [edit opportunity] form" do
|
19
|
-
assign(:users, [
|
20
|
-
assign(:opportunity, @opportunity = FactoryGirl.create(:opportunity, :
|
19
|
+
assign(:users, [current_user])
|
20
|
+
assign(:opportunity, @opportunity = FactoryGirl.create(:opportunity, campaign: @campaign = FactoryGirl.create(:campaign)))
|
21
21
|
render
|
22
22
|
|
23
|
-
rendered.
|
24
|
-
with_tag "input[type=hidden][id=opportunity_user_id][value
|
25
|
-
with_tag "input[type=hidden][id=opportunity_campaign_id][value
|
23
|
+
expect(rendered).to have_tag("form[class=edit_opportunity]") do
|
24
|
+
with_tag "input[type=hidden][id=opportunity_user_id][value='#{@opportunity.user_id}']"
|
25
|
+
with_tag "input[type=hidden][id=opportunity_campaign_id][value='#{@opportunity.campaign_id}']"
|
26
26
|
end
|
27
27
|
end
|
28
28
|
|
29
29
|
it "should pick default assignee (Myself)" do
|
30
|
-
assign(:users, [
|
31
|
-
assign(:opportunity, FactoryGirl.create(:opportunity, :
|
30
|
+
assign(:users, [current_user])
|
31
|
+
assign(:opportunity, FactoryGirl.create(:opportunity, assignee: nil))
|
32
32
|
render
|
33
33
|
|
34
|
-
rendered.
|
35
|
-
options.to_s.
|
34
|
+
expect(rendered).to have_tag("select[id=opportunity_assigned_to]") do |options|
|
35
|
+
expect(options.to_s).not_to include(%(selected="selected"))
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
39
39
|
it "should show correct assignee" do
|
40
40
|
@user = FactoryGirl.create(:user)
|
41
|
-
assign(:users, [
|
42
|
-
assign(:opportunity, FactoryGirl.create(:opportunity, :
|
41
|
+
assign(:users, [current_user, @user])
|
42
|
+
assign(:opportunity, FactoryGirl.create(:opportunity, assignee: @user))
|
43
43
|
render
|
44
44
|
|
45
|
-
rendered.
|
45
|
+
expect(rendered).to have_tag("select[id=opportunity_assigned_to]") do |_options|
|
46
46
|
with_tag "option[selected=selected]"
|
47
|
-
with_tag "option[value
|
47
|
+
with_tag "option[value='#{@user.id}']"
|
48
48
|
end
|
49
49
|
end
|
50
50
|
|
51
51
|
it "should render background info field if settings require so" do
|
52
|
-
assign(:users, [
|
52
|
+
assign(:users, [current_user])
|
53
53
|
assign(:opportunity, FactoryGirl.create(:opportunity))
|
54
|
-
Setting.background_info = [
|
54
|
+
Setting.background_info = [:opportunity]
|
55
55
|
|
56
56
|
render
|
57
|
-
rendered.
|
57
|
+
expect(rendered).to have_tag("textarea[id=opportunity_background_info]")
|
58
58
|
end
|
59
59
|
|
60
60
|
it "should not render background info field if settings do not require so" do
|
61
|
-
assign(:users, [
|
61
|
+
assign(:users, [current_user])
|
62
62
|
assign(:opportunity, FactoryGirl.create(:opportunity))
|
63
63
|
Setting.background_info = []
|
64
64
|
|
65
65
|
render
|
66
|
-
rendered.
|
66
|
+
expect(rendered).not_to have_tag("textarea[id=opportunity_background_info]")
|
67
67
|
end
|
68
68
|
end
|