mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-18 12:30:03 +00:00
parent
523e106cbf
commit
552d69ad96
|
@ -11,5 +11,7 @@ module DomainNormalizable
|
||||||
|
|
||||||
def normalize_domain
|
def normalize_domain
|
||||||
self.domain = TagManager.instance.normalize_domain(domain&.strip)
|
self.domain = TagManager.instance.normalize_domain(domain&.strip)
|
||||||
|
rescue Addressable::URI::InvalidURIError
|
||||||
|
errors.add(:domain, :invalid)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -94,25 +94,37 @@ RSpec.describe Api::V1::Admin::DomainAllowsController, type: :controller do
|
||||||
describe 'POST #create' do
|
describe 'POST #create' do
|
||||||
let!(:domain_allow) { Fabricate(:domain_allow, domain: 'example.com') }
|
let!(:domain_allow) { Fabricate(:domain_allow, domain: 'example.com') }
|
||||||
|
|
||||||
before do
|
context do
|
||||||
post :create, params: { domain: 'foo.bar.com' }
|
before do
|
||||||
|
post :create, params: { domain: 'foo.bar.com' }
|
||||||
|
end
|
||||||
|
|
||||||
|
it_behaves_like 'forbidden for wrong scope', 'write:statuses'
|
||||||
|
it_behaves_like 'forbidden for wrong role', ''
|
||||||
|
it_behaves_like 'forbidden for wrong role', 'Moderator'
|
||||||
|
|
||||||
|
it 'returns http success' do
|
||||||
|
expect(response).to have_http_status(200)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns expected domain name' do
|
||||||
|
json = body_as_json
|
||||||
|
expect(json[:domain]).to eq 'foo.bar.com'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates a domain block' do
|
||||||
|
expect(DomainAllow.find_by(domain: 'foo.bar.com')).to_not be_nil
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it_behaves_like 'forbidden for wrong scope', 'write:statuses'
|
context 'with invalid domain name' do
|
||||||
it_behaves_like 'forbidden for wrong role', ''
|
before do
|
||||||
it_behaves_like 'forbidden for wrong role', 'Moderator'
|
post :create, params: { domain: 'foo bar' }
|
||||||
|
end
|
||||||
|
|
||||||
it 'returns http success' do
|
it 'returns http unprocessable entity' do
|
||||||
expect(response).to have_http_status(200)
|
expect(response).to have_http_status(422)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns expected domain name' do
|
|
||||||
json = body_as_json
|
|
||||||
expect(json[:domain]).to eq 'foo.bar.com'
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates a domain block' do
|
|
||||||
expect(DomainAllow.find_by(domain: 'foo.bar.com')).to_not be_nil
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue