mirror of
https://github.com/mastodon/mastodon.git
synced 2025-07-15 08:48:15 +00:00
Reduce hard coding of LOCAL_DOMAIN
env value throughout tests (#35025)
This commit is contained in:
parent
f92ff6d699
commit
ab7f50ce4e
|
@ -13,6 +13,7 @@ RSpec.describe AccountControllerConcern do
|
||||||
|
|
||||||
before do
|
before do
|
||||||
routes.draw { get 'success' => 'anonymous#success' }
|
routes.draw { get 'success' => 'anonymous#success' }
|
||||||
|
request.host = Rails.configuration.x.local_domain
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when account is unconfirmed' do
|
context 'when account is unconfirmed' do
|
||||||
|
@ -56,8 +57,8 @@ RSpec.describe AccountControllerConcern do
|
||||||
|
|
||||||
expect(response)
|
expect(response)
|
||||||
.to have_http_status(200)
|
.to have_http_status(200)
|
||||||
.and have_http_link_header('http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io').for(rel: 'lrdd', type: 'application/jrd+json')
|
.and have_http_link_header(webfinger_url(resource: account.to_webfinger_s)).for(rel: 'lrdd', type: 'application/jrd+json')
|
||||||
.and have_http_link_header('https://cb6e6126.ngrok.io/users/username').for(rel: 'alternate', type: 'application/activity+json')
|
.and have_http_link_header(account_url(account, protocol: :https)).for(rel: 'alternate', type: 'application/activity+json')
|
||||||
expect(response.body)
|
expect(response.body)
|
||||||
.to include(account.username)
|
.to include(account.username)
|
||||||
end
|
end
|
||||||
|
|
|
@ -101,7 +101,7 @@ RSpec.describe HomeHelper do
|
||||||
allow(helper).to receive(:closed_registrations?).and_return(true)
|
allow(helper).to receive(:closed_registrations?).and_return(true)
|
||||||
result = helper.sign_up_message
|
result = helper.sign_up_message
|
||||||
|
|
||||||
expect(result).to eq t('auth.registration_closed', instance: 'cb6e6126.ngrok.io')
|
expect(result).to eq t('auth.registration_closed', instance: Rails.configuration.x.local_domain)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ RSpec.describe Admin::SystemCheck::MediaPrivacyCheck do
|
||||||
describe 'pass?' do
|
describe 'pass?' do
|
||||||
context 'when the media cannot be listed' do
|
context 'when the media cannot be listed' do
|
||||||
before do
|
before do
|
||||||
stub_request(:get, /ngrok.io/).to_return(status: 200, body: 'a list of no files')
|
stub_request(:get, /#{Regexp.quote(Rails.configuration.x.local_domain)}/).to_return(status: 200, body: 'a list of no files')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns true' do
|
it 'returns true' do
|
||||||
|
|
|
@ -3,15 +3,25 @@
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe OStatus::TagManager do
|
RSpec.describe OStatus::TagManager do
|
||||||
|
around do |example|
|
||||||
|
original = Rails.configuration.x.local_domain
|
||||||
|
example.run
|
||||||
|
Rails.configuration.x.local_domain = original
|
||||||
|
end
|
||||||
|
|
||||||
describe '#unique_tag' do
|
describe '#unique_tag' do
|
||||||
|
before { Rails.configuration.x.local_domain = 'mastodon.example' }
|
||||||
|
|
||||||
it 'returns a unique tag' do
|
it 'returns a unique tag' do
|
||||||
expect(described_class.instance.unique_tag(Time.utc(2000), 12, 'Status')).to eq 'tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status'
|
expect(described_class.instance.unique_tag(Time.utc(2000), 12, 'Status')).to eq 'tag:mastodon.example,2000-01-01:objectId=12:objectType=Status'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#unique_tag_to_local_id' do
|
describe '#unique_tag_to_local_id' do
|
||||||
|
before { Rails.configuration.x.local_domain = 'mastodon.example' }
|
||||||
|
|
||||||
it 'returns the ID part' do
|
it 'returns the ID part' do
|
||||||
expect(described_class.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status', 'Status')).to eql '12'
|
expect(described_class.instance.unique_tag_to_local_id('tag:mastodon.example,2000-01-01:objectId=12:objectType=Status', 'Status')).to eql '12'
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns nil if it is not local id' do
|
it 'returns nil if it is not local id' do
|
||||||
|
@ -19,17 +29,19 @@ RSpec.describe OStatus::TagManager do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns nil if it is not expected type' do
|
it 'returns nil if it is not expected type' do
|
||||||
expect(described_class.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Block', 'Status')).to be_nil
|
expect(described_class.instance.unique_tag_to_local_id('tag:mastodon.example,2000-01-01:objectId=12:objectType=Block', 'Status')).to be_nil
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns nil if it does not have object ID' do
|
it 'returns nil if it does not have object ID' do
|
||||||
expect(described_class.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectType=Status', 'Status')).to be_nil
|
expect(described_class.instance.unique_tag_to_local_id('tag:mastodon.example,2000-01-01:objectType=Status', 'Status')).to be_nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#local_id?' do
|
describe '#local_id?' do
|
||||||
|
before { Rails.configuration.x.local_domain = 'mastodon.example' }
|
||||||
|
|
||||||
it 'returns true for a local ID' do
|
it 'returns true for a local ID' do
|
||||||
expect(described_class.instance.local_id?('tag:cb6e6126.ngrok.io;objectId=12:objectType=Status')).to be true
|
expect(described_class.instance.local_id?('tag:mastodon.example;objectId=12:objectType=Status')).to be true
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns false for a foreign ID' do
|
it 'returns false for a foreign ID' do
|
||||||
|
@ -63,7 +75,7 @@ RSpec.describe OStatus::TagManager do
|
||||||
|
|
||||||
it 'returns the URL for account' do
|
it 'returns the URL for account' do
|
||||||
expect(target.object_type).to eq :person
|
expect(target.object_type).to eq :person
|
||||||
expect(subject).to eq 'https://cb6e6126.ngrok.io/users/alice'
|
expect(subject).to eq "https://#{Rails.configuration.x.local_domain}/users/alice"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -29,7 +29,10 @@ RSpec.describe TextFormatter do
|
||||||
let(:text) { '@alice' }
|
let(:text) { '@alice' }
|
||||||
|
|
||||||
it 'creates a mention link' do
|
it 'creates a mention link' do
|
||||||
expect(subject).to include '<a href="https://cb6e6126.ngrok.io/@alice" class="u-url mention">@<span>alice</span></a></span>'
|
expect(subject)
|
||||||
|
.to include(<<~LINK.squish)
|
||||||
|
<a href="https://#{Rails.configuration.x.local_domain}/@alice" class="u-url mention">@<span>alice</span></a>
|
||||||
|
LINK
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ RSpec.describe RemoteFollow do
|
||||||
let(:account) { Fabricate(:account, username: 'alice') }
|
let(:account) { Fabricate(:account, username: 'alice') }
|
||||||
|
|
||||||
it 'returns subscribe address' do
|
it 'returns subscribe address' do
|
||||||
expect(subject).to eq 'https://quitter.no/main/ostatussub?profile=https%3A%2F%2Fcb6e6126.ngrok.io%2Fusers%2Falice'
|
expect(subject).to eq "https://quitter.no/main/ostatussub?profile=https%3A%2F%2F#{Rails.configuration.x.local_domain}%2Fusers%2Falice"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -27,10 +27,10 @@ RSpec.describe 'account featured tags API' do
|
||||||
.to start_with('application/json')
|
.to start_with('application/json')
|
||||||
expect(response.parsed_body).to contain_exactly(a_hash_including({
|
expect(response.parsed_body).to contain_exactly(a_hash_including({
|
||||||
name: 'bar',
|
name: 'bar',
|
||||||
url: "https://cb6e6126.ngrok.io/@#{account.username}/tagged/bar",
|
url: short_account_tag_url(username: account.username, tag: 'bar'),
|
||||||
}), a_hash_including({
|
}), a_hash_including({
|
||||||
name: 'foo',
|
name: 'foo',
|
||||||
url: "https://cb6e6126.ngrok.io/@#{account.username}/tagged/foo",
|
url: short_account_tag_url(username: account.username, tag: 'foo'),
|
||||||
}))
|
}))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -43,10 +43,10 @@ RSpec.describe 'account featured tags API' do
|
||||||
.to start_with('application/json')
|
.to start_with('application/json')
|
||||||
expect(response.parsed_body).to contain_exactly(a_hash_including({
|
expect(response.parsed_body).to contain_exactly(a_hash_including({
|
||||||
name: 'bar',
|
name: 'bar',
|
||||||
url: "https://cb6e6126.ngrok.io/@#{account.pretty_acct}/tagged/bar",
|
url: short_account_tag_url(username: account.pretty_acct, tag: 'bar'),
|
||||||
}), a_hash_including({
|
}), a_hash_including({
|
||||||
name: 'foo',
|
name: 'foo',
|
||||||
url: "https://cb6e6126.ngrok.io/@#{account.pretty_acct}/tagged/foo",
|
url: short_account_tag_url(username: account.pretty_acct, tag: 'foo'),
|
||||||
}))
|
}))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -22,19 +22,23 @@ RSpec.describe 'Content-Security-Policy' do
|
||||||
def expected_csp_headers
|
def expected_csp_headers
|
||||||
<<~CSP.split("\n").map(&:strip)
|
<<~CSP.split("\n").map(&:strip)
|
||||||
base-uri 'none'
|
base-uri 'none'
|
||||||
child-src 'self' blob: https://cb6e6126.ngrok.io
|
child-src 'self' blob: #{local_domain}
|
||||||
connect-src 'self' data: blob: https://cb6e6126.ngrok.io #{Rails.configuration.x.streaming_api_base_url}
|
connect-src 'self' data: blob: #{local_domain} #{Rails.configuration.x.streaming_api_base_url}
|
||||||
default-src 'none'
|
default-src 'none'
|
||||||
font-src 'self' https://cb6e6126.ngrok.io
|
font-src 'self' #{local_domain}
|
||||||
form-action 'none'
|
form-action 'none'
|
||||||
frame-ancestors 'none'
|
frame-ancestors 'none'
|
||||||
frame-src 'self' https:
|
frame-src 'self' https:
|
||||||
img-src 'self' data: blob: https://cb6e6126.ngrok.io
|
img-src 'self' data: blob: #{local_domain}
|
||||||
manifest-src 'self' https://cb6e6126.ngrok.io
|
manifest-src 'self' #{local_domain}
|
||||||
media-src 'self' data: https://cb6e6126.ngrok.io
|
media-src 'self' data: #{local_domain}
|
||||||
script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'
|
script-src 'self' #{local_domain} 'wasm-unsafe-eval'
|
||||||
style-src 'self' https://cb6e6126.ngrok.io 'nonce-ZbA+JmE7+bK8F5qvADZHuQ=='
|
style-src 'self' #{local_domain} 'nonce-ZbA+JmE7+bK8F5qvADZHuQ=='
|
||||||
worker-src 'self' blob: https://cb6e6126.ngrok.io
|
worker-src 'self' blob: #{local_domain}
|
||||||
CSP
|
CSP
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def local_domain
|
||||||
|
root_url(host: Rails.configuration.x.local_domain).chop
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -10,8 +10,8 @@ RSpec.describe 'Link headers' do
|
||||||
get short_account_path(username: account)
|
get short_account_path(username: account)
|
||||||
|
|
||||||
expect(response)
|
expect(response)
|
||||||
.to have_http_link_header('https://cb6e6126.ngrok.io/.well-known/webfinger?resource=acct%3Atest%40cb6e6126.ngrok.io').for(rel: 'lrdd', type: 'application/jrd+json')
|
.to have_http_link_header(webfinger_url(resource: account.to_webfinger_s)).for(rel: 'lrdd', type: 'application/jrd+json')
|
||||||
.and have_http_link_header('https://cb6e6126.ngrok.io/users/test').for(rel: 'alternate', type: 'application/activity+json')
|
.and have_http_link_header(account_url(account)).for(rel: 'alternate', type: 'application/activity+json')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -25,7 +25,15 @@ RSpec.describe 'Remote Interaction Helper' do
|
||||||
|
|
||||||
def expected_csp_headers
|
def expected_csp_headers
|
||||||
<<~CSP.squish
|
<<~CSP.squish
|
||||||
default-src 'none'; frame-ancestors 'self'; form-action 'none'; script-src 'self' https://cb6e6126.ngrok.io 'wasm-unsafe-eval'; connect-src https:
|
default-src 'none';
|
||||||
|
frame-ancestors 'self';
|
||||||
|
form-action 'none';
|
||||||
|
script-src 'self' #{local_domain} 'wasm-unsafe-eval';
|
||||||
|
connect-src https:
|
||||||
CSP
|
CSP
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def local_domain
|
||||||
|
root_url(host: Rails.configuration.x.local_domain).chop
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -14,7 +14,7 @@ RSpec.describe 'The /.well-known/host-meta request' do
|
||||||
)
|
)
|
||||||
|
|
||||||
expect(xrd_link_template_value)
|
expect(xrd_link_template_value)
|
||||||
.to eq 'https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}'
|
.to eq "https://#{Rails.configuration.x.local_domain}/.well-known/webfinger?resource={uri}"
|
||||||
end
|
end
|
||||||
|
|
||||||
def xrd_link_template_value
|
def xrd_link_template_value
|
||||||
|
@ -57,7 +57,7 @@ RSpec.describe 'The /.well-known/host-meta request' do
|
||||||
{
|
{
|
||||||
links: [
|
links: [
|
||||||
'rel' => 'lrdd',
|
'rel' => 'lrdd',
|
||||||
'template' => 'https://cb6e6126.ngrok.io/.well-known/webfinger?resource={uri}',
|
'template' => "https://#{Rails.configuration.x.local_domain}/.well-known/webfinger?resource={uri}",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -26,8 +26,8 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
|
||||||
|
|
||||||
expect(response.parsed_body)
|
expect(response.parsed_body)
|
||||||
.to include(
|
.to include(
|
||||||
subject: eq('acct:alice@cb6e6126.ngrok.io'),
|
subject: eq(alice.to_webfinger_s),
|
||||||
aliases: include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
|
aliases: include("https://#{Rails.configuration.x.local_domain}/@alice", "https://#{Rails.configuration.x.local_domain}/users/alice")
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -125,10 +125,14 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
|
||||||
|
|
||||||
expect(response.parsed_body)
|
expect(response.parsed_body)
|
||||||
.to include(
|
.to include(
|
||||||
subject: 'acct:mastodon.internal@cb6e6126.ngrok.io',
|
subject: instance_actor.to_webfinger_s,
|
||||||
aliases: ['https://cb6e6126.ngrok.io/actor']
|
aliases: [instance_actor_url]
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def instance_actor
|
||||||
|
Account.where(id: Account::INSTANCE_ACTOR_ID).first
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with no resource parameter' do
|
context 'with no resource parameter' do
|
||||||
|
|
|
@ -21,7 +21,7 @@ RSpec::Matchers.define :have_thread_headers do
|
||||||
.and(have_header('References', conversation_header_regex))
|
.and(have_header('References', conversation_header_regex))
|
||||||
end
|
end
|
||||||
|
|
||||||
def conversation_header_regex = /<conversation-\d+.\d\d\d\d-\d\d-\d\d@cb6e6126.ngrok.io>/
|
def conversation_header_regex = /<conversation-\d+.\d\d\d\d-\d\d-\d\d@#{Regexp.quote(Rails.configuration.x.local_domain)}>/
|
||||||
end
|
end
|
||||||
|
|
||||||
RSpec::Matchers.define :have_standard_headers do |type|
|
RSpec::Matchers.define :have_standard_headers do |type|
|
||||||
|
|
|
@ -31,7 +31,7 @@ RSpec.describe 'email confirmation flow when captcha is enabled' do
|
||||||
|
|
||||||
# It presents a page with a link to the app callback
|
# It presents a page with a link to the app callback
|
||||||
expect(page)
|
expect(page)
|
||||||
.to have_content(I18n.t('auth.confirmations.registration_complete', domain: 'cb6e6126.ngrok.io'))
|
.to have_content(I18n.t('auth.confirmations.registration_complete', domain: Rails.configuration.x.local_domain))
|
||||||
.and have_link(I18n.t('auth.confirmations.clicking_this_link'), href: client_app.confirmation_redirect_uri)
|
.and have_link(I18n.t('auth.confirmations.clicking_this_link'), href: client_app.confirmation_redirect_uri)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -31,6 +31,6 @@ RSpec.describe 'redirection confirmations' do
|
||||||
end
|
end
|
||||||
|
|
||||||
def redirect_title
|
def redirect_title
|
||||||
I18n.t('redirects.title', instance: 'cb6e6126.ngrok.io')
|
I18n.t('redirects.title', instance: Rails.configuration.x.local_domain)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user