diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
commit | 980c004f0601bbfaf440c0ea56de408ccfd79007 (patch) | |
tree | 8ed051d5e8b9c530b3282cfd84e34e50b3bcfa57 /spec/models/domain_block_spec.rb | |
parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
parent | 24cd2126c6cfb80844ef9ffbf61647b3d9afdc68 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one
Diffstat (limited to 'spec/models/domain_block_spec.rb')
-rw-r--r-- | spec/models/domain_block_spec.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/models/domain_block_spec.rb b/spec/models/domain_block_spec.rb index d98c5e118..28647dc89 100644 --- a/spec/models/domain_block_spec.rb +++ b/spec/models/domain_block_spec.rb @@ -52,6 +52,16 @@ RSpec.describe DomainBlock, type: :model do block = Fabricate(:domain_block, domain: 'sub.example.com') expect(DomainBlock.rule_for('sub.example.com')).to eq block end + + it 'returns a rule matching a blocked TLD' do + block = Fabricate(:domain_block, domain: 'google') + expect(DomainBlock.rule_for('google')).to eq block + end + + it 'returns a rule matching a subdomain of a blocked TLD' do + block = Fabricate(:domain_block, domain: 'google') + expect(DomainBlock.rule_for('maps.google')).to eq block + end end describe '#stricter_than?' do |