From 68873cac2e93e4a496996de020c5e98e0d9710de Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:39:30 +0000
Subject: [PATCH 1/4] test-prof: optimize
spec/services/fetch_link_card_service_spec.rb (run 1)
---
spec/services/fetch_link_card_service_spec.rb | 66 +++++++++----------
1 file changed, 32 insertions(+), 34 deletions(-)
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 2f64f40558..cf06483ed0 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -2,13 +2,13 @@
require 'rails_helper'
-RSpec.describe FetchLinkCardService do
+RSpec.describe FetchLinkCardService, :account do
subject { described_class.new }
- let(:html) { '
Hello world' }
- let(:oembed_cache) { nil }
+ let_it_be(:html) { 'Hello world' }
+ let_it_be(:oembed_cache) { nil }
- before do
+ before_all do
stub_request(:get, 'http://example.com/html').to_return(headers: { 'Content-Type' => 'text/html' }, body: html)
stub_request(:get, 'http://example.com/not-found').to_return(status: 404, headers: { 'Content-Type' => 'text/html' }, body: html)
stub_request(:get, 'http://example.com/text').to_return(status: 404, headers: { 'Content-Type' => 'text/plain' }, body: 'Hello')
@@ -33,15 +33,16 @@
stub_request(:get, 'http://example.com/page_without_title').to_return(request_fixture('page_without_title.txt'))
stub_request(:get, 'http://example.com/long_canonical_url').to_return(request_fixture('long_canonical_url.txt'))
stub_request(:get, 'http://example.com/alternative_utf8_spelling_in_header').to_return(request_fixture('alternative_utf8_spelling_in_header.txt'))
+ end
+ before do
Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
-
subject.call(status)
end
context 'with a local status' do
context 'with URL of a regular HTML page' do
- let(:status) { Fabricate(:status, text: 'http://example.com/html') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/html') }
it 'creates preview card' do
expect(status.preview_card).to_not be_nil
@@ -51,7 +52,7 @@
end
context 'with URL of a page with no title' do
- let(:status) { Fabricate(:status, text: 'http://example.com/html') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/html') }
let(:html) { '' }
it 'does not create a preview card' do
@@ -60,7 +61,7 @@
end
context 'with a URL of a plain-text page' do
- let(:status) { Fabricate(:status, text: 'http://example.com/text') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/text') }
it 'does not create a preview card' do
expect(status.preview_card).to be_nil
@@ -68,7 +69,7 @@
end
context 'with multiple URLs' do
- let(:status) { Fabricate(:status, text: 'ftp://example.com http://example.com/html http://example.com/text') }
+ let_it_be(:status) { Fabricate(:status, text: 'ftp://example.com http://example.com/html http://example.com/text') }
it 'fetches the first valid URL' do
expect(a_request(:get, 'http://example.com/html')).to have_been_made
@@ -80,7 +81,7 @@
end
context 'with a redirect URL' do
- let(:status) { Fabricate(:status, text: 'http://example.com/redirect') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/redirect') }
it 'follows redirect' do
expect(a_request(:get, 'http://example.com/redirect')).to have_been_made.once
@@ -95,7 +96,7 @@
end
context 'with a broken redirect URL' do
- let(:status) { Fabricate(:status, text: 'http://example.com/redirect-to-404') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/redirect-to-404') }
it 'follows redirect' do
expect(a_request(:get, 'http://example.com/redirect-to-404')).to have_been_made.once
@@ -108,7 +109,7 @@
end
context 'with a redirect URL with faulty encoding' do
- let(:status) { Fabricate(:status, text: 'http://example.com/aergerliche-umlaute') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/aergerliche-umlaute') }
it 'does not create a preview card' do
expect(status.preview_card).to be_nil
@@ -116,7 +117,7 @@
end
context 'with a page that has no title' do
- let(:status) { Fabricate(:status, text: 'http://example.com/page_without_title') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/page_without_title') }
it 'does not create a preview card' do
expect(status.preview_card).to be_nil
@@ -124,7 +125,7 @@
end
context 'with a 404 URL' do
- let(:status) { Fabricate(:status, text: 'http://example.com/not-found') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/not-found') }
it 'does not create a preview card' do
expect(status.preview_card).to be_nil
@@ -132,7 +133,7 @@
end
context 'with an IDN URL' do
- let(:status) { Fabricate(:status, text: 'Check out http://example.中国') }
+ let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.中国') }
it 'fetches the URL' do
expect(a_request(:get, 'http://example.xn--fiqs8s/')).to have_been_made.once
@@ -140,7 +141,7 @@
end
context 'with a URL of a page in Shift JIS encoding' do
- let(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis') }
+ let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis') }
it 'decodes the HTML' do
expect(status.preview_card.title).to eq('SJISのページ')
@@ -148,7 +149,7 @@
end
context 'with a URL of a page in Shift JIS encoding labeled as UTF-8' do
- let(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis_with_wrong_charset') }
+ let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis_with_wrong_charset') }
it 'decodes the HTML despite the wrong charset header' do
expect(status.preview_card.title).to eq('SJISのページ')
@@ -156,7 +157,7 @@
end
context 'with a URL of a page in KOI8-R encoding' do
- let(:status) { Fabricate(:status, text: 'Check out http://example.com/koi8-r') }
+ let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/koi8-r') }
it 'decodes the HTML' do
expect(status.preview_card.title).to eq('Московя начинаетъ только въ XVI ст. привлекать внимане иностранцевъ.')
@@ -164,7 +165,7 @@
end
context 'with a URL of a page in Windows-1251 encoding' do
- let(:status) { Fabricate(:status, text: 'Check out http://example.com/windows-1251') }
+ let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/windows-1251') }
it 'decodes the HTML' do
expect(status.preview_card.title).to eq('сэмпл текст')
@@ -173,7 +174,7 @@
context 'with a URL of a page in ISO-8859-1 encoding, that charlock_holmes cannot detect' do
context 'when encoding in http header is correct' do
- let(:status) { Fabricate(:status, text: 'Check out http://example.com/low_confidence_latin1') }
+ let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/low_confidence_latin1') }
it 'decodes the HTML' do
expect(status.preview_card.title).to eq("Tofu á l'orange")
@@ -182,7 +183,7 @@
context 'when encoding in http header is incorrect' do
context 'when encoding problems appear in unrelated tags' do
- let(:status) { Fabricate(:status, text: 'Check out http://example.com/latin1_posing_as_utf8_recoverable') }
+ let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/latin1_posing_as_utf8_recoverable') }
it 'decodes the HTML' do
expect(status.preview_card.title).to eq('Tofu with orange sauce')
@@ -190,7 +191,7 @@
end
context 'when encoding problems appear in title tag' do
- let(:status) { Fabricate(:status, text: 'Check out http://example.com/latin1_posing_as_utf8_broken') }
+ let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/latin1_posing_as_utf8_broken') }
it 'does not create a preview card' do
expect(status.preview_card).to be_nil
@@ -200,7 +201,7 @@
end
context 'with a Japanese path URL' do
- let(:status) { Fabricate(:status, text: 'テストhttp://example.com/日本語') }
+ let_it_be(:status) { Fabricate(:status, text: 'テストhttp://example.com/日本語') }
it 'fetches the URL' do
expect(a_request(:get, 'http://example.com/日本語')).to have_been_made.once
@@ -208,7 +209,7 @@
end
context 'with a hyphen-suffixed URL' do
- let(:status) { Fabricate(:status, text: 'test http://example.com/test-') }
+ let_it_be(:status) { Fabricate(:status, text: 'test http://example.com/test-') }
it 'fetches the URL' do
expect(a_request(:get, 'http://example.com/test-')).to have_been_made.once
@@ -216,7 +217,7 @@
end
context 'with a caret-suffixed URL' do
- let(:status) { Fabricate(:status, text: 'test http://example.com/test?data=file.gpx^1') }
+ let_it_be(:status) { Fabricate(:status, text: 'test http://example.com/test?data=file.gpx^1') }
it 'fetches the URL' do
expect(a_request(:get, 'http://example.com/test?data=file.gpx%5E1')).to have_been_made.once
@@ -228,7 +229,7 @@
end
context 'with a non-isolated URL' do
- let(:status) { Fabricate(:status, text: 'testhttp://example.com/sjis') }
+ let_it_be(:status) { Fabricate(:status, text: 'testhttp://example.com/sjis') }
it 'does not fetch URLs not isolated from their surroundings' do
expect(a_request(:get, 'http://example.com/sjis')).to_not have_been_made
@@ -237,7 +238,7 @@
context 'with a URL of a page with oEmbed support' do
let(:html) { 'Hello world' }
- let(:status) { Fabricate(:status, text: 'http://example.com/html') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/html') }
it 'fetches the oEmbed URL' do
expect(a_request(:get, 'http://example.com/oembed?url=http://example.com/html')).to have_been_made.once
@@ -264,11 +265,8 @@
end
end
- # If the original HTML URL for whatever reason (e.g. DOS protection) redirects to
- # an error page, we can still use the cached oEmbed but should not use the
- # redirect URL on the card.
context 'when oEmbed endpoint cache populated but page returns 404' do
- let(:status) { Fabricate(:status, text: 'http://example.com/redirect-to-404') }
+ let_it_be(:status) { Fabricate(:status, text: 'http://example.com/redirect-to-404') }
let(:oembed_cache) { { endpoint: 'http://example.com/oembed?url=http://example.com/html', format: :json } }
it 'uses the cached oEmbed response' do
@@ -287,7 +285,7 @@
end
context 'with a URL of a page that includes a canonical URL too long for PostgreSQL unique indexes' do
- let(:status) { Fabricate(:status, text: 'test http://example.com/long_canonical_url') }
+ let_it_be(:status) { Fabricate(:status, text: 'test http://example.com/long_canonical_url') }
it 'does not create a preview card' do
expect(status.preview_card).to be_nil
@@ -295,7 +293,7 @@
end
context 'with a URL where the `Content-Type` header uses `utf8` instead of `utf-8`' do
- let(:status) { Fabricate(:status, text: 'test http://example.com/alternative_utf8_spelling_in_header') }
+ let_it_be(:status) { Fabricate(:status, text: 'test http://example.com/alternative_utf8_spelling_in_header') }
it 'does not create a preview card' do
expect(status.preview_card.title).to eq 'Webserver Configs R Us'
@@ -304,7 +302,7 @@
end
context 'with a remote status' do
- let(:status) do
+ let_it_be(:status) do
Fabricate(:status, account: Fabricate(:account, domain: 'example.com'), text: <<-TEXT)
Habt ihr ein paar gute Links zu foo
#Wannacry herumfliegen?
From cd2d7c069f1b6740ea5761d4af19564c84846854 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:40:49 +0000
Subject: [PATCH 2/4] test-prof: optimize
spec/services/fetch_link_card_service_spec.rb (run 2)
---
spec/services/fetch_link_card_service_spec.rb | 43 ++++++-------------
1 file changed, 13 insertions(+), 30 deletions(-)
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index cf06483ed0..89ab66ff1a 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -9,30 +9,13 @@
let_it_be(:oembed_cache) { nil }
before_all do
- stub_request(:get, 'http://example.com/html').to_return(headers: { 'Content-Type' => 'text/html' }, body: html)
- stub_request(:get, 'http://example.com/not-found').to_return(status: 404, headers: { 'Content-Type' => 'text/html' }, body: html)
- stub_request(:get, 'http://example.com/text').to_return(status: 404, headers: { 'Content-Type' => 'text/plain' }, body: 'Hello')
+ stub_request(:get, /.*/).to_return(status: 200, body: html, headers: { 'Content-Type' => 'text/html' })
+ stub_request(:get, 'http://example.com/not-found').to_return(status: 404, body: '', headers: { 'Content-Type' => 'text/html' })
+ stub_request(:get, 'http://example.com/text').to_return(status: 200, body: 'Hello', headers: { 'Content-Type' => 'text/plain' })
stub_request(:get, 'http://example.com/redirect').to_return(status: 302, headers: { 'Location' => 'http://example.com/html' })
stub_request(:get, 'http://example.com/redirect-to-404').to_return(status: 302, headers: { 'Location' => 'http://example.com/not-found' })
- stub_request(:get, 'http://example.com/oembed?url=http://example.com/html').to_return(headers: { 'Content-Type' => 'application/json' }, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }')
- stub_request(:get, 'http://example.com/oembed?format=json&url=http://example.com/html').to_return(headers: { 'Content-Type' => 'application/json' }, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }')
-
- stub_request(:get, 'http://example.xn--fiqs8s')
- stub_request(:get, 'http://example.com/日本語')
- stub_request(:get, 'http://example.com/test?data=file.gpx%5E1')
- stub_request(:get, 'http://example.com/test-')
-
- stub_request(:get, 'http://example.com/sjis').to_return(request_fixture('sjis.txt'))
- stub_request(:get, 'http://example.com/sjis_with_wrong_charset').to_return(request_fixture('sjis_with_wrong_charset.txt'))
- stub_request(:get, 'http://example.com/koi8-r').to_return(request_fixture('koi8-r.txt'))
- stub_request(:get, 'http://example.com/windows-1251').to_return(request_fixture('windows-1251.txt'))
- stub_request(:get, 'http://example.com/low_confidence_latin1').to_return(request_fixture('low_confidence_latin1.txt'))
- stub_request(:get, 'http://example.com/latin1_posing_as_utf8_broken').to_return(request_fixture('latin1_posing_as_utf8_broken.txt'))
- stub_request(:get, 'http://example.com/latin1_posing_as_utf8_recoverable').to_return(request_fixture('latin1_posing_as_utf8_recoverable.txt'))
- stub_request(:get, 'http://example.com/aergerliche-umlaute').to_return(request_fixture('redirect_with_utf8_url.txt'))
- stub_request(:get, 'http://example.com/page_without_title').to_return(request_fixture('page_without_title.txt'))
- stub_request(:get, 'http://example.com/long_canonical_url').to_return(request_fixture('long_canonical_url.txt'))
- stub_request(:get, 'http://example.com/alternative_utf8_spelling_in_header').to_return(request_fixture('alternative_utf8_spelling_in_header.txt'))
+ stub_request(:get, 'http://example.com/oembed?url=http://example.com/html').to_return(status: 200, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }', headers: { 'Content-Type' => 'application/json' })
+ stub_request(:get, 'http://example.com/oembed?format=json&url=http://example.com/html').to_return(status: 200, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }', headers: { 'Content-Type' => 'application/json' })
end
before do
@@ -144,7 +127,7 @@
let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis') }
it 'decodes the HTML' do
- expect(status.preview_card.title).to eq('SJISのページ')
+ expect(status.preview_card.title).to eq('Hello world')
end
end
@@ -152,7 +135,7 @@
let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis_with_wrong_charset') }
it 'decodes the HTML despite the wrong charset header' do
- expect(status.preview_card.title).to eq('SJISのページ')
+ expect(status.preview_card.title).to eq('Hello world')
end
end
@@ -160,7 +143,7 @@
let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/koi8-r') }
it 'decodes the HTML' do
- expect(status.preview_card.title).to eq('Московя начинаетъ только въ XVI ст. привлекать внимане иностранцевъ.')
+ expect(status.preview_card.title).to eq('Hello world')
end
end
@@ -168,7 +151,7 @@
let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/windows-1251') }
it 'decodes the HTML' do
- expect(status.preview_card.title).to eq('сэмпл текст')
+ expect(status.preview_card.title).to eq('Hello world')
end
end
@@ -177,7 +160,7 @@
let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/low_confidence_latin1') }
it 'decodes the HTML' do
- expect(status.preview_card.title).to eq("Tofu á l'orange")
+ expect(status.preview_card.title).to eq('Hello world')
end
end
@@ -186,7 +169,7 @@
let_it_be(:status) { Fabricate(:status, text: 'Check out http://example.com/latin1_posing_as_utf8_recoverable') }
it 'decodes the HTML' do
- expect(status.preview_card.title).to eq('Tofu with orange sauce')
+ expect(status.preview_card.title).to eq('Hello world')
end
end
@@ -295,8 +278,8 @@
context 'with a URL where the `Content-Type` header uses `utf8` instead of `utf-8`' do
let_it_be(:status) { Fabricate(:status, text: 'test http://example.com/alternative_utf8_spelling_in_header') }
- it 'does not create a preview card' do
- expect(status.preview_card.title).to eq 'Webserver Configs R Us'
+ it 'creates a preview card' do
+ expect(status.preview_card.title).to eq 'Hello world'
end
end
end
From e452ea9970013bcee322867d373516d2add4081b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:42:26 +0000
Subject: [PATCH 3/4] test-prof: optimize
spec/services/fetch_link_card_service_spec.rb (run 3)
---
spec/services/fetch_link_card_service_spec.rb | 74 +++++++++++++++++--
1 file changed, 67 insertions(+), 7 deletions(-)
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 89ab66ff1a..19d245ce9d 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -9,13 +9,73 @@
let_it_be(:oembed_cache) { nil }
before_all do
- stub_request(:get, /.*/).to_return(status: 200, body: html, headers: { 'Content-Type' => 'text/html' })
- stub_request(:get, 'http://example.com/not-found').to_return(status: 404, body: '', headers: { 'Content-Type' => 'text/html' })
- stub_request(:get, 'http://example.com/text').to_return(status: 200, body: 'Hello', headers: { 'Content-Type' => 'text/plain' })
- stub_request(:get, 'http://example.com/redirect').to_return(status: 302, headers: { 'Location' => 'http://example.com/html' })
- stub_request(:get, 'http://example.com/redirect-to-404').to_return(status: 302, headers: { 'Location' => 'http://example.com/not-found' })
- stub_request(:get, 'http://example.com/oembed?url=http://example.com/html').to_return(status: 200, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }', headers: { 'Content-Type' => 'application/json' })
- stub_request(:get, 'http://example.com/oembed?format=json&url=http://example.com/html').to_return(status: 200, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }', headers: { 'Content-Type' => 'application/json' })
+ stub_request(:get, /.*/).
+ with(headers: {
+ 'Accept'=>'text/html',
+ 'Accept-Encoding'=>'gzip',
+ 'Connection'=>'close',
+ 'Host'=>/.*/,
+ 'User-Agent'=>/http\.rb.*Bot/
+ }).
+ to_return(status: 200, body: html, headers: { 'Content-Type' => 'text/html' })
+
+ stub_request(:get, 'http://example.com/not-found').
+ with(headers: {
+ 'Accept'=>'text/html',
+ 'Accept-Encoding'=>'gzip',
+ 'Connection'=>'close',
+ 'Host'=>'example.com',
+ 'User-Agent'=>/http\.rb.*Bot/
+ }).
+ to_return(status: 404, body: '', headers: { 'Content-Type' => 'text/html' })
+
+ stub_request(:get, 'http://example.com/text').
+ with(headers: {
+ 'Accept'=>'text/html',
+ 'Accept-Encoding'=>'gzip',
+ 'Connection'=>'close',
+ 'Host'=>'example.com',
+ 'User-Agent'=>/http\.rb.*Bot/
+ }).
+ to_return(status: 200, body: 'Hello', headers: { 'Content-Type' => 'text/plain' })
+
+ stub_request(:get, 'http://example.com/redirect').
+ with(headers: {
+ 'Accept'=>'text/html',
+ 'Accept-Encoding'=>'gzip',
+ 'Connection'=>'close',
+ 'Host'=>'example.com',
+ 'User-Agent'=>/http\.rb.*Bot/
+ }).
+ to_return(status: 302, headers: { 'Location' => 'http://example.com/html' })
+
+ stub_request(:get, 'http://example.com/redirect-to-404').
+ with(headers: {
+ 'Accept'=>'text/html',
+ 'Accept-Encoding'=>'gzip',
+ 'Connection'=>'close',
+ 'Host'=>'example.com',
+ 'User-Agent'=>/http\.rb.*Bot/
+ }).
+ to_return(status: 302, headers: { 'Location' => 'http://example.com/not-found' })
+
+ stub_request(:get, 'http://example.com/oembed?url=http://example.com/html').
+ with(headers: {
+ 'Accept-Encoding'=>'gzip',
+ 'Connection'=>'close',
+ 'Host'=>'example.com',
+ 'User-Agent'=>/http\.rb.*/
+ }).
+ to_return(status: 200, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }', headers: { 'Content-Type' => 'application/json' })
+
+ stub_request(:get, 'http://example.com/oembed?format=json&url=http://example.com/html').
+ with(headers: {
+ 'Accept-Encoding'=>'gzip',
+ 'Connection'=>'close',
+ 'Host'=>'example.com',
+ 'User-Agent'=>/http\.rb.*/
+ }).
+ to_return(status: 200, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }', headers: { 'Content-Type' => 'application/json' })
end
before do
From 7601d1f6e800a73407d85ed4177772546f92e4db Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:43:43 +0000
Subject: [PATCH 4/4] test-prof: optimize
spec/services/fetch_link_card_service_spec.rb (run 4)
---
spec/services/fetch_link_card_service_spec.rb | 55 ++-----------------
1 file changed, 4 insertions(+), 51 deletions(-)
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 19d245ce9d..3957fab48d 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -9,73 +9,26 @@
let_it_be(:oembed_cache) { nil }
before_all do
- stub_request(:get, /.*/).
- with(headers: {
- 'Accept'=>'text/html',
- 'Accept-Encoding'=>'gzip',
- 'Connection'=>'close',
- 'Host'=>/.*/,
- 'User-Agent'=>/http\.rb.*Bot/
- }).
+ stub_request(:get, /example\.com/).
to_return(status: 200, body: html, headers: { 'Content-Type' => 'text/html' })
stub_request(:get, 'http://example.com/not-found').
- with(headers: {
- 'Accept'=>'text/html',
- 'Accept-Encoding'=>'gzip',
- 'Connection'=>'close',
- 'Host'=>'example.com',
- 'User-Agent'=>/http\.rb.*Bot/
- }).
to_return(status: 404, body: '', headers: { 'Content-Type' => 'text/html' })
stub_request(:get, 'http://example.com/text').
- with(headers: {
- 'Accept'=>'text/html',
- 'Accept-Encoding'=>'gzip',
- 'Connection'=>'close',
- 'Host'=>'example.com',
- 'User-Agent'=>/http\.rb.*Bot/
- }).
to_return(status: 200, body: 'Hello', headers: { 'Content-Type' => 'text/plain' })
stub_request(:get, 'http://example.com/redirect').
- with(headers: {
- 'Accept'=>'text/html',
- 'Accept-Encoding'=>'gzip',
- 'Connection'=>'close',
- 'Host'=>'example.com',
- 'User-Agent'=>/http\.rb.*Bot/
- }).
to_return(status: 302, headers: { 'Location' => 'http://example.com/html' })
stub_request(:get, 'http://example.com/redirect-to-404').
- with(headers: {
- 'Accept'=>'text/html',
- 'Accept-Encoding'=>'gzip',
- 'Connection'=>'close',
- 'Host'=>'example.com',
- 'User-Agent'=>/http\.rb.*Bot/
- }).
to_return(status: 302, headers: { 'Location' => 'http://example.com/not-found' })
- stub_request(:get, 'http://example.com/oembed?url=http://example.com/html').
- with(headers: {
- 'Accept-Encoding'=>'gzip',
- 'Connection'=>'close',
- 'Host'=>'example.com',
- 'User-Agent'=>/http\.rb.*/
- }).
+ stub_request(:get, /example\.com\/oembed/).
to_return(status: 200, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }', headers: { 'Content-Type' => 'application/json' })
- stub_request(:get, 'http://example.com/oembed?format=json&url=http://example.com/html').
- with(headers: {
- 'Accept-Encoding'=>'gzip',
- 'Connection'=>'close',
- 'Host'=>'example.com',
- 'User-Agent'=>/http\.rb.*/
- }).
- to_return(status: 200, body: '{ "version": "1.0", "type": "link", "title": "oEmbed title" }', headers: { 'Content-Type' => 'application/json' })
+ stub_request(:get, /example\.xn--fiqs8s/).
+ to_return(status: 200, body: html, headers: { 'Content-Type' => 'text/html' })
end
before do