Merge pull request #3379 from evazion/fix-3377

Fix #3377: Batch bookmarklet doesn't fetch artist/tags from twitter

test/functional/sources_controller_test.rb

@@ -3,10 +3,20 @@ require 'test_helper'
 class SourcesControllerTest < ActionController::TestCase
   context "The sources controller" do
     context "show action" do
-      should "work" do
+      should "work for a pixiv URL" do
         get :show, { url: "http://www.pixiv.net/member_illust.php?mode=medium&illust_id=14901720", format: "json" }
         assert_response :success
       end
+
+      should "work for a direct twitter URL with referer" do
+        get :show, {
+          url: "https://pbs.twimg.com/media/B4HSEP5CUAA4xyu.png:large",
+          ref: "https://twitter.com/nounproject/status/540944400767922176",
+          format: "json"
+        }
+
+        assert_response :success
+      end
     end
   end
 end

test/unit/sources/twitter_test.rb

@@ -123,6 +123,21 @@ module Sources
       end
     end
 
+    context "The source site for a direct image and a referer" do
+      setup do
+        @site = Sources::Site.new("https://pbs.twimg.com/media/B4HSEP5CUAA4xyu.png:large", referer_url: "https://twitter.com/nounproject/status/540944400767922176")
+        @site.get
+      end
+
+      should "get the artist name" do
+        assert_equal("Noun Project", @site.artist_name)
+      end
+
+      should "get the image url" do
+        assert_equal("https://pbs.twimg.com/media/B4HSEP5CUAA4xyu.png:orig", @site.image_url)
+      end
+    end
+
     context "A tweet" do
       setup do
         @site = Sources::Site.new("https://twitter.com/noizave/status/875768175136317440")