fix tests

This commit is contained in:
r888888888
2015-02-15 12:21:29 -08:00
parent f38cf1526c
commit c92c32ecda
5 changed files with 23 additions and 8 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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