fat_free_crm 0.18.1 → 0.20.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/.github/workflows/brakeman-analysis.yml +46 -0
- data/.github/workflows/rubocop-analysis.yml +40 -0
- data/.github/workflows/ruby.yml +52 -0
- data/.rubocop_todo.yml +80 -173
- data/.travis.yml +17 -20
- data/CHANGELOG.md +63 -3
- data/CONTRIBUTORS.md +1 -0
- data/Dockerfile +45 -14
- data/Gemfile +21 -11
- data/Gemfile.lock +315 -263
- data/Procfile +1 -1
- data/README.md +6 -5
- data/Rakefile +1 -1
- data/SECURITY.md +11 -0
- data/app/assets/javascripts/application.js.erb +3 -0
- data/app/assets/stylesheets/application.css.erb +1 -0
- data/app/assets/stylesheets/base.scss +9 -2
- data/app/assets/stylesheets/bootstrap-custom.scss +206 -0
- data/app/assets/stylesheets/common.scss +88 -68
- data/app/assets/stylesheets/header.scss +0 -8
- data/app/controllers/admin/application_controller.rb +1 -1
- data/app/controllers/admin/field_groups_controller.rb +2 -4
- data/app/controllers/admin/fields_controller.rb +1 -1
- data/app/controllers/admin/groups_controller.rb +1 -1
- data/app/controllers/admin/tags_controller.rb +3 -5
- data/app/controllers/admin/users_controller.rb +7 -9
- data/app/controllers/application_controller.rb +21 -45
- data/app/controllers/comments_controller.rb +3 -6
- data/{config/initializers/authlogic.rb → app/controllers/confirmations_controller.rb} +4 -2
- data/app/controllers/emails_controller.rb +0 -2
- data/app/controllers/entities/accounts_controller.rb +2 -4
- data/app/controllers/entities/campaigns_controller.rb +2 -4
- data/app/controllers/entities/contacts_controller.rb +4 -24
- data/app/controllers/entities/leads_controller.rb +7 -10
- data/app/controllers/entities/opportunities_controller.rb +4 -14
- data/app/controllers/entities_controller.rb +21 -7
- data/app/controllers/home_controller.rb +5 -5
- data/app/controllers/lists_controller.rb +1 -1
- data/app/controllers/passwords_controller.rb +3 -59
- data/{spec/features/support/maintain_sessions.rb → app/controllers/registrations_controller.rb} +12 -5
- data/{lib/development_tasks/gem.rake → app/controllers/sessions_controller.rb} +6 -6
- data/app/controllers/tasks_controller.rb +11 -20
- data/app/controllers/users_controller.rb +11 -30
- data/app/helpers/accounts_helper.rb +12 -0
- data/app/helpers/admin/users_helper.rb +1 -1
- data/app/helpers/application_helper.rb +30 -37
- data/app/helpers/campaigns_helper.rb +1 -1
- data/app/helpers/contacts_helper.rb +1 -3
- data/app/helpers/opportunities_helper.rb +4 -12
- data/app/helpers/tasks_helper.rb +3 -3
- data/app/helpers/users_helper.rb +1 -3
- data/{config/initializers/paper_trail.rb → app/mailers/devise_mailer.rb} +5 -1
- data/app/mailers/user_mailer.rb +0 -9
- data/app/models/entities/account.rb +11 -11
- data/app/models/entities/account_contact.rb +1 -1
- data/app/models/entities/account_opportunity.rb +1 -1
- data/app/models/entities/campaign.rb +5 -7
- data/app/models/entities/contact.rb +25 -13
- data/app/models/entities/lead.rb +8 -8
- data/app/models/entities/opportunity.rb +8 -10
- data/app/models/fields/custom_field.rb +1 -0
- data/app/models/fields/custom_field_date_pair.rb +2 -0
- data/app/models/fields/custom_field_pair.rb +2 -2
- data/app/models/fields/field.rb +1 -3
- data/app/models/list.rb +1 -1
- data/app/models/observers/entity_observer.rb +3 -7
- data/app/models/observers/lead_observer.rb +2 -4
- data/app/models/observers/opportunity_observer.rb +3 -5
- data/app/models/observers/task_observer.rb +1 -1
- data/app/models/polymorphic/address.rb +1 -1
- data/app/models/polymorphic/comment.rb +1 -1
- data/app/models/polymorphic/email.rb +3 -3
- data/app/models/polymorphic/task.rb +14 -10
- data/app/models/polymorphic/version.rb +3 -2
- data/app/models/setting.rb +5 -1
- data/app/models/users/permission.rb +3 -3
- data/app/models/users/preference.rb +4 -3
- data/app/models/users/user.rb +67 -42
- data/app/views/accounts/_edit.html.haml +2 -2
- data/app/views/accounts/_new.html.haml +2 -2
- data/app/views/accounts/_sidebar_index.html.haml +2 -2
- data/app/views/accounts/_sidebar_show.html.haml +19 -19
- data/app/views/accounts/_top_section.html.haml +1 -1
- data/app/views/accounts/create.js.haml +1 -2
- data/app/views/accounts/destroy.js.haml +1 -1
- data/app/views/accounts/edit.js.haml +1 -1
- data/app/views/accounts/show.html.haml +1 -0
- data/app/views/accounts/update.js.haml +4 -5
- data/app/views/admin/field_groups/create.js.haml +0 -1
- data/app/views/admin/field_groups/destroy.js.haml +0 -1
- data/app/views/admin/field_groups/update.js.haml +0 -1
- data/app/views/admin/fields/create.js.haml +0 -1
- data/app/views/admin/fields/destroy.js.haml +0 -1
- data/app/views/admin/fields/update.js.haml +0 -1
- data/app/views/admin/groups/create.js.haml +0 -1
- data/app/views/admin/groups/destroy.js.haml +0 -1
- data/app/views/admin/groups/update.js.haml +0 -1
- data/app/views/admin/tags/create.js.haml +0 -1
- data/app/views/admin/tags/destroy.js.haml +0 -1
- data/app/views/admin/tags/update.js.haml +0 -1
- data/app/views/admin/users/_user.html.haml +4 -4
- data/app/views/admin/users/create.js.haml +0 -1
- data/app/views/admin/users/destroy.js.haml +0 -1
- data/app/views/admin/users/update.js.haml +0 -1
- data/app/views/campaigns/_edit.html.haml +1 -1
- data/app/views/campaigns/_new.html.haml +1 -1
- data/app/views/campaigns/_sidebar_index.html.haml +2 -2
- data/app/views/campaigns/_sidebar_show.html.haml +68 -67
- data/app/views/campaigns/create.js.haml +1 -2
- data/app/views/campaigns/destroy.js.haml +1 -1
- data/app/views/campaigns/show.html.haml +1 -0
- data/app/views/campaigns/update.js.haml +3 -4
- data/app/views/comments/_edit.html.haml +1 -1
- data/app/views/comments/_new.html.haml +1 -1
- data/app/views/comments/update.js.haml +0 -1
- data/app/views/contacts/_edit.html.haml +1 -1
- data/app/views/contacts/_index_brief.html.haml +1 -1
- data/app/views/contacts/_index_full.html.haml +1 -1
- data/app/views/contacts/_index_long.html.haml +1 -1
- data/app/views/contacts/_new.html.haml +1 -1
- data/app/views/contacts/_sidebar_show.html.haml +18 -18
- data/app/views/contacts/create.js.haml +0 -1
- data/app/views/contacts/destroy.js.haml +1 -1
- data/app/views/contacts/show.html.haml +1 -0
- data/app/views/contacts/update.js.haml +2 -3
- data/app/views/devise/confirmations/new.html.haml +9 -0
- data/app/views/devise/mailer/confirmation_instructions.html.haml +4 -0
- data/app/views/devise/mailer/password_change.html.haml +3 -0
- data/app/views/devise/mailer/reset_password_instructions.html.haml +6 -0
- data/app/views/devise/passwords/edit.html.haml +18 -0
- data/app/views/devise/passwords/new.html.haml +10 -0
- data/app/views/devise/registrations/new.html.haml +21 -0
- data/app/views/devise/sessions/new.html.haml +32 -0
- data/app/views/entities/_title_bar.html.haml +1 -1
- data/app/views/entities/attach.js.haml +2 -2
- data/app/views/entities/discard.js.haml +2 -2
- data/app/views/home/_opportunity.html.haml +1 -1
- data/app/views/home/_task.html.haml +1 -1
- data/app/views/home/index.xls.builder +51 -0
- data/app/views/layouts/_about.html.haml +5 -5
- data/app/views/layouts/_header.html.haml +3 -3
- data/app/views/layouts/_sidebar.html.haml +2 -2
- data/app/views/layouts/_tabbed.html.haml +14 -11
- data/app/views/layouts/admin/_header.html.haml +1 -1
- data/app/views/layouts/application.html.haml +2 -2
- data/app/views/leads/_edit.html.haml +2 -2
- data/app/views/leads/_new.html.haml +2 -2
- data/app/views/leads/_sidebar_index.html.haml +2 -2
- data/app/views/leads/_sidebar_show.html.haml +30 -30
- data/app/views/leads/create.js.haml +2 -3
- data/app/views/leads/destroy.js.haml +2 -2
- data/app/views/leads/promote.js.haml +3 -4
- data/app/views/leads/reject.js.haml +3 -3
- data/app/views/leads/show.html.haml +1 -1
- data/app/views/leads/update.js.haml +4 -5
- data/app/views/lists/create.js.haml +0 -1
- data/app/views/opportunities/_edit.html.haml +1 -1
- data/app/views/opportunities/_index_brief.html.haml +1 -1
- data/app/views/opportunities/_index_long.html.haml +1 -1
- data/app/views/opportunities/_new.html.haml +1 -1
- data/app/views/opportunities/_sidebar_index.html.haml +2 -2
- data/app/views/opportunities/_sidebar_show.html.haml +47 -46
- data/app/views/opportunities/create.js.haml +3 -4
- data/app/views/opportunities/destroy.js.haml +3 -3
- data/app/views/opportunities/show.html.haml +1 -0
- data/app/views/opportunities/update.js.haml +5 -6
- data/app/views/shared/_address.html.haml +5 -5
- data/app/views/shared/_empty.html.haml +1 -1
- data/app/views/shared/_inline_styles.html.haml +0 -26
- data/app/views/shared/_paginate_with_per_page.html.haml +1 -0
- data/app/views/tasks/_assigned.html.haml +1 -1
- data/app/views/tasks/_completed.html.haml +1 -1
- data/app/views/tasks/_edit.html.haml +1 -1
- data/app/views/tasks/_new.html.haml +1 -1
- data/app/views/tasks/_pending.html.haml +1 -1
- data/app/views/tasks/_related.html.haml +1 -1
- data/app/views/tasks/_selector.html.haml +7 -8
- data/app/views/tasks/_sidebar_index.html.haml +2 -2
- data/app/views/tasks/_title.html.haml +1 -1
- data/app/views/tasks/complete.js.haml +1 -1
- data/app/views/tasks/create.js.haml +1 -2
- data/app/views/tasks/destroy.js.haml +1 -1
- data/app/views/tasks/uncomplete.js.haml +1 -2
- data/app/views/tasks/update.js.haml +0 -1
- data/app/views/users/_avatar.html.haml +1 -1
- data/app/views/users/change_password.js.haml +0 -1
- data/app/views/users/update.js.haml +0 -1
- data/app/views/users/upload_avatar.js.haml +0 -1
- data/app/views/versions/_version_item.html.haml +1 -1
- data/bin/bundle +1 -1
- data/bin/rails +1 -1
- data/bin/setup +38 -0
- data/bin/update +33 -0
- data/bin/yarn +13 -0
- data/config/application.rb +8 -6
- data/config/boot.rb +1 -1
- data/config/brakeman.ignore +2 -2
- data/config/database.postgres.docker.yml +5 -5
- data/config/environment.rb +2 -2
- data/config/environments/development.rb +1 -0
- data/config/environments/test.rb +7 -0
- data/config/initializers/action_mailer.rb +1 -3
- data/config/initializers/application_controller_renderer.rb +9 -0
- data/config/initializers/assets.rb +6 -11
- data/config/initializers/backtrace_silencers.rb +0 -6
- data/config/initializers/content_security_policy.rb +31 -0
- data/config/initializers/cookies_serializer.rb +3 -6
- data/config/initializers/devise.rb +289 -0
- data/config/initializers/filter_parameter_logging.rb +0 -5
- data/config/initializers/gravatar.rb +0 -1
- data/config/initializers/inflections.rb +0 -6
- data/config/initializers/mime_types.rb +1 -9
- data/config/initializers/new_framework_defaults_6_0.rb +46 -0
- data/config/initializers/relative_url_root.rb +1 -3
- data/config/initializers/session_store.rb +1 -3
- data/config/initializers/simple_form.rb +135 -55
- data/config/initializers/simple_form_bootstrap.rb +433 -0
- data/config/initializers/wrap_parameters.rb +4 -9
- data/config/locales/fat_free_crm.cs.yml +86 -47
- data/config/locales/fat_free_crm.en-GB.yml +5 -5
- data/config/locales/fat_free_crm.en-US.yml +5 -5
- data/config/locales/fat_free_crm.fr.yml +1 -1
- data/config/locales/fat_free_crm.ru.yml +2 -0
- data/config/routes.rb +20 -9
- data/config/settings.default.yml +0 -41
- data/db/demo/users.yml +62 -81
- data/db/migrate/20100928030620_remove_uuid.rb +1 -2
- data/db/migrate/20120316045804_activities_to_versions.rb +1 -0
- data/db/migrate/20120510025219_add_not_null_constraints_for_timestamp_columns.rb +1 -0
- data/db/migrate/20180107082701_authlogic_to_devise.rb +58 -0
- data/db/migrate/20200806004152_add_pattern_to_fields.rb +7 -0
- data/db/migrate/20200806004459_add_html5_to_fields.rb +10 -0
- data/db/schema.rb +58 -48
- data/docker-compose.yml +10 -0
- data/fat_free_crm.gemspec +13 -15
- data/lib/development_tasks/license.rake +2 -2
- data/lib/fat_free_crm/callback.rb +2 -2
- data/lib/fat_free_crm/comment_extensions.rb +2 -4
- data/lib/fat_free_crm/core_ext/string.rb +1 -1
- data/lib/fat_free_crm/core_ext.rb +1 -1
- data/lib/fat_free_crm/engine.rb +1 -1
- data/lib/fat_free_crm/errors.rb +1 -1
- data/lib/fat_free_crm/export_csv.rb +1 -0
- data/lib/fat_free_crm/exportable.rb +1 -1
- data/lib/fat_free_crm/fields.rb +1 -1
- data/lib/fat_free_crm/gem_dependencies.rb +1 -1
- data/lib/fat_free_crm/gem_ext.rb +0 -1
- data/lib/fat_free_crm/i18n.rb +2 -2
- data/lib/fat_free_crm/mail_processor/base.rb +4 -10
- data/lib/fat_free_crm/mail_processor/dropbox.rb +5 -15
- data/lib/fat_free_crm/permissions.rb +7 -4
- data/lib/fat_free_crm/sortable.rb +1 -1
- data/lib/fat_free_crm/tabs.rb +2 -2
- data/lib/fat_free_crm/version.rb +2 -2
- data/lib/gravatar_image_tag.rb +8 -9
- data/lib/missing_translation_detector.rb +1 -0
- data/lib/tasks/ffcrm/missing_translations.rake +1 -0
- data/lib/tasks/ffcrm/preference_update.rake +19 -0
- data/lib/tasks/ffcrm/setup.rake +11 -2
- data/lib/tasks/ffcrm/update_data.rake +2 -2
- data/lib/templates/erb/scaffold/_form.html.erb +4 -2
- data/script/rails +2 -2
- data/spec/controllers/admin/users_controller_spec.rb +0 -56
- data/spec/controllers/comments_controller_spec.rb +12 -12
- data/spec/controllers/entities/campaigns_controller_spec.rb +1 -1
- data/spec/controllers/entities/contacts_controller_spec.rb +2 -1
- data/spec/controllers/entities/leads_controller_spec.rb +2 -2
- data/spec/controllers/entities/opportunities_controller_spec.rb +1 -1
- data/spec/controllers/entities_controller_spec.rb +5 -0
- data/spec/controllers/home_controller_spec.rb +8 -8
- data/spec/controllers/tasks_controller_spec.rb +6 -4
- data/spec/controllers/users_controller_spec.rb +41 -99
- data/spec/factories/account_factories.rb +5 -5
- data/spec/factories/campaign_factories.rb +3 -3
- data/spec/factories/contact_factories.rb +8 -8
- data/spec/factories/field_factories.rb +4 -3
- data/spec/factories/lead_factories.rb +5 -5
- data/spec/factories/list_factories.rb +2 -2
- data/spec/factories/opportunity_factories.rb +3 -3
- data/spec/factories/setting_factories.rb +2 -2
- data/spec/factories/shared_factories.rb +11 -9
- data/spec/factories/task_factories.rb +7 -7
- data/spec/factories/user_factories.rb +21 -21
- data/spec/features/acceptance_helper.rb +1 -1
- data/spec/features/accounts_spec.rb +2 -2
- data/spec/features/admin/groups_spec.rb +2 -2
- data/spec/features/admin/users_spec.rb +4 -2
- data/spec/features/campaigns_spec.rb +3 -3
- data/spec/features/contacts_spec.rb +3 -6
- data/spec/features/dashboard_spec.rb +1 -1
- data/spec/features/devise/sign_in_spec.rb +58 -0
- data/spec/features/devise/sign_up_spec.rb +36 -0
- data/spec/features/leads_spec.rb +12 -8
- data/spec/features/opportunities_overview_spec.rb +1 -1
- data/spec/features/opportunities_spec.rb +7 -7
- data/spec/features/support/browser.rb +8 -3
- data/spec/features/support/selector_helpers.rb +10 -1
- data/spec/features/tasks_spec.rb +7 -7
- data/spec/helpers/accounts_helper_spec.rb +57 -0
- data/spec/helpers/admin/field_groups_helper_spec.rb +1 -1
- data/spec/helpers/users_helper_spec.rb +4 -4
- data/spec/lib/comment_extensions_spec.rb +10 -4
- data/spec/lib/errors_spec.rb +2 -2
- data/spec/lib/mail_processor/dropbox_spec.rb +1 -1
- data/spec/lib/mail_processor/sample_emails/dropbox.rb +8 -8
- data/spec/lib/permissions_spec.rb +8 -3
- data/spec/mailers/devise_mailer_spec.rb +35 -0
- data/spec/mailers/user_mailer_spec.rb +0 -26
- data/spec/models/entities/account_spec.rb +27 -0
- data/spec/models/entities/contact_spec.rb +96 -1
- data/spec/models/entities/opportunity_spec.rb +2 -2
- data/spec/models/fields/custom_field_date_pair_spec.rb +4 -2
- data/spec/models/fields/custom_field_pair_spec.rb +2 -2
- data/spec/models/fields/custom_field_spec.rb +4 -2
- data/spec/models/observers/entity_observer_spec.rb +4 -4
- data/spec/models/polymorphic/task_spec.rb +11 -11
- data/spec/models/polymorphic/version_spec.rb +9 -9
- data/spec/models/users/preference_spec.rb +1 -1
- data/spec/models/users/user_spec.rb +22 -26
- data/spec/routing/users_routing_spec.rb +30 -8
- data/spec/shared/controllers.rb +3 -9
- data/spec/spec_helper.rb +10 -2
- data/spec/support/assert_select.rb +1 -0
- data/spec/support/devise_helpers.rb +28 -0
- data/spec/{features/support/helpers.rb → support/feature_helpers.rb} +10 -10
- data/spec/support/macros.rb +4 -1
- data/spec/views/accounts/_edit.haml_spec.rb +1 -1
- data/spec/views/accounts/_new.haml_spec.rb +1 -1
- data/spec/views/accounts/create.js.haml_spec.rb +1 -2
- data/spec/views/accounts/update.js.haml_spec.rb +2 -5
- data/spec/views/admin/field_groups/create.js.haml_spec.rb +0 -1
- data/spec/views/admin/field_groups/update.js.haml_spec.rb +0 -1
- data/spec/views/admin/users/create.js.haml_spec.rb +0 -1
- data/spec/views/admin/users/destroy.js.haml_spec.rb +0 -6
- data/spec/views/admin/users/update.js.haml_spec.rb +1 -2
- data/spec/views/campaigns/_edit.haml_spec.rb +1 -1
- data/spec/views/campaigns/_new.haml_spec.rb +1 -1
- data/spec/views/campaigns/create.js.haml_spec.rb +1 -2
- data/spec/views/campaigns/destroy.js.haml_spec.rb +0 -1
- data/spec/views/campaigns/edit.js.haml_spec.rb +2 -2
- data/spec/views/campaigns/index.js.haml_spec.rb +1 -1
- data/spec/views/campaigns/update.js.haml_spec.rb +3 -7
- data/spec/views/contacts/_edit.haml_spec.rb +1 -1
- data/spec/views/contacts/_new.haml_spec.rb +1 -1
- data/spec/views/contacts/create.js.haml_spec.rb +1 -2
- data/spec/views/contacts/edit.js.haml_spec.rb +1 -1
- data/spec/views/contacts/index.js.html_spec.rb +1 -1
- data/spec/views/contacts/update.js.haml_spec.rb +6 -10
- data/spec/views/home/index.haml_spec.rb +2 -2
- data/spec/views/leads/_edit.haml_spec.rb +1 -1
- data/spec/views/leads/_new.haml_spec.rb +1 -1
- data/spec/views/leads/create.js.haml_spec.rb +0 -3
- data/spec/views/leads/destroy.js.haml_spec.rb +0 -2
- data/spec/views/leads/promote.js.haml_spec.rb +3 -11
- data/spec/views/leads/reject.js.haml_spec.rb +0 -3
- data/spec/views/leads/update.js.haml_spec.rb +3 -11
- data/spec/views/opportunities/_edit.haml_spec.rb +1 -1
- data/spec/views/opportunities/_new.haml_spec.rb +1 -1
- data/spec/views/opportunities/create.js.haml_spec.rb +0 -2
- data/spec/views/opportunities/destroy.js.haml_spec.rb +0 -3
- data/spec/views/opportunities/update.js.haml_spec.rb +4 -12
- data/spec/views/tasks/_edit.haml_spec.rb +1 -1
- data/spec/views/tasks/complete.js.haml_spec.rb +0 -1
- data/spec/views/tasks/create.js.haml_spec.rb +0 -2
- data/spec/views/tasks/destroy.js.haml_spec.rb +0 -1
- data/spec/views/tasks/uncomplete.js.haml_spec.rb +0 -1
- data/spec/views/tasks/update.js.haml_spec.rb +1 -4
- data/spec/views/users/change_password.js.haml_spec.rb +1 -2
- data/spec/views/users/update.js.haml_spec.rb +1 -2
- data/spec/views/users/upload_avatar.js.haml_spec.rb +1 -2
- metadata +63 -77
- data/app/controllers/authentications_controller.rb +0 -53
- data/app/models/users/authentication.rb +0 -56
- data/app/views/authentications/new.html.haml +0 -19
- data/app/views/passwords/edit.html.haml +0 -15
- data/app/views/passwords/new.html.haml +0 -10
- data/app/views/user_mailer/password_reset_instructions.html.haml +0 -6
- data/app/views/users/new.html.haml +0 -19
- data/lib/fat_free_crm/gem_ext/simple_form/action_view_extensions/form_helper.rb +0 -26
- data/spec/controllers/authentications_controller_spec.rb +0 -150
- data/spec/controllers/passwords_controller_spec.rb +0 -32
- data/spec/models/users/authentication_spec.rb +0 -19
- data/spec/support/auth_macros.rb +0 -49
- data/spec/views/authentications/new.haml_spec.rb +0 -31
@@ -11,7 +11,7 @@
|
|
11
11
|
#
|
12
12
|
# id :integer not null, primary key
|
13
13
|
# username :string(32) default(""), not null
|
14
|
-
# email :string(
|
14
|
+
# email :string(254) default(""), not null
|
15
15
|
# first_name :string(32)
|
16
16
|
# last_name :string(32)
|
17
17
|
# title :string(64)
|
@@ -23,21 +23,27 @@
|
|
23
23
|
# yahoo :string(32)
|
24
24
|
# google :string(32)
|
25
25
|
# skype :string(32)
|
26
|
-
#
|
26
|
+
# encrypted_password :string(255) default(""), not null
|
27
27
|
# password_salt :string(255) default(""), not null
|
28
|
-
#
|
29
|
-
#
|
30
|
-
#
|
31
|
-
#
|
32
|
-
#
|
33
|
-
# current_login_ip :string(255)
|
34
|
-
# login_count :integer default(0), not null
|
28
|
+
# last_sign_in_at :datetime
|
29
|
+
# current_sign_in_at :datetime
|
30
|
+
# last_sign_in_ip :string(255)
|
31
|
+
# current_sign_in_ip :string(255)
|
32
|
+
# sign_in_count :integer default(0), not null
|
35
33
|
# deleted_at :datetime
|
36
34
|
# created_at :datetime
|
37
35
|
# updated_at :datetime
|
38
36
|
# admin :boolean default(FALSE), not null
|
39
37
|
# suspended_at :datetime
|
40
|
-
#
|
38
|
+
# unconfirmed_email :string(254) default(""), not null
|
39
|
+
# reset_password_token :string(255)
|
40
|
+
# reset_password_sent_at :datetime
|
41
|
+
# remember_token :string(255)
|
42
|
+
# remember_created_at :datetime
|
43
|
+
# authentication_token :string(255)
|
44
|
+
# confirmation_token :string(255)
|
45
|
+
# confirmed_at :datetime
|
46
|
+
# confirmation_sent_at :datetime
|
41
47
|
#
|
42
48
|
|
43
49
|
require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
|
@@ -75,6 +81,12 @@ describe User do
|
|
75
81
|
end
|
76
82
|
end
|
77
83
|
|
84
|
+
it "should not destroy the user if she owns a comment" do
|
85
|
+
account = build(:account, user: @current_user)
|
86
|
+
FactoryBot.create(:comment, user: @user, commentable: account)
|
87
|
+
expect(@user.destroyable?(@current_user)).to eq(false)
|
88
|
+
end
|
89
|
+
|
78
90
|
it "should not destroy the current user" do
|
79
91
|
expect(@user.destroyable?(@user)).to eq(false)
|
80
92
|
end
|
@@ -202,22 +214,6 @@ describe User do
|
|
202
214
|
end
|
203
215
|
end
|
204
216
|
|
205
|
-
describe "Setting single access token" do
|
206
|
-
it "should update single_access_token attribute if it is not set already" do
|
207
|
-
@user = build(:user, single_access_token: nil)
|
208
|
-
|
209
|
-
@user.set_single_access_token
|
210
|
-
expect(@user.single_access_token).not_to eq(nil)
|
211
|
-
end
|
212
|
-
|
213
|
-
it "should not update single_access_token attribute if it is set already" do
|
214
|
-
@user = build(:user, single_access_token: "token")
|
215
|
-
|
216
|
-
@user.set_single_access_token
|
217
|
-
expect(@user.single_access_token).to eq("token")
|
218
|
-
end
|
219
|
-
end
|
220
|
-
|
221
217
|
describe "serialization" do
|
222
218
|
let(:user) { build(:user) }
|
223
219
|
|
@@ -9,12 +9,38 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
|
|
9
9
|
|
10
10
|
describe UsersController do
|
11
11
|
describe "routing" do
|
12
|
-
it "
|
13
|
-
expect(get: "/users").
|
12
|
+
it "recognizes #index" do
|
13
|
+
expect(get: "/users").to route_to(controller: "users", action: "index")
|
14
14
|
end
|
15
15
|
|
16
|
-
it "recognizes and generates
|
17
|
-
expect(get: "/
|
16
|
+
it "recognizes and generates Devise registrations routes" do
|
17
|
+
expect(get: "/users/sign_up").to route_to(controller: "registrations", action: "new")
|
18
|
+
expect(get: "/users/edit").to route_to(controller: "registrations", action: "edit")
|
19
|
+
expect(get: "/users/cancel").to route_to(controller: "registrations", action: "cancel")
|
20
|
+
expect(post: "/users").to route_to(controller: "registrations", action: "create")
|
21
|
+
expect(put: "/users").to route_to(controller: "registrations", action: "update")
|
22
|
+
expect(patch: "/users").to route_to(controller: "registrations", action: "update")
|
23
|
+
expect(delete: "/users").to route_to(controller: "registrations", action: "destroy")
|
24
|
+
end
|
25
|
+
|
26
|
+
it "recognizes and generates Devise sessions routes" do
|
27
|
+
expect(get: "/users/sign_in").to route_to(controller: "sessions", action: "new")
|
28
|
+
expect(post: "/users/sign_in").to route_to(controller: "sessions", action: "create")
|
29
|
+
expect(delete: "/users/sign_out").to route_to(controller: "sessions", action: "destroy")
|
30
|
+
end
|
31
|
+
|
32
|
+
it "recognizes and generates Devise passwords routes" do
|
33
|
+
expect(get: "/users/password/new").to route_to(controller: "passwords", action: "new")
|
34
|
+
expect(get: "/users/password/edit").to route_to(controller: "passwords", action: "edit")
|
35
|
+
expect(post: "/users/password").to route_to(controller: "passwords", action: "create")
|
36
|
+
expect(put: "/users/password").to route_to(controller: "passwords", action: "update")
|
37
|
+
expect(patch: "/users/password").to route_to(controller: "passwords", action: "update")
|
38
|
+
end
|
39
|
+
|
40
|
+
it "recognizes and generates Devise confirmations routes" do
|
41
|
+
expect(get: "/users/confirmation/new").to route_to(controller: "confirmations", action: "new")
|
42
|
+
expect(get: "/users/confirmation").to route_to(controller: "confirmations", action: "show")
|
43
|
+
expect(post: "/users/confirmation").to route_to(controller: "confirmations", action: "create")
|
18
44
|
end
|
19
45
|
|
20
46
|
it "recognizes and generates #show as /profile" do
|
@@ -29,10 +55,6 @@ describe UsersController do
|
|
29
55
|
expect(get: "/users/aaron/edit").not_to be_routable
|
30
56
|
end
|
31
57
|
|
32
|
-
it "recognizes and generates #create" do
|
33
|
-
expect(post: "/users").to route_to(controller: "users", action: "create")
|
34
|
-
end
|
35
|
-
|
36
58
|
it "recognizes and generates #update" do
|
37
59
|
expect(put: "/users/1").to route_to(controller: "users", action: "update", id: "1")
|
38
60
|
end
|
data/spec/shared/controllers.rb
CHANGED
@@ -22,9 +22,7 @@ shared_examples "auto complete" do
|
|
22
22
|
|
23
23
|
# We don't save Admin/Users autocomplete controller in a session since Users are not
|
24
24
|
# exposed through the Jumpbox.
|
25
|
-
unless controller.class.to_s.starts_with?("Admin::")
|
26
|
-
expect(session[:auto_complete]).to eq(@controller.controller_name.to_sym)
|
27
|
-
end
|
25
|
+
expect(session[:auto_complete]).to eq(@controller.controller_name.to_sym) unless controller.class.to_s.starts_with?("Admin::")
|
28
26
|
end
|
29
27
|
|
30
28
|
it "should render application/_auto_complete template" do
|
@@ -39,12 +37,8 @@ shared_examples "attach" do
|
|
39
37
|
expect(@model.send(@attachment.class.name.tableize)).to include(@attachment)
|
40
38
|
expect(assigns[:attachment]).to eq(@attachment)
|
41
39
|
expect(assigns[:attached]).to eq([@attachment])
|
42
|
-
if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
|
43
|
-
|
44
|
-
end
|
45
|
-
if @model.is_a?(Account) && @attachment.respond_to?(:account) # Skip Tasks...
|
46
|
-
expect(assigns[:account]).to eq(@attachment.reload.account)
|
47
|
-
end
|
40
|
+
expect(assigns[:campaign]).to eq(@attachment.reload.campaign) if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
|
41
|
+
expect(assigns[:account]).to eq(@attachment.reload.account) if @model.is_a?(Account) && @attachment.respond_to?(:account) # Skip Tasks...
|
48
42
|
expect(response).to render_template("entities/attach")
|
49
43
|
end
|
50
44
|
|
data/spec/spec_helper.rb
CHANGED
@@ -8,15 +8,15 @@
|
|
8
8
|
require 'rubygems'
|
9
9
|
|
10
10
|
ENV["RAILS_ENV"] = 'test'
|
11
|
-
require File.expand_path(
|
11
|
+
require File.expand_path('../config/environment', __dir__)
|
12
12
|
require 'rspec/rails'
|
13
13
|
require 'capybara/rails'
|
14
14
|
require 'paper_trail/frameworks/rspec'
|
15
15
|
|
16
|
-
require 'acts_as_fu'
|
17
16
|
require 'factory_bot_rails'
|
18
17
|
require 'ffaker'
|
19
18
|
require 'timecop'
|
19
|
+
require 'webdrivers'
|
20
20
|
|
21
21
|
# Requires supporting ruby files with custom matchers and macros, etc,
|
22
22
|
# in spec/support/ and its subdirectories.
|
@@ -41,6 +41,14 @@ RSpec.configure do |config|
|
|
41
41
|
# RSpec configuration options for Fat Free CRM.
|
42
42
|
config.include RSpec::Rails::Matchers
|
43
43
|
config.include FactoryBot::Syntax::Methods
|
44
|
+
config.include Devise::Test::ControllerHelpers, type: :controller
|
45
|
+
config.include Devise::Test::ControllerHelpers, type: :view
|
46
|
+
config.include Devise::Test::IntegrationHelpers, type: :features
|
47
|
+
config.include Warden::Test::Helpers
|
48
|
+
config.include DeviseHelpers
|
49
|
+
config.include FeatureHelpers
|
50
|
+
|
51
|
+
Warden.test_mode!
|
44
52
|
|
45
53
|
config.before(:each) do
|
46
54
|
# Overwrite locale settings within "config/settings.yml" if necessary.
|
@@ -155,6 +155,7 @@ module RSpec # :nodoc:
|
|
155
155
|
|
156
156
|
def prepare_args(args, current_scope = nil)
|
157
157
|
return args if current_scope.nil?
|
158
|
+
|
158
159
|
defaults = current_scope.options || { strict: false, xml: false }
|
159
160
|
args << {} unless args.last.is_a?(::Hash)
|
160
161
|
args.last[:strict] = defaults[:strict] if args.last[:strict].nil?
|
@@ -0,0 +1,28 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
|
4
|
+
#
|
5
|
+
# Fat Free CRM is freely distributable under the terms of MIT license.
|
6
|
+
# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
|
7
|
+
|
8
|
+
module DeviseHelpers
|
9
|
+
def login
|
10
|
+
user = create :user
|
11
|
+
perform_login(user)
|
12
|
+
end
|
13
|
+
|
14
|
+
def login_admin
|
15
|
+
admin = FactoryBot.create(:user, admin: true)
|
16
|
+
perform_login(admin)
|
17
|
+
end
|
18
|
+
|
19
|
+
def perform_login(user)
|
20
|
+
user.confirm
|
21
|
+
user.update_attribute(:suspended_at, nil)
|
22
|
+
sign_in user
|
23
|
+
end
|
24
|
+
|
25
|
+
def current_user
|
26
|
+
User.find_by_id(session['warden.user.user.key'][0][0])
|
27
|
+
end
|
28
|
+
end
|
@@ -5,21 +5,23 @@
|
|
5
5
|
# Fat Free CRM is freely distributable under the terms of MIT license.
|
6
6
|
# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
|
7
7
|
#------------------------------------------------------------------------------
|
8
|
-
|
8
|
+
|
9
|
+
module FeatureHelpers
|
9
10
|
# Put helper methods you need to be available in all acceptance specs here.
|
10
11
|
|
11
12
|
def do_login(options = {})
|
12
13
|
@user = create(:user, options)
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
click_button "Login"
|
14
|
+
@user.confirm
|
15
|
+
@user.update_attribute(:suspended_at, nil)
|
16
|
+
login_as(@user)
|
17
17
|
end
|
18
18
|
|
19
19
|
def login_as_user(user)
|
20
|
-
|
21
|
-
|
22
|
-
|
20
|
+
user.confirm
|
21
|
+
user.update_attribute(:suspended_at, nil)
|
22
|
+
visit '/users/sign_in'
|
23
|
+
fill_in "user[email]", with: user.username
|
24
|
+
fill_in "user[password]", with: user.password
|
23
25
|
click_button "Login"
|
24
26
|
end
|
25
27
|
|
@@ -28,5 +30,3 @@ module HelperMethods
|
|
28
30
|
do_login(options) unless @user.present?
|
29
31
|
end
|
30
32
|
end
|
31
|
-
|
32
|
-
RSpec.configuration.include HelperMethods, type: :feature
|
data/spec/support/macros.rb
CHANGED
@@ -24,7 +24,10 @@ end
|
|
24
24
|
#----------------------------------------------------------------------------
|
25
25
|
def stub_task_total(view = "pending")
|
26
26
|
settings = (view == "completed" ? Setting.task_completed : Setting.task_bucket)
|
27
|
-
settings.each_with_object(all: 0)
|
27
|
+
settings.each_with_object(all: 0) do |key, hash|
|
28
|
+
hash[key] = 1
|
29
|
+
hash
|
30
|
+
end
|
28
31
|
end
|
29
32
|
|
30
33
|
# Get current server timezone and set it (see rake time:zones:local for details).
|
@@ -22,7 +22,7 @@ describe "/accounts/_edit" do
|
|
22
22
|
expect(view).to render_template(partial: "_contact_info")
|
23
23
|
expect(view).to render_template(partial: "_permissions")
|
24
24
|
|
25
|
-
expect(rendered).to have_tag(
|
25
|
+
expect(rendered).to have_tag('form[class="simple_form edit_account"]') do |form|
|
26
26
|
expect(form).to have_tag "input[type=hidden][id=account_user_id][value='#{@account.user_id}']"
|
27
27
|
end
|
28
28
|
end
|
@@ -23,7 +23,7 @@ describe "/accounts/_new" do
|
|
23
23
|
expect(view).to render_template(partial: "_contact_info")
|
24
24
|
expect(view).to render_template(partial: "_permissions")
|
25
25
|
|
26
|
-
expect(rendered).to have_tag(
|
26
|
+
expect(rendered).to have_tag('form[class="simple_form new_account"]')
|
27
27
|
end
|
28
28
|
|
29
29
|
it "should render background info field if settings require so" do
|
@@ -25,7 +25,7 @@ describe "/accounts/create" do
|
|
25
25
|
end
|
26
26
|
|
27
27
|
it "should hide [Create Account] form and insert account partial" do
|
28
|
-
expect(rendered).to include("$('#accounts').prepend('<li class=\\'account
|
28
|
+
expect(rendered).to include("$('#accounts').prepend('<li class=\\'highlight account\\' id=\\'account_#{@account.id}\\'")
|
29
29
|
expect(rendered).to include(%/$('#account_#{@account.id}').effect("highlight"/)
|
30
30
|
end
|
31
31
|
|
@@ -47,7 +47,6 @@ describe "/accounts/create" do
|
|
47
47
|
render
|
48
48
|
|
49
49
|
expect(rendered).to include("#create_account")
|
50
|
-
expect(rendered).to include(%/$('#create_account').effect("shake"/)
|
51
50
|
end
|
52
51
|
end
|
53
52
|
end
|
@@ -34,7 +34,6 @@ describe "/accounts/update" do
|
|
34
34
|
render
|
35
35
|
expect(rendered).to include("$('#sidebar').html")
|
36
36
|
expect(rendered).to have_text("Recent Items")
|
37
|
-
expect(rendered).to include("$('#summary').effect('shake'")
|
38
37
|
end
|
39
38
|
end
|
40
39
|
|
@@ -70,11 +69,10 @@ describe "/accounts/update" do
|
|
70
69
|
controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/123"
|
71
70
|
end
|
72
71
|
|
73
|
-
it "should redraw the [edit_account] form
|
72
|
+
it "should redraw the [edit_account] form" do
|
74
73
|
render
|
75
74
|
|
76
75
|
expect(rendered).to include("#edit_account")
|
77
|
-
expect(rendered).to include(%/$('#edit_account').effect("shake"/)
|
78
76
|
expect(rendered).to include('focus()')
|
79
77
|
end
|
80
78
|
end
|
@@ -84,11 +82,10 @@ describe "/accounts/update" do
|
|
84
82
|
controller.request.env["HTTP_REFERER"] = "http://localhost/accounts"
|
85
83
|
end
|
86
84
|
|
87
|
-
it "should redraw the [edit_account] form
|
85
|
+
it "should redraw the [edit_account] form" do
|
88
86
|
render
|
89
87
|
|
90
88
|
expect(rendered).to include("account_#{@account.id}")
|
91
|
-
expect(rendered).to include(%/$('#account_#{@account.id}').effect("shake"/)
|
92
89
|
expect(rendered).to include('focus()')
|
93
90
|
end
|
94
91
|
end
|
@@ -26,6 +26,5 @@ describe "admin/field_groups/create" do
|
|
26
26
|
allow(field_group).to receive(:valid?).and_return(false)
|
27
27
|
render
|
28
28
|
expect(view).to render_template("admin/field_groups/create")
|
29
|
-
expect(rendered).to have_text("effect(\"shake\", { duration:250, distance: 6 });")
|
30
29
|
end
|
31
30
|
end
|
@@ -25,6 +25,5 @@ describe "admin/field_groups/update" do
|
|
25
25
|
it "renders javascript for invalid field group" do
|
26
26
|
allow(field_group.errors).to receive(:empty?).and_return(false)
|
27
27
|
render
|
28
|
-
expect(rendered).to have_text("$('##{dom_id(field_group, :edit)}').effect('shake', { distance:5 }, 250);")
|
29
28
|
end
|
30
29
|
end
|
@@ -37,12 +37,6 @@ describe "admin/users/destroy" do
|
|
37
37
|
expect(rendered).to include(%/crm.flick('#{dom_id(@user, :confirm)}', 'remove');/)
|
38
38
|
end
|
39
39
|
|
40
|
-
it "should shake user partial" do
|
41
|
-
render
|
42
|
-
|
43
|
-
expect(rendered).to include(%/$('#user_#{@user.id}').effect('shake'/)
|
44
|
-
end
|
45
|
-
|
46
40
|
it "should show flash message" do
|
47
41
|
render
|
48
42
|
|
@@ -27,11 +27,10 @@ describe "admin/users/update" do
|
|
27
27
|
@user.errors.add(:name)
|
28
28
|
end
|
29
29
|
|
30
|
-
it "redraws [Edit User] form
|
30
|
+
it "redraws [Edit User] form" do
|
31
31
|
render
|
32
32
|
|
33
33
|
expect(rendered).to include("user_#{@user.id}")
|
34
|
-
expect(rendered).to include(%/$('#user_#{@user.id}').effect("shake"/)
|
35
34
|
expect(rendered).to include(%/$('#user_username').focus()/)
|
36
35
|
end
|
37
36
|
end
|
@@ -23,7 +23,7 @@ describe "/campaigns/_edit" do
|
|
23
23
|
expect(view).to render_template(partial: "campaigns/_objectives")
|
24
24
|
expect(view).to render_template(partial: "_permissions")
|
25
25
|
|
26
|
-
expect(view).to have_tag(
|
26
|
+
expect(view).to have_tag('form[class="simple_form edit_campaign"]') do
|
27
27
|
with_tag "input[type=hidden][id=campaign_user_id][value='#{@campaign.user_id}']"
|
28
28
|
end
|
29
29
|
end
|
@@ -22,7 +22,7 @@ describe "/campaigns/_new" do
|
|
22
22
|
expect(view).to render_template(partial: "campaigns/_objectives")
|
23
23
|
expect(view).to render_template(partial: "_permissions")
|
24
24
|
|
25
|
-
expect(rendered).to have_tag(
|
25
|
+
expect(rendered).to have_tag('form[class="simple_form new_campaign"]')
|
26
26
|
end
|
27
27
|
|
28
28
|
it "should render background info field if settings require so" do
|
@@ -21,7 +21,7 @@ describe "/campaigns/create" do
|
|
21
21
|
end
|
22
22
|
|
23
23
|
it "should hide [Create Campaign] form and insert campaign partial" do
|
24
|
-
expect(rendered).to include("$('#campaigns').prepend('<li class=\\'campaign
|
24
|
+
expect(rendered).to include("$('#campaigns').prepend('<li class=\\'highlight campaign\\' id=\\'campaign_#{@campaign.id}\\'")
|
25
25
|
expect(rendered).to include(%/$('#campaign_#{@campaign.id}').effect("highlight"/)
|
26
26
|
end
|
27
27
|
|
@@ -44,7 +44,6 @@ describe "/campaigns/create" do
|
|
44
44
|
render
|
45
45
|
|
46
46
|
expect(rendered).to include("$('#create_campaign').html")
|
47
|
-
expect(rendered).to include(%/$('#create_campaign').effect("shake"/)
|
48
47
|
end
|
49
48
|
end
|
50
49
|
end
|
@@ -23,7 +23,6 @@ describe "/campaigns/destroy" do
|
|
23
23
|
it "should update Campaigns sidebar" do
|
24
24
|
expect(rendered).to include("#sidebar")
|
25
25
|
expect(rendered).to have_text("Recent Items")
|
26
|
-
expect(rendered).to include(%/$('#filters').effect('shake'/)
|
27
26
|
end
|
28
27
|
|
29
28
|
it "should update pagination" do
|
@@ -20,7 +20,7 @@ describe "/campaigns/edit" do
|
|
20
20
|
params[:cancel] = "true"
|
21
21
|
|
22
22
|
render
|
23
|
-
expect(rendered).to include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign
|
23
|
+
expect(rendered).to include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'highlight campaign\\' id=\\'campaign_#{@campaign.id}\\'")
|
24
24
|
end
|
25
25
|
|
26
26
|
it "cancel from campaign landing page: should hide [Edit Campaign] form" do
|
@@ -36,7 +36,7 @@ describe "/campaigns/edit" do
|
|
36
36
|
assign(:previous, previous = build_stubbed(:campaign, user: current_user))
|
37
37
|
|
38
38
|
render
|
39
|
-
expect(rendered).to include("$('#campaign_#{previous.id}').replaceWith('<li class=\\'campaign
|
39
|
+
expect(rendered).to include("$('#campaign_#{previous.id}').replaceWith('<li class=\\'highlight campaign\\' id=\\'campaign_#{previous.id}\\'")
|
40
40
|
end
|
41
41
|
|
42
42
|
it "edit: should remove previously open [Edit Campaign] if it's no longer available" do
|
@@ -19,7 +19,7 @@ describe "/campaigns/index" do
|
|
19
19
|
|
20
20
|
render template: 'campaigns/index', formats: [:js]
|
21
21
|
|
22
|
-
expect(rendered).to include("$('#campaigns').html('<li class=\\'campaign
|
22
|
+
expect(rendered).to include("$('#campaigns').html('<li class=\\'highlight campaign\\' id=\\'campaign_42\\'")
|
23
23
|
expect(rendered).to include("#paginate")
|
24
24
|
end
|
25
25
|
|
@@ -31,9 +31,7 @@ describe "/campaigns/update" do
|
|
31
31
|
it "should update sidebar" do
|
32
32
|
render
|
33
33
|
expect(rendered).to include("#sidebar")
|
34
|
-
expect(rendered).to have_text("Campaign Summary")
|
35
34
|
expect(rendered).to have_text("Recent Items")
|
36
|
-
expect(rendered).to include("$('#summary').effect('shake'")
|
37
35
|
end
|
38
36
|
end
|
39
37
|
|
@@ -44,7 +42,7 @@ describe "/campaigns/update" do
|
|
44
42
|
|
45
43
|
it "should replace [Edit Campaign] with campaign partial and highlight it" do
|
46
44
|
render
|
47
|
-
expect(rendered).to include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign
|
45
|
+
expect(rendered).to include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'highlight campaign\\' id=\\'campaign_#{@campaign.id}\\'")
|
48
46
|
expect(rendered).to include(%/$('#campaign_#{@campaign.id}').effect("highlight"/)
|
49
47
|
end
|
50
48
|
end
|
@@ -57,10 +55,9 @@ describe "/campaigns/update" do
|
|
57
55
|
controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
|
58
56
|
end
|
59
57
|
|
60
|
-
it "should redraw the [edit_campaign] form
|
58
|
+
it "should redraw the [edit_campaign] form" do
|
61
59
|
render
|
62
60
|
expect(rendered).to include("$('#edit_campaign').html")
|
63
|
-
expect(rendered).to include(%/$('#edit_campaign').effect("shake"/)
|
64
61
|
expect(rendered).to include('focus()')
|
65
62
|
end
|
66
63
|
end
|
@@ -71,10 +68,9 @@ describe "/campaigns/update" do
|
|
71
68
|
controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns"
|
72
69
|
end
|
73
70
|
|
74
|
-
it "should redraw the [edit_campaign] form
|
71
|
+
it "should redraw the [edit_campaign] form" do
|
75
72
|
render
|
76
73
|
expect(rendered).to include("$('#campaign_#{@campaign.id}').html")
|
77
|
-
expect(rendered).to include(%/$('#campaign_#{@campaign.id}').effect("shake"/)
|
78
74
|
expect(rendered).to include('focus()')
|
79
75
|
end
|
80
76
|
end
|
@@ -26,7 +26,7 @@ describe "/contacts/_edit" do
|
|
26
26
|
expect(view).to render_template(partial: "contacts/_web")
|
27
27
|
expect(view).to render_template(partial: "_permissions")
|
28
28
|
|
29
|
-
expect(rendered).to have_tag(
|
29
|
+
expect(rendered).to have_tag('form[class="simple_form edit_contact"]') do
|
30
30
|
with_tag "input[type=hidden][id=contact_user_id][value='#{@contact.user_id}']"
|
31
31
|
end
|
32
32
|
end
|
@@ -26,7 +26,7 @@ describe "/contacts/_new" do
|
|
26
26
|
expect(view).to render_template(partial: "contacts/_web")
|
27
27
|
expect(view).to render_template(partial: "entities/_permissions")
|
28
28
|
|
29
|
-
expect(rendered).to have_tag(
|
29
|
+
expect(rendered).to have_tag('form[class="simple_form new_contact"]')
|
30
30
|
end
|
31
31
|
|
32
32
|
it "should pick default assignee (Myself)" do
|
@@ -23,7 +23,7 @@ describe "/contacts/create" do
|
|
23
23
|
it "should hide [Create Contact] form and insert contact partial" do
|
24
24
|
render
|
25
25
|
|
26
|
-
expect(rendered).to include("$('#contacts').prepend('<li class=\\'contact
|
26
|
+
expect(rendered).to include("$('#contacts').prepend('<li class=\\'highlight contact\\' id=\\'contact_#{@contact.id}\\'")
|
27
27
|
expect(rendered).to include(%/$('#contact_#{@contact.id}').effect("highlight"/)
|
28
28
|
end
|
29
29
|
|
@@ -60,7 +60,6 @@ describe "/contacts/create" do
|
|
60
60
|
render
|
61
61
|
|
62
62
|
expect(rendered).to include("$('#create_contact').html")
|
63
|
-
expect(rendered).to include(%/$('#create_contact').effect("shake"/)
|
64
63
|
end
|
65
64
|
end
|
66
65
|
end
|
@@ -22,7 +22,7 @@ describe "/contacts/edit" do
|
|
22
22
|
params[:cancel] = "true"
|
23
23
|
|
24
24
|
render
|
25
|
-
expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact
|
25
|
+
expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'highlight contact\\' id=\\'contact_#{@contact.id}\\'")
|
26
26
|
end
|
27
27
|
|
28
28
|
it "cancel from contact landing page: should hide [Edit Contact] form" do
|
@@ -19,7 +19,7 @@ describe "/contacts/index" do
|
|
19
19
|
|
20
20
|
render template: 'contacts/index', formats: [:js]
|
21
21
|
|
22
|
-
expect(rendered).to include("$('#contacts').html('<li class=\\'contact
|
22
|
+
expect(rendered).to include("$('#contacts').html('<li class=\\'highlight contact\\' id=\\'contact_42\\'")
|
23
23
|
expect(rendered).to include("#paginate")
|
24
24
|
end
|
25
25
|
|