Skip to content

Commit 5ff7a18

Browse files
bhollowaybholloway
committed
remove test assertions webpack2,3
1 parent 0c50d7f commit 5ff7a18

14 files changed

+109
-1131
lines changed

‎test/cases/absolute-asset.js‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module.exports = test(
6767
// absolute urls are processed
6868
testRoot('')(
6969
all(buildDevNormal, buildProdNormal)(
70-
onlyMeta('meta.version.webpack < 5')(
70+
onlyMeta('meta.version.webpack == 4')(
7171
assertWebpackNotOk,
7272
assertAssetError
7373
),
@@ -115,7 +115,7 @@ module.exports = test(
115115
assertNoErrors,
116116
assertDebugMessages,
117117
assertCssSourceMapComment(true),
118-
compose(onlyMeta('meta.engine == "postcss" && meta.version.webpack < 5'), assertCssContent, outdent)`
118+
compose(onlyMeta('meta.version.webpack == 4'), assertCssContent, outdent)`
119119
.some-class-name {
120120
single-quoted: url(d68e763c825dc0e388929ae1b375ce18.jpg);
121121
double-quoted: url(d68e763c825dc0e388929ae1b375ce18.jpg);
@@ -126,7 +126,7 @@ module.exports = test(
126126
.another-class-name {
127127
display: block; }
128128
`,
129-
compose(onlyMeta('meta.engine == "postcss" && meta.version.webpack >= 5'), assertCssContent, outdent)`
129+
compose(onlyMeta('meta.version.webpack >= 5'), assertCssContent, outdent)`
130130
.some-class-name {
131131
single-quoted: url(9eb57a84abbf8abc636d0faa71f9a800.jpg);
132132
double-quoted: url(9eb57a84abbf8abc636d0faa71f9a800.jpg);
@@ -143,7 +143,7 @@ module.exports = test(
143143
assertNoErrors,
144144
assertDebugMessages,
145145
assertCssSourceMapComment(true),
146-
compose(onlyMeta('meta.engine == "postcss"'), assertCssContent, outdent)`
146+
compose(assertCssContent, outdent)`
147147
.some-class-name {
148148
single-quoted: url("../images/img.jpg");
149149
double-quoted: url("../images/img.jpg");
@@ -159,13 +159,10 @@ module.exports = test(
159159
assertWebpackOk,
160160
assertNoErrors,
161161
assertDebugMessages,
162-
onlyMeta('meta.version.webpack < 4')(
163-
assertCssSourceMapComment(true)
164-
),
165162
onlyMeta('meta.version.webpack >= 4')(
166163
assertCssSourceMapComment(false)
167164
),
168-
compose(onlyMeta('meta.version.webpack < 5'), assertCssContent, trim)`
165+
compose(onlyMeta('meta.version.webpack == 4'), assertCssContent, trim)`
169166
.some-class-name{single-quoted:url(d68e763c825dc0e388929ae1b375ce18.jpg);double-quoted:
170167
url(d68e763c825dc0e388929ae1b375ce18.jpg);unquoted:url(d68e763c825dc0e388929ae1b375ce18.jpg);query:
171168
url(d68e763c825dc0e388929ae1b375ce18.jpg);hash:url(d68e763c825dc0e388929ae1b375ce18.jpg#hash)}
@@ -182,22 +179,12 @@ module.exports = test(
182179
assertWebpackOk,
183180
assertNoErrors,
184181
assertDebugMessages,
185-
onlyMeta('meta.version.webpack < 4')(
186-
assertCssSourceMapComment(true),
187-
compose(assertCssContent, trim)`
188-
.some-class-name{single-quoted:url("../images/img.jpg");double-quoted:url("../images/img.jpg");unquoted:
189-
url(../images/img.jpg);query:url(../images/img.jpg?query);hash:url(../images/img.jpg#hash)}
190-
.another-class-name{display:block}
191-
`
192-
),
193-
onlyMeta('meta.version.webpack >= 4')(
194-
assertCssSourceMapComment(false),
195-
compose(assertCssContent, trim)`
196-
.some-class-name{single-quoted:url(../images/img.jpg);double-quoted:url(../images/img.jpg);unquoted:
197-
url(../images/img.jpg);query:url(../images/img.jpg?query);hash:url(../images/img.jpg#hash)}
198-
.another-class-name{display:block}
199-
`
200-
)
182+
assertCssSourceMapComment(false),
183+
compose(assertCssContent, trim)`
184+
.some-class-name{single-quoted:url(../images/img.jpg);double-quoted:url(../images/img.jpg);unquoted:
185+
url(../images/img.jpg);query:url(../images/img.jpg?query);hash:url(../images/img.jpg#hash)}
186+
.another-class-name{display:block}
187+
`
201188
),
202189
buildProdNoDevtool(
203190
assertWebpackOk,

‎test/cases/adjacent-asset.js‎

Lines changed: 9 additions & 94 deletions
Large diffs are not rendered by default.

‎test/cases/declaration-mixin.js‎

Lines changed: 9 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ module.exports = test(
7474
assertNoErrors,
7575
assertIncludeMessages,
7676
assertCssSourceMapComment(true),
77-
compose(onlyMeta('meta.version.webpack < 5'), assertCssContent, outdent)`
77+
compose(onlyMeta('meta.version.webpack == 4'), assertCssContent, outdent)`
7878
.some-class-name {
7979
background-image: url(d68e763c825dc0e388929ae1b375ce18.jpg); }
8080
`,
@@ -88,25 +88,6 @@ module.exports = test(
8888
assertNoErrors,
8989
assertIncludeMessages,
9090
assertCssSourceMapComment(true),
91-
compose(
92-
onlyMeta('meta.version.webpack < 4'),
93-
assertCssAndSourceMapContent('main.4f223bc5b560c4a026550f4491acfbd9.css', {sanitiseSources: true}),
94-
outdent
95-
)`
96-
/src/index.scss
97-
---------------------------------------------------------------------------------------------------
98-
2:01 .some-class-name {⏎ 1:01 .some-class-name {⏎
99-
@include feature;⏎ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
100-
}░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
101-
102-
/src/feature/mixins.scss
103-
---------------------------------------------------------------------------------------------------
104-
2:03 ░░background-image: url('img.jpg')░░░░░░░░░░ 2:03 ░░background-image: url("./img.jpg");░░░░░░░
105-
2:35 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░;⏎ 2:38 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ }⏎
106-
}░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ ⏎
107-
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ /*# sourceMappingURL=main.4f223bc5b560c4a026
108-
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ 550f4491acfbd9.css.map*/░░░░░░░░░░░░░░░░░░░░
109-
`,
11091
compose(
11192
onlyMeta('meta.version.webpack == 4'),
11293
assertCssAndSourceMapContent('main.ac9a51ab438078a6f4ae.css', {sourceRoot: 'src'}),
@@ -152,13 +133,8 @@ module.exports = test(
152133
assertWebpackOk,
153134
assertNoErrors,
154135
assertIncludeMessages,
155-
onlyMeta('meta.version.webpack < 4')(
156-
assertCssSourceMapComment(true)
157-
),
158-
onlyMeta('meta.version.webpack >= 4')(
159-
assertCssSourceMapComment(false)
160-
),
161-
compose(onlyMeta('meta.version.webpack < 5'), assertCssContent, trim)`
136+
assertCssSourceMapComment(false),
137+
compose(onlyMeta('meta.version.webpack == 4'), assertCssContent, trim)`
162138
.some-class-name{background-image:url(d68e763c825dc0e388929ae1b375ce18.jpg)}
163139
`,
164140
compose(onlyMeta('meta.version.webpack >= 5'), assertCssContent, trim)`
@@ -169,31 +145,7 @@ module.exports = test(
169145
assertWebpackOk,
170146
assertNoErrors,
171147
assertIncludeMessages,
172-
onlyMeta('meta.version.webpack < 4')(
173-
assertCssSourceMapComment(true)
174-
),
175-
onlyMeta('meta.version.webpack >= 4')(
176-
assertCssSourceMapComment(false)
177-
),
178-
compose(
179-
onlyMeta('meta.version.webpack < 4'),
180-
assertCssAndSourceMapContent('main.4d5011bf8252e9bbc18d8b57151e8684.css', {sanitiseSources: true}),
181-
outdent
182-
)`
183-
/src/index.scss
184-
---------------------------------------------------------------------------------------------------
185-
2:01 .some-class-name {⏎ 1:01 .some-class-name{░░░░░░░░░░░░░░░░░░░░░░░░░░░
186-
@include feature;⏎ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
187-
}░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
188-
189-
/src/feature/mixins.scss
190-
---------------------------------------------------------------------------------------------------
191-
2:03 ░░background-image: url('img.jpg')░░░░░░░░░░ 1:18 ░░░░░░░░░░░░░░░░░background-image:url("./img
192-
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ .jpg")░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
193-
2:35 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░;⏎ 1:51 ░░░░░░}⏎
194-
}░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ /*# sourceMappingURL=main.4d5011bf8252e9bbc1
195-
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ 8d8b57151e8684.css.map*/░░░░░░░░░░░░░░░░░░░░
196-
`,
148+
assertCssSourceMapComment(false),
197149
compose(
198150
onlyMeta('meta.version.webpack == 4'),
199151
assertCssAndSourceMapContent('main.1989d2b100f23c3bc54e.css', {sourceRoot: 'src'}),
@@ -261,7 +213,7 @@ module.exports = test(
261213
assertNoErrors,
262214
assertMixinMessages,
263215
assertCssSourceMapComment(true),
264-
compose(onlyMeta('meta.version.webpack < 5'), assertCssContent, outdent)`
216+
compose(onlyMeta('meta.version.webpack == 4'), assertCssContent, outdent)`
265217
.some-class-name {
266218
background-image: url(d68e763c825dc0e388929ae1b375ce18.jpg); }
267219
`,
@@ -275,26 +227,6 @@ module.exports = test(
275227
assertNoErrors,
276228
assertMixinMessages,
277229
assertCssSourceMapComment(true),
278-
compose(
279-
onlyMeta('meta.version.webpack < 4'),
280-
assertCssAndSourceMapContent('main.c766c04a6915d3b7c3f26d15d8de1db9.css', {sanitiseSources: true}),
281-
outdent
282-
)`
283-
/src/index.scss
284-
---------------------------------------------------------------------------------------------------
285-
2:01 .some-class-name {⏎ 1:01 .some-class-name {⏎
286-
@include feature;⏎ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
287-
}░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
288-
289-
/src/feature/mixins.scss
290-
---------------------------------------------------------------------------------------------------
291-
2:03 ░░background-image: url('img.jpg')░░░░░░░░░░ 2:03 ░░background-image: url("./feature/img.jpg")
292-
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ ;░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
293-
2:35 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░;⏎ 2:46 ░ }⏎
294-
}░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ ⏎
295-
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ /*# sourceMappingURL=main.c766c04a6915d3b7c3
296-
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ f26d15d8de1db9.css.map*/░░░░░░░░░░░░░░░░░░░░
297-
`,
298230
compose(
299231
onlyMeta('meta.version.webpack == 4'),
300232
assertCssAndSourceMapContent('main.efbf7d7cec35eab2f203.css', {sourceRoot: 'src'}),
@@ -340,48 +272,19 @@ module.exports = test(
340272
assertWebpackOk,
341273
assertNoErrors,
342274
assertMixinMessages,
343-
onlyMeta('meta.version.webpack < 4')(
344-
assertCssSourceMapComment(true)
345-
),
346-
onlyMeta('meta.version.webpack >= 4')(
347-
assertCssSourceMapComment(false)
348-
),
349-
compose(onlyMeta('meta.version.webpack < 5'), assertCssContent, trim)`
275+
assertCssSourceMapComment(false),
276+
compose(onlyMeta('meta.version.webpack == 4'), assertCssContent, trim)`
350277
.some-class-name{background-image:url(d68e763c825dc0e388929ae1b375ce18.jpg)}
351278
`,
352-
compose(onlyMeta('meta.version.webpack == 5'), assertCssContent, trim)`
279+
compose(onlyMeta('meta.version.webpack >= 5'), assertCssContent, trim)`
353280
.some-class-name{background-image:url(9eb57a84abbf8abc636d0faa71f9a800.jpg)}
354281
`
355282
),
356283
buildProdNoUrl(
357284
assertWebpackOk,
358285
assertNoErrors,
359286
assertMixinMessages,
360-
onlyMeta('meta.version.webpack < 4')(
361-
assertCssSourceMapComment(true)
362-
),
363-
onlyMeta('meta.version.webpack >= 4')(
364-
assertCssSourceMapComment(false)
365-
),
366-
compose(
367-
onlyMeta('meta.version.webpack < 4'),
368-
assertCssAndSourceMapContent('main.6549357ba014e5f25d88df1c87c53781.css', {sanitiseSources: true}),
369-
outdent
370-
)`
371-
/src/index.scss
372-
---------------------------------------------------------------------------------------------------
373-
2:01 .some-class-name {⏎ 1:01 .some-class-name{░░░░░░░░░░░░░░░░░░░░░░░░░░░
374-
@include feature;⏎ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
375-
}░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
376-
377-
/src/feature/mixins.scss
378-
---------------------------------------------------------------------------------------------------
379-
2:03 ░░background-image: url('img.jpg')░░░░░░░░░░ 1:18 ░░░░░░░░░░░░░░░░░background-image:url("./fea
380-
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ ture/img.jpg")░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
381-
2:35 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░;⏎ 1:59 ░░░░░░░░░░░░░░}⏎
382-
}░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ /*# sourceMappingURL=main.6549357ba014e5f25d
383-
░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ 88df1c87c53781.css.map*/░░░░░░░░░░░░░░░░░░░░
384-
`,
287+
assertCssSourceMapComment(false),
385288
compose(
386289
onlyMeta('meta.version.webpack == 4'),
387290
assertCssAndSourceMapContent('main.0ba19ee65019ece2ba37.css', {sourceRoot: 'src'}),

0 commit comments

Comments
 (0)