From c92c32ecda46c7c89549d73783d0e040d4d526ea Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Sun, 15 Feb 2015 12:21:29 -0800
Subject: [PATCH] fix tests

---
 app/logical/sources/strategies/pixiv.rb |  4 ----
 app/logical/twitter_api.rb              | 12 ++++++++++++
 app/models/upload.rb                    | 10 +++++++---
 test/test_helper.rb                     |  3 ++-
 test/unit/sources/nico_seiga_test.rb    |  2 ++
 5 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 app/logical/twitter_api.rb

diff --git a/app/logical/sources/strategies/pixiv.rb b/app/logical/sources/strategies/pixiv.rb
index 4c96c4c7e..7d4834781 100644
--- a/app/logical/sources/strategies/pixiv.rb
+++ b/app/logical/sources/strategies/pixiv.rb
@@ -188,8 +188,6 @@ module Sources
 
         if not stacc_link.nil?
           stacc_link.attr("href").sub(%r!^/stacc/!i, '')
-        else
-          raise Sources::Error.new("Couldn't find Pixiv moniker in page: #{normalized_url}")
         end
       end
 
@@ -224,8 +222,6 @@ module Sources
           element = elements.first
           thumbnail_url = element.attr("src") || element.attr("data-src")
           return rewrite_thumbnails(thumbnail_url, is_manga)
-        else
-          raise Sources::Error.new("Couldn't find image thumbnail URL in page: #{normalized_url}")
         end
       end
 
diff --git a/app/logical/twitter_api.rb b/app/logical/twitter_api.rb
new file mode 100644
index 000000000..4dbf28497
--- /dev/null
+++ b/app/logical/twitter_api.rb
@@ -0,0 +1,12 @@
+class TwitterApi
+  def client
+    api_token = Cache.get("twitter-api-token")
+    hoge = Twitter::Rest::Client.new do |config|
+      config.consumer_key = Danbooru.config.twiter_api_key
+      config.consumer_secret = Danbooru.config.twitter_api_secret
+      config.bearer_token = api_token if api_token
+    end
+    Cache.put("twitter-api-token", hoge.bearer_token)
+    hoge
+  end
+end
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 3929d938b..a8273966e 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -239,8 +239,12 @@ class Upload < ActiveRecord::Base
       if is_image?
         Danbooru.resize(source_path, output_path, width, height, quality)
       elsif is_ugoira?
-        # by the time this runs we'll have moved source_path to md5_file_path
-        ugoira_service.generate_resizes(md5_file_path, resized_file_path_for(Danbooru.config.large_image_width), resized_file_path_for(Danbooru.config.small_image_width))
+        if Delayed::Worker.delay_jobs
+          # by the time this runs we'll have moved source_path to md5_file_path
+          ugoira_service.generate_resizes(md5_file_path, resized_file_path_for(Danbooru.config.large_image_width), resized_file_path_for(Danbooru.config.small_image_width))
+        else
+          ugoira_service.generate_resizes(source_path, resized_file_path_for(Danbooru.config.large_image_width), resized_file_path_for(Danbooru.config.small_image_width))
+        end
       elsif is_video?
         generate_video_preview_for(width, height, output_path)
       end
@@ -342,7 +346,7 @@ class Upload < ActiveRecord::Base
         "#{Rails.root}/public/data/preview/#{prefix}#{md5}.jpg"
 
       when Danbooru.config.large_image_width
-        "#{Rails.root}/public/data/sample/#{Danbooru.config.large_image_prefix}#{prefix}#{md5}.#{large_file_ext}"
+        "#{Rails.root}/public/data/sample/#{prefix}#{Danbooru.config.large_image_prefix}#{md5}.#{large_file_ext}"
       end
     end
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 92bba422f..425c47b3f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -112,7 +112,8 @@ VCR.configure do |c|
 
   c.default_cassette_options = {
     match_requests_on: [
-      :method
+      :method,
+      VCR.request_matchers.uri_without_param(:PHPSESSID)
     ]
   }
 end
diff --git a/test/unit/sources/nico_seiga_test.rb b/test/unit/sources/nico_seiga_test.rb
index c3f95db5d..5f40cb4fa 100644
--- a/test/unit/sources/nico_seiga_test.rb
+++ b/test/unit/sources/nico_seiga_test.rb
@@ -4,6 +4,8 @@ module Sources
   class NicoSeigaTest < ActiveSupport::TestCase
     context "The source site for nico seiga" do
       setup do
+        Cache.put("nico-seiga-session", "user_session_23669858_ea46b9d1b3e64785a14d5a5d9c6606f5b5c24b4a233835d84362b9820f20a758")
+        
         VCR.use_cassette("source-nico-seiga-unit-test-1", :record => :none) do
           @site_1 = Sources::Site.new("http://lohas.nicoseiga.jp/o/59c833da35d7bc6586a8292103e5e38c9df23b7c/1417762099/4496506")
           @site_1.get