github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

DEV: Combine S3 system spec helpers into one (#29580)

Browse Source 
It's annoying to have to do both of these every
time you write an S3 system spec, let's just do them
in one call instead.
This commit is contained in:
Martin Brennan 2024-11-05 09:28:14 +10:00 committed by GitHub
parent 1b5a7be3d4
commit badca20749
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/support/system_helpers.rb
View File

@ -127,7 +127,9 @@ module SystemHelpers
page.execute_script(js, selector, start, offset)
end
def setup_s3_system_test(enable_secure_uploads: false, enable_direct_s3_uploads: true)
def setup_or_skip_s3_system_test(enable_secure_uploads: false, enable_direct_s3_uploads: true)
skip_unless_s3_system_specs_enabled!
SiteSetting.enable_s3_uploads = true
SiteSetting.s3_upload_bucket = "discoursetest"

16
spec/system/s3_secure_uploads_spec.rb
View File

@ -23,9 +23,7 @@ describe "Uploading files in the composer to S3", type: :system do
end
it "marks uploads inside of private message posts as secure" do
skip_unless_s3_system_specs_enabled!
setup_s3_system_test(enable_secure_uploads: true)
setup_or_skip_s3_system_test(enable_secure_uploads: true)
sign_in(current_user)
topic_page.open_new_message
@ -45,10 +43,8 @@ describe "Uploading files in the composer to S3", type: :system do
end
it "marks uploads inside of private category posts as secure" do
skip_unless_s3_system_specs_enabled!
private_category = Fabricate(:private_category, group: Fabricate(:group))
setup_s3_system_test(enable_secure_uploads: true)
setup_or_skip_s3_system_test(enable_secure_uploads: true)
sign_in(current_user)
topic_page.open_new_topic
@ -68,10 +64,8 @@ describe "Uploading files in the composer to S3", type: :system do
end
it "marks uploads for all posts as secure when login_required" do
skip_unless_s3_system_specs_enabled!
SiteSetting.login_required = true
setup_s3_system_test(enable_secure_uploads: true)
setup_or_skip_s3_system_test(enable_secure_uploads: true)
sign_in(current_user)
topic_page.open_new_topic
@ -90,9 +84,7 @@ describe "Uploading files in the composer to S3", type: :system do
end
it "doesn't mark uploads for public posts as secure" do
skip_unless_s3_system_specs_enabled!
setup_s3_system_test(enable_secure_uploads: true)
setup_or_skip_s3_system_test(enable_secure_uploads: true)
sign_in(current_user)
topic_page.open_new_topic

8
spec/system/s3_uploads_spec.rb
View File

@ -10,9 +10,7 @@ describe "Uploading files in the composer to S3", type: :system do
describe "direct S3 uploads" do
describe "single part uploads" do
it "uploads custom avatars to S3" do
skip_unless_s3_system_specs_enabled!
setup_s3_system_test
setup_or_skip_s3_system_test
sign_in(current_user)
visit "/my/preferences/account"
@ -37,9 +35,7 @@ describe "Uploading files in the composer to S3", type: :system do
describe "multipart uploads" do
it "uploads a file in the post composer" do
skip_unless_s3_system_specs_enabled!
setup_s3_system_test
setup_or_skip_s3_system_test
sign_in(current_user)
topic.open_new_topic