Merge branch 'master' into glitch-soc/merge-upstream

2018-09-20 18:36:00 +02:00
parent fba0200765 50c90a909e
commit 343acd96cc
3 changed files with 34 additions and 2 deletions
--- a/spec/services/verify_link_service_spec.rb
+++ b/spec/services/verify_link_service_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe VerifyLinkService, type: :service do
  let(:field)   { Account::Field.new(account, 'name' => 'Website', 'value' => 'http://example.com') }

  before do
+    stub_request(:head, 'https://redirect.me/abc').to_return(status: 301, headers: { 'Location' => ActivityPub::TagManager.instance.url_for(account) })
    stub_request(:get, 'http://example.com').to_return(status: 200, body: html)
    subject.call(field)
  end
@@ -56,6 +57,21 @@ RSpec.describe VerifyLinkService, type: :service do
    end
  end

+  context 'when a link goes through a redirect back' do
+    let(:html) do
+      <<-HTML
+        <!doctype html>
+        <head>
+          <link type="text/html" href="https://redirect.me/abc" rel="me" />
+        </head>
+      HTML
+    end
+
+    it 'marks the field as verified' do
+      expect(field.verified?).to be true
+    end
+  end
+
  context 'when a link does not contain a link back' do
    let(:html) { '' }