Fix relative sign-up path in e-mail subscription notification (#38527)
This commit is contained in:
parent
ffcf87e023
commit
8a5d6dab5f
@ -34,11 +34,11 @@ module ApplicationHelper
|
|||||||
Setting.registrations_mode == 'none'
|
Setting.registrations_mode == 'none'
|
||||||
end
|
end
|
||||||
|
|
||||||
def available_sign_up_path
|
def available_sign_up_url
|
||||||
if closed_registrations? || omniauth_only?
|
if closed_registrations? || omniauth_only?
|
||||||
'https://joinmastodon.org/#getting-started'
|
'https://joinmastodon.org/'
|
||||||
else
|
else
|
||||||
ENV.fetch('SSO_ACCOUNT_SIGN_UP', new_user_registration_path)
|
ENV.fetch('SSO_ACCOUNT_SIGN_UP', new_user_registration_url)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
%li= link_to_login t('auth.login')
|
%li= link_to_login t('auth.login')
|
||||||
|
|
||||||
- if controller_name != 'registrations'
|
- if controller_name != 'registrations'
|
||||||
%li= link_to t('auth.register'), available_sign_up_path
|
%li= link_to t('auth.register'), available_sign_up_url
|
||||||
|
|
||||||
- if controller_name != 'passwords' && controller_name != 'registrations'
|
- if controller_name != 'passwords' && controller_name != 'registrations'
|
||||||
%li= link_to t('auth.forgot_password'), new_user_password_path
|
%li= link_to t('auth.forgot_password'), new_user_password_path
|
||||||
|
|||||||
@ -27,7 +27,7 @@
|
|||||||
/[if mso]
|
/[if mso]
|
||||||
</td><td style="vertical-align:top;">
|
</td><td style="vertical-align:top;">
|
||||||
%div
|
%div
|
||||||
= render 'application/mailer/button', text: t('.create_account'), url: available_sign_up_path, has_arrow: false
|
= render 'application/mailer/button', text: t('.create_account'), url: available_sign_up_url, has_arrow: false
|
||||||
/[if mso]
|
/[if mso]
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
|
|
||||||
|
|||||||
@ -94,14 +94,14 @@ RSpec.describe ApplicationHelper do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'available_sign_up_path' do
|
describe 'available_sign_up_url' do
|
||||||
context 'when registrations are closed' do
|
context 'when registrations are closed' do
|
||||||
before do
|
before do
|
||||||
allow(Setting).to receive(:[]).with('registrations_mode').and_return 'none'
|
allow(Setting).to receive(:[]).with('registrations_mode').and_return 'none'
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'redirects to joinmastodon site' do
|
it 'redirects to joinmastodon site' do
|
||||||
expect(helper.available_sign_up_path).to match(/joinmastodon.org/)
|
expect(helper.available_sign_up_url).to match(/joinmastodon.org/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -113,13 +113,13 @@ RSpec.describe ApplicationHelper do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'redirects to joinmastodon site' do
|
it 'redirects to joinmastodon site' do
|
||||||
expect(helper.available_sign_up_path).to match(/joinmastodon.org/)
|
expect(helper.available_sign_up_url).to match(/joinmastodon.org/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when registrations are allowed' do
|
context 'when registrations are allowed' do
|
||||||
it 'returns a link to the registration page' do
|
it 'returns a link to the registration page' do
|
||||||
expect(helper.available_sign_up_path).to eq(new_user_registration_path)
|
expect(helper.available_sign_up_url).to eq(new_user_registration_url)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user