From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Mar 2018 16:33:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1797'
X-Git-Tag: live~4165
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/be35d4ab9cfc7e18df1b3d4f2d58d8aea1eb8f4c?hp=e3c8a57184679bb589709b0d346844a395f4a9a7

Merge remote-tracking branch 'upstream/pull/1797'
---

diff --git a/config/application.rb b/config/application.rb
index 9ba122daf..b6e2ba467 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,8 +43,5 @@ module OpenStreetMap
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end
-
-    # Configure image optimisation
-    config.assets.image_optim = YAML.load_file(Rails.root.join("config", "image_optim.yml"))
   end
 end
diff --git a/config/image_optim/test.yml b/config/image_optim/test.yml
new file mode 100644
index 000000000..00584e523
--- /dev/null
+++ b/config/image_optim/test.yml
@@ -0,0 +1,11 @@
+skip_missing_workers: true
+advpng: false
+gifsicle: false
+jhead: false
+jpegoptim: false
+jpegtran: false
+optipng: false
+pngquant: false
+pngout: false
+pngcrush: false
+svgo: false
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 18d5ec2f7..9abc7aa70 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -4,6 +4,8 @@ require "capybara/poltergeist"
 WebMock.disable_net_connect!(:allow_localhost => true)
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  ActionDispatch::SystemTesting::Server.silence_puma = true
+
   driven_by :poltergeist, :screen_size => [1400, 1400]
 
   def initialize(*args)