Skip to content

Commit

Permalink
Adjust for new ENV
Browse files Browse the repository at this point in the history
  • Loading branch information
David Heinemeier Hansson committed Aug 25, 2021
1 parent 9675fbd commit 7d27890
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package/__tests__/development.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('Development environment', () => {
describe('webpackConfig', () => {
beforeEach(() => jest.resetModules())

test('should use development config and environment including devServer if WEBPACK_DEV_SERVER', () => {
test('should use development config and environment including devServer if WEBPACK_SERVE', () => {
process.env.RAILS_ENV = 'development'
process.env.NODE_ENV = 'development'
process.env.WEBPACK_DEV_SERVER = 'true'
Expand All @@ -28,7 +28,7 @@ describe('Development environment', () => {
})
})

test('should use development config and environment if WEBPACK_DEV_SERVER', () => {
test('should use development config and environment if WEBPACK_SERVE', () => {
process.env.RAILS_ENV = 'development'
process.env.NODE_ENV = 'development'
process.env.WEBPACK_DEV_SERVER = undefined
Expand Down
2 changes: 1 addition & 1 deletion test/dev_server_runner_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_environment_variables
cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/development.js"]
env = Webpacker::Compiler.env.dup
ENV["WEBPACKER_CONFIG"] = env["WEBPACKER_CONFIG"] = "#{test_app_path}/config/webpacker_other_location.yml"
env["WEBPACK_DEV_SERVER"] = "true"
env["WEBPACK_SERVE"] = "true"
verify_command(cmd, env: env)
end

Expand Down

0 comments on commit 7d27890

Please # to comment.