diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-26 19:18:55 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-26 19:18:55 +0100 |
| commit | aaa9ec340b7291bace3a899cfcfef7524ecdfe72 (patch) | |
| tree | c4070b5c32efc4b6474bfb0ca5814c5779a5b6f8 /spec/lib/link_details_extractor_spec.rb | |
| parent | 2287eebae0c1d699436a8cf3218d7cfe990a3605 (diff) | |
| parent | d7d049aab7578028492e73671769f0a350e34203 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit.
Diffstat (limited to 'spec/lib/link_details_extractor_spec.rb')
| -rw-r--r-- | spec/lib/link_details_extractor_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/lib/link_details_extractor_spec.rb b/spec/lib/link_details_extractor_spec.rb index 84bb4579c..7ea867c61 100644 --- a/spec/lib/link_details_extractor_spec.rb +++ b/spec/lib/link_details_extractor_spec.rb @@ -25,6 +25,14 @@ RSpec.describe LinkDetailsExtractor do expect(subject.canonical_url).to eq 'https://foo.com/article' end end + + context 'when canonical URL is set to "null"' do + let(:html) { '<!doctype html><link rel="canonical" href="null" />' } + + it 'ignores the canonical URLs' do + expect(subject.canonical_url).to eq original_url + end + end end context 'when structured data is present' do |