jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rails-5.1'

Browse Source
This commit is contained in:
Albert Yi
2018-04-11 11:40:36 -07:00
parent a25629bff9 abce4d2551
commit d9d98f05c2
361 changed files with 4795 additions and 4798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/unit/storage_manager_test.rb
View File

@@ -46,7 +46,7 @@ class StorageManagerTest < ActiveSupport::TestCase
context "#store_file and #delete_file methods" do
setup do
@post = FactoryGirl.create(:post, file_ext: "png")
@post = FactoryBot.create(:post, file_ext: "png")
@storage_manager.store_file(StringIO.new("data"), @post, :preview)
@storage_manager.store_file(StringIO.new("data"), @post, :large)
@@ -76,7 +76,7 @@ class StorageManagerTest < ActiveSupport::TestCase
context "#file_url method" do
should "return the correct urls" do
@post = FactoryGirl.create(:post, file_ext: "png")
@post = FactoryBot.create(:post, file_ext: "png")
@storage_manager.stubs(:tagged_filenames).returns(false)
assert_equal("/data/#{@post.md5}.png", @storage_manager.file_url(@post, :original))
@@ -98,8 +98,8 @@ class StorageManagerTest < ActiveSupport::TestCase
context "StorageManager::Hybrid" do
setup do
@post1 = FactoryGirl.build(:post, id: 1, file_ext: "png")
@post2 = FactoryGirl.build(:post, id: 2, file_ext: "png")
@post1 = FactoryBot.build(:post, id: 1, file_ext: "png")
@post2 = FactoryBot.build(:post, id: 2, file_ext: "png")
@storage_manager = StorageManager::Hybrid.new do |id, md5, file_ext, type|
if id.odd?