diff --git a/app/controllers/feedback_requests_controller.rb b/app/controllers/feedback_requests_controller.rb index 3102f9942d..21ad271218 100644 --- a/app/controllers/feedback_requests_controller.rb +++ b/app/controllers/feedback_requests_controller.rb @@ -31,7 +31,7 @@ def create def request_feedback_flash_notice # Use the generic feedback confirmation message unless the Org has # specified one - text = current_user.org.feedback_email_msg || feedback_confirmation_default_message + text = current_user.org.feedback_msg || feedback_confirmation_default_message feedback_constant_to_text(text, current_user, @plan, current_user.org) end diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb index cad171d993..f302afd450 100644 --- a/app/controllers/orgs_controller.rb +++ b/app/controllers/orgs_controller.rb @@ -215,7 +215,7 @@ def org_params .permit(:name, :abbreviation, :logo, :contact_email, :contact_name, :remove_logo, :managed, :feedback_enabled, :org_links, :funder, :institution, :organisation, - :feedback_email_msg, :org_id, :org_name, :org_crosswalk, + :feedback_msg, :org_id, :org_name, :org_crosswalk, identifiers_attributes: %i[identifier_scheme_id value], tracker_attributes: %i[code id]) end diff --git a/app/controllers/super_admin/orgs_controller.rb b/app/controllers/super_admin/orgs_controller.rb index 6cecf152a2..6e2c49634b 100644 --- a/app/controllers/super_admin/orgs_controller.rb +++ b/app/controllers/super_admin/orgs_controller.rb @@ -149,9 +149,7 @@ def merge_commit def org_params params.require(:org).permit(:name, :abbreviation, :logo, :managed, :contact_email, :contact_name, - :remove_logo, :feedback_enabled, - :feedback_email_subject, - :feedback_email_msg, + :remove_logo, :feedback_enabled, :feedback_msg, :org_id, :org_name, :org_crosswalk) end diff --git a/app/controllers/template_options_controller.rb b/app/controllers/template_options_controller.rb index 8118cc8b22..373e48c074 100644 --- a/app/controllers/template_options_controller.rb +++ b/app/controllers/template_options_controller.rb @@ -79,7 +79,7 @@ def plan_params end def org_params - %i[id name sort_name url language abbreviation ror fundref weight score] + %i[id name url language abbreviation ror fundref weight score] end end diff --git a/app/javascript/src/orgs/adminEdit.js b/app/javascript/src/orgs/adminEdit.js index ac27b03499..c393c39c27 100644 --- a/app/javascript/src/orgs/adminEdit.js +++ b/app/javascript/src/orgs/adminEdit.js @@ -7,7 +7,7 @@ import { initAutocomplete, scrubOrgSelectionParamsOnSubmit } from '../utils/auto $(() => { const toggleFeedback = () => { - const editor = Tinymce.findEditorById('org_feedback_email_msg'); + const editor = Tinymce.findEditorById('org_feedback_msg'); if (isObject(editor)) { if ($('#org_feedback_enabled_true').is(':checked')) { editor.setMode('code'); @@ -22,7 +22,7 @@ $(() => { }); // Initialises tinymce for any target element with class tinymce_answer - Tinymce.init({ selector: '#org_feedback_email_msg' }); + Tinymce.init({ selector: '#org_feedback_msg' }); toggleFeedback(); if ($('#org-details-org-controls').length > 0) { diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index f5dd48f29b..86a52ad1dc 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -138,23 +138,6 @@ def feedback_complete(recipient, plan, requestor) end end - def feedback_confirmation(recipient, plan, requestor) - return unless user.org.present? && recipient.active? - - user = requestor - org = user.org - plan = plan - # Use the generic feedback confirmation message unless the Org has specified one - subject = org.feedback_email_subject || feedback_confirmation_default_subject - message = org.feedback_email_msg || feedback_confirmation_default_message - @body = feedback_constant_to_text(message, user, plan, org) - - I18n.with_locale I18n.default_locale do - mail(to: recipient.email, - subject: feedback_constant_to_text(subject, user, plan, org)) - end - end - def plan_visibility(user, plan) return unless user.active? diff --git a/app/models/answer.rb b/app/models/answer.rb index dd03175142..c994391b04 100644 --- a/app/models/answer.rb +++ b/app/models/answer.rb @@ -9,7 +9,6 @@ # text :text # created_at :datetime # updated_at :datetime -# label_id :string # plan_id :integer # question_id :integer # user_id :integer diff --git a/app/models/org.rb b/app/models/org.rb index 6aa1537bde..de2526de38 100644 --- a/app/models/org.rb +++ b/app/models/org.rb @@ -8,10 +8,9 @@ # abbreviation :string # contact_email :string # contact_name :string -# feedback_email_msg :text -# feedback_email_subject :string +# feedback_msg :text # feedback_enabled :boolean default(FALSE) -# is_other :boolean default(FALSE), not null +# is_other :boolean default(FALSE), not null # links :text # logo_name :string # logo_uid :string @@ -42,14 +41,10 @@ class Org < ApplicationRecord LOGO_FORMATS = %w[jpeg png gif jpg bmp].freeze HUMANIZED_ATTRIBUTES = { - feedback_email_msg: _("Feedback email message") + feedback_msg: _("Feedback email message") }.freeze - # TODO: we don't allow this to be edited on the frontend, can we remove from DB? - # if not, we'll need to add a rake:task to ensure that each of these is set for each - # org - attribute :feedback_email_subject, :string, default: feedback_confirmation_default_subject - attribute :feedback_email_msg, :text, default: feedback_confirmation_default_message + attribute :feedback_msg, :text, default: feedback_confirmation_default_message attribute :language_id, :integer, default: -> { Language.default&.id } attribute :links, :text, default: { "org": [] } @@ -101,7 +96,7 @@ class Org < ApplicationRecord validates :abbreviation, presence: { message: PRESENCE_MESSAGE } validates :is_other, inclusion: { in: BOOLEAN_VALUES, - message: INCLUSION_MESSAGE } + message: PRESENCE_MESSAGE } validates :language, presence: { message: PRESENCE_MESSAGE } @@ -117,11 +112,8 @@ class Org < ApplicationRecord validates :feedback_enabled, inclusion: { in: BOOLEAN_VALUES, message: INCLUSION_MESSAGE } - validates :feedback_email_subject, presence: { message: PRESENCE_MESSAGE, - if: :feedback_enabled } - - validates :feedback_email_msg, presence: { message: PRESENCE_MESSAGE, - if: :feedback_enabled } + validates :feedback_msg, presence: { message: PRESENCE_MESSAGE, + if: :feedback_enabled } validates :managed, inclusion: { in: BOOLEAN_VALUES, message: INCLUSION_MESSAGE } @@ -372,10 +364,7 @@ def merge_attributes!(to_be_merged:) self.contact_email = to_be_merged.contact_email unless contact_email.present? self.contact_name = to_be_merged.contact_name unless contact_name.present? self.feedback_enabled = to_be_merged.feedback_enabled unless feedback_enabled? - self.feedback_email_msg = to_be_merged.feedback_email_msg unless feedback_email_msg.present? - # rubocop:disable Layout/LineLength - self.feedback_email_subject = to_be_merged.feedback_email_subject unless feedback_email_subject.present? - # rubocop:enable Layout/LineLength + self.feedback_msg = to_be_merged.feedback_msg unless feedback_msg.present? end # rubocop:enable Metrics/AbcSize diff --git a/app/models/org_identifier.rb b/app/models/org_identifier.rb deleted file mode 100644 index 287a717c01..0000000000 --- a/app/models/org_identifier.rb +++ /dev/null @@ -1,59 +0,0 @@ -# frozen_string_literal: true - -# == Schema Information -# -# Table name: org_identifiers -# -# id :integer not null, primary key -# attrs :string -# identifier :string -# created_at :datetime -# updated_at :datetime -# identifier_scheme_id :integer -# org_id :integer -# -# Indexes -# -# fk_rails_189ad2e573 (identifier_scheme_id) -# fk_rails_36323c0674 (org_id) -# -# Foreign Keys -# -# fk_rails_... (identifier_scheme_id => identifier_schemes.id) -# fk_rails_... (org_id => orgs.id) -# - -class OrgIdentifier < ApplicationRecord - - # ================ - # = Associations = - # ================ - - belongs_to :org - belongs_to :identifier_scheme - - # =============== - # = Validations = - # =============== - - # Should only be able to have one identifier per scheme! - validates :identifier_scheme_id, uniqueness: { scope: :org_id, - message: UNIQUENESS_MESSAGE } - - validates :identifier, presence: { message: PRESENCE_MESSAGE } - - validates :org, presence: { message: PRESENCE_MESSAGE } - - validates :identifier_scheme, presence: { message: PRESENCE_MESSAGE } - - # ========================= - # = Custom Accessor Logic = - # ========================= - - # ensure attrs is a hash before saving - # TODO: evaluate this approach vs Serialize from condition.rb - def attrs=(hash) - super(hash.is_a?(Hash) ? hash.to_json.to_s : "{}") - end - -end diff --git a/app/models/user.rb b/app/models/user.rb index 5391699faa..f5995c996e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -23,9 +23,7 @@ # invited_by_type :string # last_sign_in_at :datetime # last_sign_in_ip :string -# ldap_password :string -# ldap_username :string -# other_organisation :string +# other_organisation :string # recovery_email :string # remember_created_at :datetime # reset_password_sent_at :datetime diff --git a/app/models/user_identifier.rb b/app/models/user_identifier.rb deleted file mode 100644 index 0ce3d7ea8d..0000000000 --- a/app/models/user_identifier.rb +++ /dev/null @@ -1,44 +0,0 @@ -# frozen_string_literal: true - -# == Schema Information -# -# Table name: user_identifiers -# -# id :integer not null, primary key -# identifier :string -# created_at :datetime -# updated_at :datetime -# identifier_scheme_id :integer -# user_id :integer -# -# Indexes -# -# fk_rails_fe95df7db0 (identifier_scheme_id) -# index_user_identifiers_on_user_id (user_id) -# -# Foreign Keys -# -# fk_rails_... (identifier_scheme_id => identifier_schemes.id) -# fk_rails_... (user_id => users.id) -# - -class UserIdentifier < ApplicationRecord - - # ================ - # = Associations = - # ================ - - belongs_to :user - belongs_to :identifier_scheme - - # =============== - # = Validations = - # =============== - - validates :user, presence: true - - validates :identifier_scheme, presence: { message: PRESENCE_MESSAGE } - - validates :identifier, presence: { message: PRESENCE_MESSAGE } - -end diff --git a/app/policies/identifier_policy.rb b/app/policies/identifier_policy.rb index 03fac6bec1..d9afca3286 100644 --- a/app/policies/identifier_policy.rb +++ b/app/policies/identifier_policy.rb @@ -2,8 +2,6 @@ class IdentifierPolicy < ApplicationPolicy - attr_reader :user_identifier - def initialize(user, users) raise Pundit::NotAuthorizedError, "must be logged in" unless user diff --git a/app/presenters/org_selection_presenter.rb b/app/presenters/org_selection_presenter.rb index 5f725213d8..b31f2e2b31 100644 --- a/app/presenters/org_selection_presenter.rb +++ b/app/presenters/org_selection_presenter.rb @@ -7,7 +7,6 @@ class OrgSelectionPresenter def initialize(orgs:, selection:) @crosswalk = [] - # TODO: Remove this once the is_other Org has been removed @name = selection.present? ? selection.name : "" orgs = [selection] if !orgs.present? || orgs.empty? @@ -19,7 +18,6 @@ def initialize(orgs:, selection:) end end - # Return the Org name unless this is the default is_other Org attr_reader :name def crosswalk diff --git a/app/presenters/super_admin/orgs/merge_presenter.rb b/app/presenters/super_admin/orgs/merge_presenter.rb index e3bc57cf96..0e503408e7 100644 --- a/app/presenters/super_admin/orgs/merge_presenter.rb +++ b/app/presenters/super_admin/orgs/merge_presenter.rb @@ -108,8 +108,7 @@ def org_attributes(org:) { contact_email: org.contact_email, contact_name: org.contact_name, - feedback_email_msg: org.feedback_email_msg, - feedback_email_subject: org.feedback_email_subject, + feedback_msg: org.feedback_msg, feedback_enabled: org.feedback_enabled, managed: org.managed, links: org.links, @@ -135,8 +134,7 @@ def mergeable_columns end if mergeable_column?(column: :feedback_enabled) out[:feedback_enabled] = @from_org.feedback_enabled - out[:feedback_email_subject] = @from_org.feedback_email_subject - out[:feedback_email_msg] = @from_org.feedback_email_msg + out[:feedback_msg] = @from_org.feedback_msg end out end diff --git a/app/services/org_selection/hash_to_org_service.rb b/app/services/org_selection/hash_to_org_service.rb index 29883e7649..ef722429a1 100644 --- a/app/services/org_selection/hash_to_org_service.rb +++ b/app/services/org_selection/hash_to_org_service.rb @@ -14,7 +14,7 @@ module OrgSelection # } # becomes: # An Org with name = "Foo (foo.org)", - # org_identifier (ROR) = "http://example.org/123" + # identifier (ROR) = "http://example.org/123" # class HashToOrgService diff --git a/app/services/org_selection/org_to_hash_service.rb b/app/services/org_selection/org_to_hash_service.rb index 79ccd4dcb2..0f37ee18c9 100644 --- a/app/services/org_selection/org_to_hash_service.rb +++ b/app/services/org_selection/org_to_hash_service.rb @@ -12,7 +12,7 @@ class << self # Convert an Identifiable Model over to hash results like: # An Org with id = 123, name = "Foo (foo.org)", - # org_identifier (ROR) = "http://example.org/123" + # identifier (ROR) = "http://example.org/123" # becomes: # { # id: "123", diff --git a/app/views/orgs/_feedback_form.html.erb b/app/views/orgs/_feedback_form.html.erb index f0bba98eec..6378091be1 100644 --- a/app/views/orgs/_feedback_form.html.erb +++ b/app/views/orgs/_feedback_form.html.erb @@ -23,8 +23,8 @@
- <%= f.label :feedback_email_msg, _('Message'), class: "control-label" %> - <%= f.text_area :feedback_email_msg, class: "form-control", + <%= f.label :feedback_msg, _('Message'), class: "control-label" %> + <%= f.text_area :feedback_msg, class: "form-control", "aria-required" => true %>
diff --git a/app/views/plans/_request_feedback_form.html.erb b/app/views/plans/_request_feedback_form.html.erb index 0df07c1fc6..0001332f82 100644 --- a/app/views/plans/_request_feedback_form.html.erb +++ b/app/views/plans/_request_feedback_form.html.erb @@ -6,7 +6,7 @@

<%= _('Request expert feedback') %>

<%= _("Click below to give data management staff at #{plan.owner.org.name}, the Plan Owner's org, access to read and comment on your plan.") %>

- <%= sanitize plan.owner.org.feedback_email_msg.to_s % { user_name: current_user.name(false), plan_name: plan.title, organisation_email: current_user.org.contact_email } %> + <%= sanitize plan.owner.org.feedback_msg.to_s % { user_name: current_user.name(false), plan_name: plan.title, organisation_email: current_user.org.contact_email } %>

<%= _('You can continue to edit and download the plan in the interim.') %>

diff --git a/app/views/user_mailer/feedback_confirmation.html.erb b/app/views/user_mailer/feedback_confirmation.html.erb deleted file mode 100644 index 8e5d02f2c7..0000000000 --- a/app/views/user_mailer/feedback_confirmation.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= sanitize @body %> \ No newline at end of file diff --git a/db/migrate/20210819160319_db_cleanup_2021.rb b/db/migrate/20210819160319_db_cleanup_2021.rb new file mode 100644 index 0000000000..683d9efa08 --- /dev/null +++ b/db/migrate/20210819160319_db_cleanup_2021.rb @@ -0,0 +1,17 @@ +class DbCleanup2021 < ActiveRecord::Migration[5.2] + def change + # Removed old columns that are no longer in use + remove_column(:answers, :label_id) if column_exists?(:answers, :label_id) + + remove_column(:orgs, :feedback_email_subject) if column_exists?(:orgs, :feedback_email_subject) + remove_column(:orgs, :sort_name) if column_exists?(:orgs, :sort_name) + + # Rename the old feedbak email message since we no longer send an email, it's just + # displayed on the page + rename_column(:orgs, :feedback_email_msg, :feedback_msg) if column_exists?(:orgs, :feedback_email_msg) + + # Drop unused tables + drop_table(:org_identifiers) if table_exists?(:org_identifiers) + drop_table(:user_identifiers) if table_exists?(:user_identifiers) + end +end diff --git a/db/schema.rb b/db/schema.rb index e36701b4ce..ab5a3608e3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_07_29_204611) do +ActiveRecord::Schema.define(version: 2021_08_19_160319) do create_table "annotations", id: :integer, force: :cascade do |t| t.integer "question_id" @@ -33,7 +33,6 @@ t.datetime "created_at" t.datetime "updated_at" t.integer "lock_version", default: 0 - t.string "label_id" t.index ["plan_id"], name: "fk_rails_84a6005a3e" t.index ["plan_id"], name: "index_answers_on_plan_id" t.index ["question_id"], name: "fk_rails_3d5ed4418f" @@ -207,7 +206,6 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "is_other", default: false, null: false - t.string "sort_name" t.integer "region_id" t.integer "language_id" t.string "logo_uid" @@ -216,8 +214,7 @@ t.integer "org_type", default: 0, null: false t.text "links" t.boolean "feedback_enabled", default: false - t.string "feedback_email_subject" - t.text "feedback_email_msg" + t.text "feedback_msg" t.string "contact_name" t.boolean "managed", default: false, null: false t.index ["language_id"], name: "fk_rails_5640112cab" diff --git a/lib/tasks/upgrade.rake b/lib/tasks/upgrade.rake index 051b9e3571..4674bf3251 100644 --- a/lib/tasks/upgrade.rake +++ b/lib/tasks/upgrade.rake @@ -1268,8 +1268,12 @@ namespace :upgrade do desc "explicitly set some column-defaults in the database" task column_defaults: :environment do Org.where(links: nil).update_all(links: { "org": [] }) - Org.where(feedback_email_subject: nil).update_all(feedback_email_subject: Org.feedback_confirmation_default_subject) - Org.where(feedback_email_msg: nil).update_all(feedback_email_msg: Org.feedback_confirmation_default_message) + if Org.respond_to?(:feedback_email_subject) + Org.where(feedback_email_subject: nil).update_all(feedback_email_subject: Org.feedback_confirmation_default_subject) + Org.where(feedback_email_msg: nil).update_all(feedback_email_msg: Org.feedback_confirmation_default_message) + else + Org.where(feedback_msg: nil).update_all(feedback_msg: Org.feedback_confirmation_default_message) + end Org.where(language_id: nil).update_all(language_id: Language.default&.id) end diff --git a/lib/tasks/v3.rake b/lib/tasks/v3.rake index 48bd85a7a4..f52555dc34 100644 --- a/lib/tasks/v3.rake +++ b/lib/tasks/v3.rake @@ -40,8 +40,12 @@ namespace :v3 do task ensure_feedback_defaults: :environment do include FeedbacksHelper - Org.where(feedback_email_subject: nil).update_all(feedback_email_subject: feedback_confirmation_default_subject) - Org.where(feedback_email_msg: nil).update_all(feedback_email_msg: feedback_confirmation_default_message) + if Org.respond_to?(:feedback_email_subject) + Org.where(feedback_email_subject: nil).update_all(feedback_email_subject: feedback_confirmation_default_subject) + Org.where(feedback_email_msg: nil).update_all(feedback_email_msg: feedback_confirmation_default_message) + else + Org.where(feedback_msg: nil).update_all(feedback_msg: feedback_confirmation_default_message) + end end # E.G. change 'https://api.crossref.org/funders/100000060' to 'https://doi.org/10.13039/100000060' diff --git a/spec/controllers/orgs_controller_spec.rb b/spec/controllers/orgs_controller_spec.rb index 669818e967..d070636928 100644 --- a/spec/controllers/orgs_controller_spec.rb +++ b/spec/controllers/orgs_controller_spec.rb @@ -32,7 +32,7 @@ funder: [true, false].sample, institution: [true, false].sample, managed: Faker::Number.within(range: 0..1).to_s, feedback_enabled: Faker::Boolean.boolean, - feedback_email_msg: Faker::Lorem.paragraph, + feedback_msg: Faker::Lorem.paragraph, org_id: org_selector_id_field(org: other_org), org_name: other_org.name, org_crosswalk: org_selector_crosswalk_field(org: other_org) } @link_args = org_links_field @@ -64,7 +64,7 @@ expect(flash[:notice].present?).to eql(true) @org.reload expect(@org.feedback_enabled).to eql(@args[:feedback_enabled]) - expect(@org.feedback_email_msg).to eql(@args[:feedback_email_msg]) + expect(@org.feedback_msg).to eql(@args[:feedback_msg]) end it "updates the shibboleth entityID if super_admin and enabled" do @args.delete(:feedback_enabled) diff --git a/spec/factories/answers.rb b/spec/factories/answers.rb index 53af066363..447c549bb1 100644 --- a/spec/factories/answers.rb +++ b/spec/factories/answers.rb @@ -9,7 +9,6 @@ # text :text # created_at :datetime # updated_at :datetime -# label_id :string(255) # plan_id :integer # question_id :integer # user_id :integer diff --git a/spec/factories/orgs.rb b/spec/factories/orgs.rb index c93f8ae0a0..d8ac259607 100644 --- a/spec/factories/orgs.rb +++ b/spec/factories/orgs.rb @@ -8,8 +8,7 @@ # abbreviation :string # contact_email :string # contact_name :string -# feedback_email_msg :text -# feedback_email_subject :string +# feedback_msg :text # feedback_enabled :boolean default(FALSE) # is_other :boolean default(FALSE), not null # links :text @@ -18,7 +17,6 @@ # managed :boolean default(FALSE), not null # name :string # org_type :integer default(0), not null -# sort_name :string # target_url :string # created_at :datetime not null # updated_at :datetime not null diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 1a4ebe1748..4d4ff58807 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -23,8 +23,6 @@ # invited_by_type :string # last_sign_in_at :datetime # last_sign_in_ip :string -# ldap_password :string -# ldap_username :string # other_organisation :string # recovery_email :string # remember_created_at :datetime diff --git a/spec/features/feedback_requests_spec.rb b/spec/features/feedback_requests_spec.rb index cd2fb0e35d..830375ac69 100644 --- a/spec/features/feedback_requests_spec.rb +++ b/spec/features/feedback_requests_spec.rb @@ -10,8 +10,7 @@ let!(:org) do create(:org, feedback_enabled: true, - feedback_email_subject: Faker::Lorem.sentence, - feedback_email_msg: Faker::Lorem.paragraph) + feedback_msg: Faker::Lorem.paragraph) end let!(:user) { create(:user, org: org) } diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb index 349e942aa6..f22eb20722 100644 --- a/spec/models/org_spec.rb +++ b/spec/models/org_spec.rb @@ -40,12 +40,6 @@ # validates :feedback_enabled, inclusion: { in: BOOLEAN_VALUES, # message: INCLUSION_MESSAGE } # - # validates :feedback_email_subject, presence: { message: PRESENCE_MESSAGE, - # if: :feedback_enabled } - # - # validates :feedback_email_msg, presence: { message: PRESENCE_MESSAGE, - # if: :feedback_enabled } - # end context "associations" do @@ -657,12 +651,11 @@ before(:each) do @org = create(:org, :organisation, is_other: false, managed: false, feedback_enabled: false, contact_email: nil, - contact_name: nil, feedback_email_msg: nil, - feedback_email_subject: nil) + contact_name: nil, feedback_msg: nil) @to_be_merged = create(:org, :funder, templates: 1, plans: 2, managed: true, - feedback_enabled: true, is_other: true, - sort_name: Faker::Movies::StarWars.planet, + feedback_enabled: true, + is_other: true, region: create(:region), language: create(:language)) end @@ -680,18 +673,15 @@ expect(org.contact_email).to eql(original.contact_email) expect(org.contact_name).to eql(original.contact_name) expect(org.feedback_enabled).to eql(original.feedback_enabled) - expect(org.feedback_email_msg).to eql(original.feedback_email_msg) - expect(org.feedback_email_subject).to eql(original.feedback_email_subject) + expect(org.feedback_msg).to eql(original.feedback_msg) end it "does not merge the attributes it should not merge" do original = @to_be_merged.dup org = @org.merge!(to_be_merged: @to_be_merged) expect(org.abbreviation).not_to eql(original.abbreviation) - expect(org.is_other).not_to eql(original.is_other) expect(org.name).not_to eql(original.name) expect(org.organisation?).to eql(true) expect(org.funder?).to eql(false) - expect(org.sort_name).not_to eql(original.sort_name) expect(org.region).not_to eql(original.region) expect(org.language).not_to eql(original.language) end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index f0ee352712..fa7461fc28 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -296,7 +296,7 @@ it { is_expected.to eql(identifier) } end - context "when user has no user_identifier present" do + context "when user has no identifier" do it { is_expected.not_to eql("") } end end diff --git a/spec/presenters/super_admin/orgs/merge_presenter_spec.rb b/spec/presenters/super_admin/orgs/merge_presenter_spec.rb index ebc6491aa7..be130e9933 100644 --- a/spec/presenters/super_admin/orgs/merge_presenter_spec.rb +++ b/spec/presenters/super_admin/orgs/merge_presenter_spec.rb @@ -6,14 +6,15 @@ before(:each) do @to_org = create(:org, :organisation, is_other: false, managed: false, + abbreviation: Faker::Lorem.unique.word, feedback_enabled: false, contact_email: nil, - contact_name: nil, feedback_email_msg: nil, - links: { org: [] }, feedback_email_subject: nil) + contact_name: nil, feedback_msg: nil, + links: { org: [] }) @tpt = create(:token_permission_type) @from_org = create(:org, :funder, templates: 1, plans: 0, managed: true, feedback_enabled: true, is_other: true, - sort_name: Faker::Movies::StarWars.planet, + abbreviation: Faker::Lorem.unique.word, target_url: Faker::Internet.url, contact_name: Faker::Music::PearlJam.musician, contact_email: Faker::Internet.email, @@ -208,7 +209,7 @@ @expected = %i[target_url managed links contact_name contact_email logo_uid logo_name - feedback_enabled feedback_email_msg feedback_email_subject] + feedback_enabled feedback_msg] @results = @presenter.send(:org_attributes, org: @from_org) end it "returns an empty hash if :org is not an Org" do @@ -226,7 +227,7 @@ before(:each) do @expected = %i[target_url managed links contact_name contact_email - feedback_enabled feedback_email_msg feedback_email_subject] + feedback_enabled feedback_msg] @results = @presenter.send(:mergeable_columns) end it "includes the expected columns" do @@ -277,11 +278,8 @@ it "returns true for :feedback_enabled" do expect(@presenter.send(:mergeable_column?, column: :feedback_enabled)).to eql(true) end - it "returns true for :feedback_email_msg" do - expect(@presenter.send(:mergeable_column?, column: :feedback_email_msg)).to eql(true) - end - it "returns true for :feedback_email_subject" do - expect(@presenter.send(:mergeable_column?, column: :feedback_email_subject)).to eql(true) + it "returns true for :feedback_msg" do + expect(@presenter.send(:mergeable_column?, column: :feedback_msg)).to eql(true) end end end