Commit 7afca793 authored by Paul Slaughter's avatar Paul Slaughter

Proxy webpack dev server in test environment

- Otherwise we run into issues when running tests
  locally wherever `resetServiceWorkersPublicPath`
  is called.
- Test env specific checks are a bit of an anti pattern.
parent a125e8fb
......@@ -83,16 +83,8 @@ 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
ActionController::Base.asset_host.try(:chomp, '/')
end
# We proxy webpack output in 'test' and 'dev' environment, so we can just use asset_host
ActionController::Base.asset_host.try(:chomp, '/')
end
def webpack_public_path
......
......@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment