diff --git a/app/helpers/paths_helper.rb b/app/helpers/paths_helper.rb index 50bedfb6..97de8bca 100644 --- a/app/helpers/paths_helper.rb +++ b/app/helpers/paths_helper.rb @@ -2,10 +2,6 @@ module PathsHelper ## # Includes functions related to links or redirects ## - def link_if_alive(version, link_text, link_url) - version.item ? link_to(link_text, link_url) : link_text - end - def link_to_user(user_id) user = User.find_by(id: user_id) if user diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index e2fd1349..50becf0c 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -27,24 +27,4 @@ module UsersHelper def show_roles(roles) roles.map{ |x| x[0].titleize + ' (' + x[1].join(', ') + ')' }.join ', ' end - - def user_change_description(version) - if version.event == 'create' - link_to_user(version.item_id) + ' signed up' - elsif version.event == 'update' - if version.changeset.keys.include?('reset_password_sent_at') - 'Someone requested password reset of' - elsif version.changeset.keys.include?('confirmed_at') && version.changeset['confirmed_at'][0].nil? - (version.whodunnit.nil? ? link_to_user(version.item_id) : link_to_user(version.whodunnit)) + ' confirmed account of' - elsif version.changeset.keys.include?('confirmed_at') && version.changeset['confirmed_at'][1].nil? - link_to_user(version.whodunnit) + ' unconfirmed account of' - else - link_to_user(version.whodunnit) + " updated #{updated_attributes(version)} of" - end - end - end - - def users_role_change_description(version) - version.event == 'create' ? 'added' : 'removed' - end end diff --git a/spec/helpers/format_helper_spec.rb b/spec/helpers/format_helper_spec.rb index dd306b5f..f14de8b3 100644 --- a/spec/helpers/format_helper_spec.rb +++ b/spec/helpers/format_helper_spec.rb @@ -8,11 +8,9 @@ describe FormatHelper, type: :helper do end it 'should return HTML for header markdown' do - expect(Redcarpet::Markdown).to receive(:new). - with(Redcarpet::Render::HTML, autolink: true, - space_after_headers: true, - no_intra_emphasis: true). - and_call_original + expect(Redcarpet::Markdown).to receive(:new) + .with(Redcarpet::Render::HTML, autolink: true, space_after_headers: true, no_intra_emphasis: true) + .and_call_original expect(markdown('# this is my header')).to eq "

this is my header

\n" end