diff options
author | Joël Quenneville <joel.quen@gmail.com> | 2017-04-23 00:05:52 -0400 |
---|---|---|
committer | Eugen <eugen@zeonfederated.com> | 2017-04-23 06:05:52 +0200 |
commit | 1cf9e14a416cd70aaa85453c411d95a3b3c82472 (patch) | |
tree | d0d38bf3ebf38b4c3c0eb00caae079a6fa053371 /app | |
parent | 0c2fe22bc19a82899c7577410bc869db7d42955a (diff) |
Test embedded_view related code in a helper (#2282)
The two methods `StreamEntriesHelper#stream_link_target` and `StreamEntriesHelper#acct` are based on checking whether we are running in an embedded view. This adds some test helper code to make the testing easier. We extracted some "magic strings" to constants to lower the coupling in the specs.
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/stream_entries_helper.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index a1dfe2ecf..ba989a84d 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -1,6 +1,9 @@ # frozen_string_literal: true module StreamEntriesHelper + EMBEDDED_CONTROLLER = 'stream_entries'.freeze + EMBEDDED_ACTION = 'embed'.freeze + def display_name(account) account.display_name.presence || account.username end @@ -10,7 +13,11 @@ module StreamEntriesHelper end def acct(account) - "@#{account.acct}#{embedded_view? && account.local? ? "@#{Rails.configuration.x.local_domain}" : ''}" + if embedded_view? && account.local? + "@#{account.acct}@#{Rails.configuration.x.local_domain}" + else + "@#{account.acct}" + end end def style_classes(status, is_predecessor, is_successor, include_threads) @@ -58,6 +65,6 @@ module StreamEntriesHelper end def embedded_view? - params[:controller] == 'stream_entries' && params[:action] == 'embed' + params[:controller] == EMBEDDED_CONTROLLER && params[:action] == EMBEDDED_ACTION end end |