Skip to content

Commit 4595a99

Browse files
author
David Clark
committed
Update AVA
1 parent d3f0898 commit 4595a99

File tree

5 files changed

+2847
-50
lines changed

5 files changed

+2847
-50
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"index.js"
1313
],
1414
"devDependencies": {
15-
"ava": "0.12.0",
15+
"ava": "^0.19.1",
1616
"postcss": "5.0.16",
1717
"postcss-nested": "1.0.0",
1818
"postcss-nesting": "2.2.0"

‎test/api-test.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,55 +4,55 @@ import util from './util';
44

55
test(async t => {
66
const code = `a { b { top: 0; c { d {}}}}`;
7-
t.same(
7+
t.deepEqual(
88
await util.resolveChosenSelector(code, 'd'),
99
['a b c d'],
1010
);
1111
});
1212

1313
test(async t => {
1414
const code = `.foo { .bar &, a {}}`;
15-
t.same(
15+
t.deepEqual(
1616
await util.resolveChosenSelector(code, '.bar &'),
1717
['.bar .foo'],
1818
);
1919
});
2020

2121
test(async t => {
2222
const code = `.foo { .bar &, a, & + &:hover { b {}}}`;
23-
t.same(
23+
t.deepEqual(
2424
await util.resolveChosenSelector(code, 'b'),
2525
['.bar .foo b', '.foo + .foo:hover b', '.foo a b'],
2626
);
2727
});
2828

2929
test(async t => {
3030
const code = `.foo { @nest .bar &, & + &:hover { b {}}}`;
31-
t.same(
31+
t.deepEqual(
3232
await util.resolveChosenSelector(code, 'b'),
3333
['.bar .foo b', '.foo + .foo:hover b'],
3434
);
3535
});
3636

3737
test(async t => {
3838
const code = `.foo { .bar &, & + &:hover { c > & {}}}`;
39-
t.same(
39+
t.deepEqual(
4040
await util.resolveChosenSelector(code, 'c > &'),
4141
['c > .bar .foo', 'c > .foo + .foo:hover'],
4242
);
4343
});
4444

4545
test(async t => {
4646
const code = `.foo { @nest .bar &, & + &:hover { @nest c > & {}}}`;
47-
t.same(
47+
t.deepEqual(
4848
await util.resolveChosenSelector(code, 'c > &'),
4949
['c > .bar .foo', 'c > .foo + .foo:hover'],
5050
);
5151
});
5252

5353
test(async t => {
5454
const code = `.foo { &:hover, &_bar { > b {}}}`;
55-
t.same(
55+
t.deepEqual(
5656
await util.resolveChosenSelector(code, '> b'),
5757
['.foo:hover > b', '.foo_bar > b'],
5858
);

‎test/postcss-nested-test.js

+30-30
Original file line numberDiff line numberDiff line change
@@ -5,179 +5,179 @@ import util from './util';
55

66
test('postcss-nested unwraps rule inside rule', async t => {
77
const code = 'a { a: 1 } a { a: 1; b { b: 2; c { c: 3 } } }';
8-
t.same(
8+
t.deepEqual(
99
await util.postcssNestedResolve(code),
1010
await util.allExpected(code),
1111
);
12-
t.same(
12+
t.deepEqual(
1313
await util.allExpected(code),
1414
['a', 'a', 'a b', 'a b c'],
1515
);
1616
});
1717

1818
test('postcss-nested cleans rules after unwrap', async t => {
1919
const code = 'a { b .one {} b .two {} }';
20-
t.same(
20+
t.deepEqual(
2121
await util.postcssNestedResolve(code),
2222
await util.allExpected(code),
2323
);
24-
t.same(
24+
t.deepEqual(
2525
await util.allExpected(code),
2626
['a b .one', 'a b .two'],
2727
);
2828
});
2929

3030
test('postcss-nested replaces ampersand', async t => {
3131
const code = 'a { body &:hover b {} }';
32-
t.same(
32+
t.deepEqual(
3333
await util.postcssNestedResolve(code),
3434
await util.allExpected(code),
3535
);
36-
t.same(
36+
t.deepEqual(
3737
await util.allExpected(code),
3838
['body a:hover b'],
3939
);
4040
});
4141

4242
test('postcss-nested replaces ampersands', async t => {
4343
const code = 'a { &:hover, &:active {} }';
44-
t.same(
44+
t.deepEqual(
4545
await util.postcssNestedResolve(code),
4646
await util.allExpected(code),
4747
);
48-
t.same(
48+
t.deepEqual(
4949
await util.allExpected(code),
5050
['a:active', 'a:hover'],
5151
);
5252
});
5353

5454
test('postcss-nested replaces ampersand in string', async t => {
5555
const code = '.block { &_elem {} }';
56-
t.same(
56+
t.deepEqual(
5757
await util.postcssNestedResolve(code),
5858
await util.allExpected(code),
5959
);
60-
t.same(
60+
t.deepEqual(
6161
await util.allExpected(code),
6262
['.block_elem'],
6363
);
6464
});
6565

6666
test('postcss-nested unwrap rules inside at-rules', async t => {
6767
const code = '@media (max-width: 500px) { a { b {} } }';
68-
t.same(
68+
t.deepEqual(
6969
await util.postcssNestedResolve(code),
7070
await util.allExpected(code),
7171
);
72-
t.same(
72+
t.deepEqual(
7373
await util.allExpected(code),
7474
['a b'],
7575
);
7676
});
7777

7878
test('postcss-nested unwraps at-rule', async t => {
7979
const code = 'a { b { @media screen { width: auto } } }';
80-
t.same(
80+
t.deepEqual(
8181
await util.postcssNestedResolve(code),
8282
await util.allExpected(code),
8383
);
84-
t.same(
84+
t.deepEqual(
8585
await util.allExpected(code),
8686
['a b'],
8787
);
8888
});
8989

9090
test('postcss-nested unwraps at-rule with rules', async t => {
9191
const code = 'a { @media screen { b { color: black } } }';
92-
t.same(
92+
t.deepEqual(
9393
await util.postcssNestedResolve(code),
9494
await util.allExpected(code),
9595
);
96-
t.same(
96+
t.deepEqual(
9797
await util.allExpected(code),
9898
['a b'],
9999
);
100100
});
101101

102102
test('postcss-nested unwraps at-rules', async t => {
103103
const code = 'a { a: 1 } a { @media screen { @supports (a: 1) { a: 1 } } }';
104-
t.same(
104+
t.deepEqual(
105105
await util.postcssNestedResolve(code),
106106
await util.allExpected(code),
107107
);
108-
t.same(
108+
t.deepEqual(
109109
await util.allExpected(code),
110110
['a', 'a'],
111111
);
112112
});
113113

114114
test('postcss-nested processes comma', async t => {
115115
const code = '.one, .two { a {} }';
116-
t.same(
116+
t.deepEqual(
117117
await util.postcssNestedResolve(code),
118118
await util.allExpected(code),
119119
);
120-
t.same(
120+
t.deepEqual(
121121
await util.allExpected(code),
122122
['.one a', '.two a'],
123123
);
124124
});
125125

126126
test('postcss-nested processes comma with ampersand', async t => {
127127
const code = '.one, .two { &:hover {} }';
128-
t.same(
128+
t.deepEqual(
129129
await util.postcssNestedResolve(code),
130130
await util.allExpected(code),
131131
);
132-
t.same(
132+
t.deepEqual(
133133
await util.allExpected(code),
134134
['.one:hover', '.two:hover'],
135135
);
136136
});
137137

138138
test('postcss-nested processes comma inside', async t => {
139139
const code = 'a, b { .one, .two {} }';
140-
t.same(
140+
t.deepEqual(
141141
await util.postcssNestedResolve(code),
142142
await util.allExpected(code),
143143
);
144-
t.same(
144+
t.deepEqual(
145145
await util.allExpected(code),
146146
['a .one', 'a .two', 'b .one', 'b .two'],
147147
);
148148
});
149149

150150
test('postcss-nested moves comment with rule', async t => {
151151
const code = 'a {\n /*B*/\n b {}\n}';
152-
t.same(
152+
t.deepEqual(
153153
await util.postcssNestedResolve(code),
154154
await util.allExpected(code),
155155
);
156-
t.same(
156+
t.deepEqual(
157157
await util.allExpected(code),
158158
['a b'],
159159
);
160160
});
161161

162162
test('postcss-nested moves comment with at-rule', async t => {
163163
const code = 'a {\n /*B*/\n @media {\n one: 1\n }\n}';
164-
t.same(
164+
t.deepEqual(
165165
await util.postcssNestedResolve(code),
166166
await util.allExpected(code),
167167
);
168-
t.same(
168+
t.deepEqual(
169169
await util.allExpected(code),
170170
['a'],
171171
);
172172
});
173173

174174
test('postcss-nested moves comment with declaration', async t => {
175175
const code = 'a {\n @media {\n /*B*/\n one: 1\n }\n}';
176-
t.same(
176+
t.deepEqual(
177177
await util.postcssNestedResolve(code),
178178
await util.allExpected(code),
179179
);
180-
t.same(
180+
t.deepEqual(
181181
await util.allExpected(code),
182182
['a'],
183183
);

‎test/postcss-nesting-test.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ test('postcss-nesting Test Case 1', async t => {
1111
color: blue;
1212
}
1313
}`;
14-
t.same(
14+
t.deepEqual(
1515
await util.postcssNestingResolve(code),
1616
await util.allExpected(code),
1717
);
18-
t.same(
18+
t.deepEqual(
1919
await util.allExpected(code),
2020
['a', 'a c', 'a d', 'b', 'b c', 'b d'],
2121
);
@@ -34,11 +34,11 @@ test('postcss-nesting Test Case 2', async t => {
3434
}
3535
}
3636
}`;
37-
t.same(
37+
t.deepEqual(
3838
await util.postcssNestingResolve(code),
3939
await util.allExpected(code),
4040
);
41-
t.same(
41+
t.deepEqual(
4242
await util.allExpected(code),
4343
['a', 'a c', 'a c e', 'a c f', 'a d', 'a d e', 'a d f',
4444
'b', 'b c', 'b c e', 'b c f', 'b d', 'b d e', 'b d f'],
@@ -53,11 +53,11 @@ test('postcss-nesting Test Case 3', async t => {
5353
color: white;
5454
}
5555
}`;
56-
t.same(
56+
t.deepEqual(
5757
await util.postcssNestingResolve(code),
5858
await util.allExpected(code),
5959
);
60-
t.same(
60+
t.deepEqual(
6161
await util.allExpected(code),
6262
['a', 'a a', 'b', 'b b'],
6363
);
@@ -71,11 +71,11 @@ test('postcss-nesting Test Case 4', async t => {
7171
color: white;
7272
}
7373
}`;
74-
t.same(
74+
t.deepEqual(
7575
await util.postcssNestingResolve(code),
7676
await util.allExpected(code),
7777
);
78-
t.same(
78+
t.deepEqual(
7979
await util.allExpected(code),
8080
['a', 'a'],
8181
);
@@ -101,11 +101,11 @@ test('postcss-nesting Test Case 5', async t => {
101101
}
102102
}
103103
}`;
104-
t.same(
104+
t.deepEqual(
105105
await util.postcssNestingResolve(code),
106106
await util.allExpected(code),
107107
);
108-
t.same(
108+
t.deepEqual(
109109
await util.allExpected(code),
110110
['a', 'a', 'a b', 'a b', 'a c'],
111111
);
@@ -131,11 +131,11 @@ test('postcss-nesting Test Case 6', async t => {
131131
}
132132
}
133133
}`;
134-
t.same(
134+
t.deepEqual(
135135
await util.postcssNestingResolve(code),
136136
await util.allExpected(code),
137137
);
138-
t.same(
138+
t.deepEqual(
139139
await util.allExpected(code),
140140
['a', 'a', 'a b', 'a b', 'a c'],
141141
);

0 commit comments

Comments
 (0)