From 0bf55fe2ff136d42190e541a48248552dcbb6167 Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlarek Date: Wed, 16 Oct 2019 10:39:31 +1100 Subject: [PATCH] Revert "FIX: public_file_server.enabled is false in test (#8192)" (#8196) This reverts commit 5a8fdd02fe209872b2e2452b9b83e227dfed1727. --- config/environments/test.rb | 2 +- spec/requests/uploads_controller_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index 4ff6594e90..da7b6f2ef3 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -10,7 +10,7 @@ Discourse::Application.configure do config.cache_classes = true # Configure static asset server for tests with Cache-Control for performance - config.public_file_server.enabled = false + config.public_file_server.enabled = true # don't consider reqs local so we can properly handle exceptions like we do in prd config.consider_all_requests_local = false diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb index 0d3231568c..cb738c73ea 100644 --- a/spec/requests/uploads_controller_spec.rb +++ b/spec/requests/uploads_controller_spec.rb @@ -266,6 +266,7 @@ describe UploadsController do end it 'returns 200 when js file' do + ActionDispatch::FileHandler.any_instance.stubs(:match?).returns(false) upload = upload_file("test.js", "themes") get upload.url expect(response.status).to eq(200)