Merge branch 'sh-revert-mr-80586' into 'master'

Revert "Revert "Proxy webpack dev server in test environment""

See merge request gitlab-org/gitlab!83337

app/helpers/webpack_helper.rb

@@ -83,17 +83,9 @@ module WebpackHelper
   end
 
   def webpack_public_host
-    # We do not proxy the webpack output in the 'test' environment,
-    # so we must reference the webpack dev server directly.
-    if Rails.env.test? && Gitlab.config.webpack.dev_server.enabled
-      host = Gitlab.config.webpack.dev_server.host
-      port = Gitlab.config.webpack.dev_server.port
-      protocol = Gitlab.config.webpack.dev_server.https ? 'https' : 'http'
-      "#{protocol}://#{host}:#{port}"
-    else
+    # We proxy webpack output in 'test' and 'dev' environment, so we can just use asset_host
     ActionController::Base.asset_host.try(:chomp, '/')
   end
-  end
 
   def webpack_public_path
     relative_path = Gitlab.config.gitlab.relative_url_root

config/initializers/static_files.rb

@@ -21,7 +21,7 @@ if app.config.public_file_server.enabled
 
   # If webpack-dev-server is configured, proxy webpack's public directory
   # instead of looking for static assets
-  if Gitlab.config.webpack.dev_server.enabled && Rails.env.development?
+  if Gitlab.config.webpack.dev_server.enabled && Gitlab.dev_or_test_env?
     app.config.middleware.insert_before(
       Gitlab::Middleware::Static,
       Gitlab::Webpack::DevServerMiddleware,