From 1efda1c4535d453b3f9e71c61a225d7cc0d7e75f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 17 May 2017 00:41:15 +0200 Subject: Fix #2572 - Resolve preview cards for remote statuses as well as local ones (#3088) --- spec/services/fetch_link_card_service_spec.rb | 28 +++++++++++++++++++++++---- spec/services/process_feed_service_spec.rb | 2 ++ 2 files changed, 26 insertions(+), 4 deletions(-) (limited to 'spec/services') diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb index 681c99c11..9df41cf55 100644 --- a/spec/services/fetch_link_card_service_spec.rb +++ b/spec/services/fetch_link_card_service_spec.rb @@ -1,15 +1,35 @@ require 'rails_helper' RSpec.describe FetchLinkCardService do + subject { FetchLinkCardService.new } + before do stub_request(:head, 'http://example.xn--fiqs8s/').to_return(status: 200, headers: { 'Content-Type' => 'text/html' }) stub_request(:get, 'http://example.xn--fiqs8s/').to_return(request_fixture('idn.txt')) + stub_request(:head, 'https://github.com/qbi/WannaCry').to_return(status: 404) + + subject.call(status) + end + + context 'in a local status' do + context do + let(:status) { Fabricate(:status, text: 'Check out http://example.中国') } + + it 'works with IDN URLs' do + expect(a_request(:get, 'http://example.xn--fiqs8s/')).to have_been_made.at_least_once + end + end end - it 'works with IDN URLs' do - status = Fabricate(:status, text: 'Check out http://example.中国') + context 'in a remote status' do + let(:status) { Fabricate(:status, uri: 'abc', text: 'Habt ihr ein paar gute Links zu #Wannacry herumfliegen? Ich will mal unter
https://github.com/qbi/WannaCry was sammeln. !security ') } + + it 'parses out URLs' do + expect(a_request(:head, 'https://github.com/qbi/WannaCry')).to have_been_made.at_least_once + end - FetchLinkCardService.new.call(status) - expect(a_request(:get, 'http://example.xn--fiqs8s/')).to have_been_made.at_least_once + it 'ignores URLs to hashtags' do + expect(a_request(:head, 'https://quitter.se/tag/wannacry')).to_not have_been_made + end end end diff --git a/spec/services/process_feed_service_spec.rb b/spec/services/process_feed_service_spec.rb index 9ac22cbba..d85ee3b56 100644 --- a/spec/services/process_feed_service_spec.rb +++ b/spec/services/process_feed_service_spec.rb @@ -9,6 +9,8 @@ RSpec.describe ProcessFeedService do before do stub_request(:post, "https://pubsubhubbub.superfeedr.com/").to_return(:status => 200, :body => "", :headers => {}) + stub_request(:head, "http://kickass.zone/media/2").to_return(:status => 404) + stub_request(:head, "http://kickass.zone/media/3").to_return(:status => 404) stub_request(:get, "http://kickass.zone/system/accounts/avatars/000/000/001/large/eris.png").to_return(request_fixture('avatar.txt')) stub_request(:get, "http://kickass.zone/system/media_attachments/files/000/000/002/original/morpheus_linux.jpg?1476059910").to_return(request_fixture('attachment1.txt')) stub_request(:get, "http://kickass.zone/system/media_attachments/files/000/000/003/original/gizmo.jpg?1476060065").to_return(request_fixture('attachment2.txt')) -- cgit