From 85973f4f37c8b94422f267654018d0d7f88ba32b Mon Sep 17 00:00:00 2001 From: slice Date: Sun, 31 Mar 2019 22:30:46 -0700 Subject: Improvements to image upload validation and creation (#10431) * Check if image value is nil? before creating an image Check if uploaded images aren't nil before creating SiteUpload models for them. * Validate presence of file in SiteUpload * Fix file presence validation * Fabricate SiteUpload#file * Add link to Creative Commons license --- spec/fabricators/assets/TEAPOT | 6 ++++++ spec/fabricators/assets/utah_teapot.png | Bin 0 -> 248232 bytes spec/fabricators/site_upload_fabricator.rb | 1 + 3 files changed, 7 insertions(+) create mode 100644 spec/fabricators/assets/TEAPOT create mode 100644 spec/fabricators/assets/utah_teapot.png (limited to 'spec/fabricators') diff --git a/spec/fabricators/assets/TEAPOT b/spec/fabricators/assets/TEAPOT new file mode 100644 index 000000000..e624ecb4c --- /dev/null +++ b/spec/fabricators/assets/TEAPOT @@ -0,0 +1,6 @@ +This "Utah teapot" photograph is licensed under the Creative Commons +Attribution-Share Alike 3.0 Unported license: + https://creativecommons.org/licenses/by-sa/3.0/deed.en + +Original source of work: + https://commons.wikimedia.org/wiki/File:Utah_teapot_simple_2.png diff --git a/spec/fabricators/assets/utah_teapot.png b/spec/fabricators/assets/utah_teapot.png new file mode 100644 index 000000000..6708361e5 Binary files /dev/null and b/spec/fabricators/assets/utah_teapot.png differ diff --git a/spec/fabricators/site_upload_fabricator.rb b/spec/fabricators/site_upload_fabricator.rb index 4a171486f..2efc57e28 100644 --- a/spec/fabricators/site_upload_fabricator.rb +++ b/spec/fabricators/site_upload_fabricator.rb @@ -1,2 +1,3 @@ Fabricator(:site_upload) do + file { File.open(File.join(Rails.root, 'spec', 'fabricators', 'assets', 'utah_teapot.png')) } end -- cgit