@@ -25,6 +25,15 @@ describe('bin/encore.js', function() {
25
25
testSetup . emptyTmpDir ( ) ;
26
26
const testDir = testSetup . createTestAppDir ( ) ;
27
27
28
+ fs . writeFileSync (
29
+ path . join ( testDir , 'package.json' ) ,
30
+ `{
31
+ "devDependencies": {
32
+ "@symfony/webpack-encore": "*"
33
+ }
34
+ }`
35
+ ) ;
36
+
28
37
fs . writeFileSync (
29
38
path . join ( testDir , 'webpack.config.js' ) ,
30
39
`
@@ -45,6 +54,8 @@ module.exports = Encore.getWebpackConfig();
45
54
throw new Error ( `Error executing encore: ${ err } ${ stderr } ${ stdout } ` ) ;
46
55
}
47
56
57
+ expect ( stdout ) . to . not . contain ( 'Webpack is already provided by Webpack Encore' ) ;
58
+
48
59
done ( ) ;
49
60
} ) ;
50
61
} ) ;
@@ -142,4 +153,44 @@ module.exports = Encore.getWebpackConfig();
142
153
done ( ) ;
143
154
} ) ;
144
155
} ) ;
156
+
157
+ it ( 'Display a warning message when webpack is also added to the package.json file' , ( done ) => {
158
+ testSetup . emptyTmpDir ( ) ;
159
+ const testDir = testSetup . createTestAppDir ( ) ;
160
+
161
+ fs . writeFileSync (
162
+ path . join ( testDir , 'package.json' ) ,
163
+ `{
164
+ "devDependencies": {
165
+ "@symfony/webpack-encore": "*",
166
+ "webpack": "*"
167
+ }
168
+ }`
169
+ ) ;
170
+
171
+ fs . writeFileSync (
172
+ path . join ( testDir , 'webpack.config.js' ) ,
173
+ `
174
+ const Encore = require('../../index.js');
175
+ Encore
176
+ .setOutputPath('build/')
177
+ .setPublicPath('/build')
178
+ .addEntry('main', './js/no_require')
179
+ ;
180
+
181
+ module.exports = Encore.getWebpackConfig();
182
+ `
183
+ ) ;
184
+
185
+ const binPath = path . resolve ( __dirname , '../' , '../' , 'bin' , 'encore.js' ) ;
186
+ exec ( `node ${ binPath } dev --context=${ testDir } ` , { cwd : testDir } , ( err , stdout , stderr ) => {
187
+ if ( err ) {
188
+ throw new Error ( `Error executing encore: ${ err } ${ stderr } ${ stdout } ` ) ;
189
+ }
190
+
191
+ expect ( stdout ) . to . contain ( 'Webpack is already provided by Webpack Encore' ) ;
192
+
193
+ done ( ) ;
194
+ } ) ;
195
+ } ) ;
145
196
} ) ;
0 commit comments