Refactor sources

test/functional/uploads_controller_test.rb

@@ -68,6 +68,20 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest
         end
       end
 
+      context "for a direct link twitter post" do
+        setup do
+          @ref = "https://twitter.com/onsen_musume_jp/status/865534101918330881"
+          @source = "https://pbs.twimg.com/media/DAL-ntWV0AEbhes.jpg:orig"
+        end
+
+        should "trigger the preprocessor" do
+          assert_difference(-> { Upload.preprocessed.count }, 1) do
+            get_auth new_upload_path, @user, params: {:url => @source, :ref => @ref}
+            Delayed::Worker.new.work_off
+          end
+        end
+      end
+
       context "for a twitter post" do
         setup do
           @source = "https://twitter.com/frappuccino/status/566030116182949888"
@@ -89,6 +103,20 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest
         end
       end
 
+      context "for a pixiv post" do
+        setup do
+          @ref = "http://www.pixiv.net/member_illust.php?mode=medium&illust_id=49270482"
+          @source = "https://i.pximg.net/img-original/img/2015/03/14/17/53/32/49270482_p0.jpg"
+        end
+
+        should "trigger the preprocessor" do
+          assert_difference(-> { Upload.preprocessed.count }, 1) do
+            get_auth new_upload_path, @user, params: {:url => @source, :ref => @ref}
+            Delayed::Worker.new.work_off
+          end
+        end
+      end
+
       context "for a post that has already been uploaded" do
         setup do
           as_user do
@@ -149,6 +177,48 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest
     end
 
     context "create action" do
+      context "when a preprocessed upload already exists" do
+        context "for twitter" do
+          setup do
+            as_user do
+              @ref = "https://twitter.com/onsen_musume_jp/status/865534101918330881"
+              @source = "https://pbs.twimg.com/media/DAL-ntWV0AEbhes.jpg:orig"
+              @upload = create(:upload, status: "preprocessed", source: @source, referer_url: @ref, image_width: 0, image_height: 0, file_size: 0, md5: "something", file_ext: "jpg")
+            end
+          end
+
+          should "update the predecessor" do
+            assert_difference(->{ Post.count }, 1) do
+              assert_difference(->{ Upload.count }, 0) do
+                post_auth uploads_path, @user, params: {:upload => {:tag_string => "aaa", :rating => "q", :source => @source, :referer_url => @ref}}
+              end
+            end
+            post = Post.last
+            assert_match(/aaa/, post.tag_string)            
+          end
+        end
+
+        context "for pixiv" do
+          setup do
+            @ref = "http://www.pixiv.net/member_illust.php?mode=medium&illust_id=49270482"
+            @source = "https://i.pximg.net/img-original/img/2015/03/14/17/53/32/49270482_p0.jpg"
+            as_user do
+              @upload = create(:upload, status: "preprocessed", source: @source, referer_url: @ref, image_width: 0, image_height: 0, file_size: 0, md5: "something", file_ext: "jpg")
+            end
+          end
+
+          should "update the predecessor" do
+            assert_difference(->{ Post.count }, 1) do
+              assert_difference(->{ Upload.count }, 0) do
+                post_auth uploads_path, @user, params: {:upload => {:tag_string => "aaa", :rating => "q", :source => @source, :referer_url => @ref}}
+              end
+            end
+            post = Post.last
+            assert_match(/aaa/, post.tag_string)            
+          end
+        end
+      end
+
       should "create a new upload" do
         assert_difference("Upload.count", 1) do
           file = Rack::Test::UploadedFile.new("#{Rails.root}/test/files/test.jpg", "image/jpeg")