d77fbbed73
Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.
299 lines
8.0 KiB
Ruby
299 lines
8.0 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe ApplicationHelper do
|
|
describe 'active_nav_class' do
|
|
it 'returns active when on the current page' do
|
|
allow(helper).to receive(:current_page?).and_return(true)
|
|
|
|
result = helper.active_nav_class('/test')
|
|
expect(result).to eq 'active'
|
|
end
|
|
|
|
it 'returns active when on a current page' do
|
|
allow(helper).to receive(:current_page?).with('/foo').and_return(false)
|
|
allow(helper).to receive(:current_page?).with('/test').and_return(true)
|
|
|
|
result = helper.active_nav_class('/foo', '/test')
|
|
expect(result).to eq 'active'
|
|
end
|
|
|
|
it 'returns empty string when not on current page' do
|
|
allow(helper).to receive(:current_page?).and_return(false)
|
|
|
|
result = helper.active_nav_class('/test')
|
|
expect(result).to eq ''
|
|
end
|
|
end
|
|
|
|
describe 'body_classes' do
|
|
context 'with a body class string from a controller' do
|
|
before do
|
|
without_partial_double_verification do
|
|
allow(helper).to receive(:body_class_string).and_return('modal-layout compose-standalone')
|
|
allow(helper).to receive(:current_flavour).and_return('glitch')
|
|
allow(helper).to receive(:current_skin).and_return('default')
|
|
allow(helper).to receive(:current_account).and_return(Fabricate(:account))
|
|
end
|
|
end
|
|
|
|
it 'uses the controller body classes in the result' do
|
|
expect(helper.body_classes).to match(/modal-layout compose-standalone/)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'locale_direction' do
|
|
it 'adds rtl body class if locale is Arabic' do
|
|
I18n.with_locale(:ar) do
|
|
expect(helper.locale_direction).to eq 'rtl'
|
|
end
|
|
end
|
|
|
|
it 'adds rtl body class if locale is Farsi' do
|
|
I18n.with_locale(:fa) do
|
|
expect(helper.locale_direction).to eq 'rtl'
|
|
end
|
|
end
|
|
|
|
it 'adds rtl if locale is Hebrew' do
|
|
I18n.with_locale(:he) do
|
|
expect(helper.locale_direction).to eq 'rtl'
|
|
end
|
|
end
|
|
|
|
it 'does not add rtl if locale is Thai' do
|
|
I18n.with_locale(:th) do
|
|
expect(helper.locale_direction).to_not eq 'rtl'
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'fa_icon' do
|
|
it 'returns a tag of fixed-width cog' do
|
|
expect(helper.fa_icon('cog fw')).to eq '<i class="fa fa-cog fa-fw"></i>'
|
|
end
|
|
end
|
|
|
|
describe 'open_registrations?' do
|
|
it 'returns true when open for registrations' do
|
|
without_partial_double_verification do
|
|
expect(Setting).to receive(:registrations_mode).and_return('open')
|
|
end
|
|
|
|
expect(helper.open_registrations?).to be true
|
|
end
|
|
|
|
it 'returns false when closed for registrations' do
|
|
without_partial_double_verification do
|
|
expect(Setting).to receive(:registrations_mode).and_return('none')
|
|
end
|
|
|
|
expect(helper.open_registrations?).to be false
|
|
end
|
|
end
|
|
|
|
describe 'show_landing_strip?', without_verify_partial_doubles: true do
|
|
describe 'when signed in' do
|
|
before do
|
|
allow(helper).to receive(:user_signed_in?).and_return(true)
|
|
end
|
|
|
|
it 'does not show landing strip' do
|
|
expect(helper.show_landing_strip?).to be false
|
|
end
|
|
end
|
|
|
|
describe 'when signed out' do
|
|
before do
|
|
allow(helper).to receive(:user_signed_in?).and_return(false)
|
|
end
|
|
|
|
it 'does not show landing strip on single user instance' do
|
|
allow(helper).to receive(:single_user_mode?).and_return(true)
|
|
|
|
expect(helper.show_landing_strip?).to be false
|
|
end
|
|
|
|
it 'shows landing strip on multi user instance' do
|
|
allow(helper).to receive(:single_user_mode?).and_return(false)
|
|
|
|
expect(helper.show_landing_strip?).to be true
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'available_sign_up_path' do
|
|
context 'when registrations are closed' do
|
|
before do
|
|
without_partial_double_verification do
|
|
allow(Setting).to receive(:registrations_mode).and_return('none')
|
|
end
|
|
end
|
|
|
|
it 'redirects to joinmastodon site' do
|
|
expect(helper.available_sign_up_path).to match(/joinmastodon.org/)
|
|
end
|
|
end
|
|
|
|
context 'when in omniauth only mode' do
|
|
around do |example|
|
|
ClimateControl.modify OMNIAUTH_ONLY: 'true' do
|
|
example.run
|
|
end
|
|
end
|
|
|
|
it 'redirects to joinmastodon site' do
|
|
expect(helper.available_sign_up_path).to match(/joinmastodon.org/)
|
|
end
|
|
end
|
|
|
|
context 'when registrations are allowed' do
|
|
it 'returns a link to the registration page' do
|
|
expect(helper.available_sign_up_path).to eq(new_user_registration_path)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'omniauth_only?' do
|
|
context 'when env var is set to true' do
|
|
around do |example|
|
|
ClimateControl.modify OMNIAUTH_ONLY: 'true' do
|
|
example.run
|
|
end
|
|
end
|
|
|
|
it 'returns true' do
|
|
expect(helper).to be_omniauth_only
|
|
end
|
|
end
|
|
|
|
context 'when env var is not set' do
|
|
around do |example|
|
|
ClimateControl.modify OMNIAUTH_ONLY: nil do
|
|
example.run
|
|
end
|
|
end
|
|
|
|
it 'returns false' do
|
|
expect(helper).to_not be_omniauth_only
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'quote_wrap' do
|
|
it 'indents and quote wraps text' do
|
|
text = <<~TEXT
|
|
Hello this is a nice message for you to quote.
|
|
Be careful because it has two lines.
|
|
TEXT
|
|
|
|
expect(helper.quote_wrap(text)).to eq <<~EXPECTED.strip
|
|
> Hello this is a nice message for you to quote.
|
|
> Be careful because it has two lines.
|
|
EXPECTED
|
|
end
|
|
end
|
|
|
|
describe 'storage_host' do
|
|
context 'when S3 alias is present' do
|
|
around do |example|
|
|
ClimateControl.modify S3_ALIAS_HOST: 's3.alias' do
|
|
example.run
|
|
end
|
|
end
|
|
|
|
it 'returns true' do
|
|
expect(helper.storage_host).to eq('https://s3.alias')
|
|
end
|
|
end
|
|
|
|
context 'when S3 cloudfront is present' do
|
|
around do |example|
|
|
ClimateControl.modify S3_CLOUDFRONT_HOST: 's3.cloudfront' do
|
|
example.run
|
|
end
|
|
end
|
|
|
|
it 'returns true' do
|
|
expect(helper.storage_host).to eq('https://s3.cloudfront')
|
|
end
|
|
end
|
|
|
|
context 'when neither env value is present' do
|
|
it 'returns false' do
|
|
expect(helper.storage_host).to eq('https:')
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'storage_host?' do
|
|
context 'when S3 alias is present' do
|
|
around do |example|
|
|
ClimateControl.modify S3_ALIAS_HOST: 's3.alias' do
|
|
example.run
|
|
end
|
|
end
|
|
|
|
it 'returns true' do
|
|
expect(helper.storage_host?).to be true
|
|
end
|
|
end
|
|
|
|
context 'when S3 cloudfront is present' do
|
|
around do |example|
|
|
ClimateControl.modify S3_CLOUDFRONT_HOST: 's3.cloudfront' do
|
|
example.run
|
|
end
|
|
end
|
|
|
|
it 'returns true' do
|
|
expect(helper.storage_host?).to be true
|
|
end
|
|
end
|
|
|
|
context 'when neither env value is present' do
|
|
it 'returns false' do
|
|
expect(helper.storage_host?).to be false
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'visibility_icon' do
|
|
it 'returns a globe icon for a public visible status' do
|
|
result = helper.visibility_icon Status.new(visibility: 'public')
|
|
expect(result).to match(/globe/)
|
|
end
|
|
|
|
it 'returns an unlock icon for a unlisted visible status' do
|
|
result = helper.visibility_icon Status.new(visibility: 'unlisted')
|
|
expect(result).to match(/unlock/)
|
|
end
|
|
|
|
it 'returns a lock icon for a private visible status' do
|
|
result = helper.visibility_icon Status.new(visibility: 'private')
|
|
expect(result).to match(/lock/)
|
|
end
|
|
|
|
it 'returns an at icon for a direct visible status' do
|
|
result = helper.visibility_icon Status.new(visibility: 'direct')
|
|
expect(result).to match(/at/)
|
|
end
|
|
end
|
|
|
|
describe 'title' do
|
|
around do |example|
|
|
site_title = Setting.site_title
|
|
example.run
|
|
Setting.site_title = site_title
|
|
end
|
|
|
|
it 'returns site title on production environment' do
|
|
Setting.site_title = 'site title'
|
|
expect(Rails.env).to receive(:production?).and_return(true)
|
|
expect(helper.title).to eq 'site title'
|
|
end
|
|
end
|
|
end
|