From 0eb8d7428431bffd9e80fbf39435457e417c94fb Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 30 May 2019 08:49:37 +0800 Subject: [PATCH] DEV: Reduce object fabrication in `CookedPostProcessor` spec. --- spec/components/cooked_post_processor_spec.rb | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb index 4c51589d48e..c2962e4f658 100644 --- a/spec/components/cooked_post_processor_spec.rb +++ b/spec/components/cooked_post_processor_spec.rb @@ -5,9 +5,9 @@ require "cooked_post_processor" require "file_store/s3_store" describe CookedPostProcessor do - context "#post_process" do - fab!(:upload) { Fabricate(:upload) } + fab!(:upload) { Fabricate(:upload) } + context "#post_process" do fab!(:post) do Fabricate(:post, raw: <<~RAW) @@ -260,7 +260,7 @@ describe CookedPostProcessor do before { SiteSetting.responsive_post_image_sizes = "1|1.5|3" } it "includes responsive images on demand" do - upload = Fabricate(:upload, width: 2000, height: 1500, filesize: 10000) + upload.update!(width: 2000, height: 1500, filesize: 10000) post = Fabricate(:post, raw: "hello ") # fake some optimized images @@ -324,7 +324,7 @@ describe CookedPostProcessor do end it "doesn't include response images for cropped images" do - upload = Fabricate(:upload, width: 200, height: 4000, filesize: 12345) + upload.update!(width: 200, height: 4000, filesize: 12345) post = Fabricate(:post, raw: "hello ") # fake some optimized images @@ -404,8 +404,6 @@ describe CookedPostProcessor do end context "with large images" do - fab!(:upload) { Fabricate(:upload) } - fab!(:post) do Fabricate(:post, raw: <<~HTML) @@ -482,8 +480,6 @@ describe CookedPostProcessor do end context "with tall images" do - fab!(:upload) { Fabricate(:upload) } - fab!(:post) do Fabricate(:post, raw: <<~HTML) @@ -510,8 +506,6 @@ describe CookedPostProcessor do end context "with iPhone X screenshots" do - fab!(:upload) { Fabricate(:upload) } - fab!(:post) do Fabricate(:post, raw: <<~HTML) @@ -543,8 +537,6 @@ describe CookedPostProcessor do end context "with large images when using subfolders" do - fab!(:upload) { Fabricate(:upload) } - fab!(:post) do Fabricate(:post, raw: <<~HTML) @@ -592,8 +584,6 @@ describe CookedPostProcessor do end context "with title" do - fab!(:upload) { Fabricate(:upload) } - fab!(:post) do Fabricate(:post, raw: <<~HTML) @@ -833,7 +823,7 @@ describe CookedPostProcessor do Oneboxer.stubs(:onebox).with(url, anything).returns("") post = Fabricate(:post, raw: url) - upload = Fabricate(:upload, url: "https://test.s3.amazonaws.com/something.png") + upload.update!(url: "https://test.s3.amazonaws.com/something.png") post.custom_fields[Post::DOWNLOADED_IMAGES] = { "//image.com/avatar.png": upload.id } post.save_custom_fields @@ -1031,7 +1021,8 @@ describe CookedPostProcessor do uploaded_file = file_from_fixtures("smallest.png") upload_sha1 = Digest::SHA1.hexdigest(File.read(uploaded_file)) - upload = Fabricate(:upload, + + upload.update!( original_filename: "smallest.png", width: 10, height: 20,