Skip to content

Commit dce60e9

Browse files
mjbvzmjbvz
committed
Convert to async
1 parent 3081338 commit dce60e9

File tree

1 file changed

+54
-65
lines changed

1 file changed

+54
-65
lines changed

‎e2e/tests/emmetCompletions.js

+54-65
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const path = require('path');
44
const createServer = require('../server-fixture');
55
const { openMockFile, getFirstResponseOfType } = require('./_helpers');
66

7-
87
const createMockFileForServer = (fileContents, project) => {
98
project = project || 'project-fixture'
109
const server = createServer(project);
@@ -14,116 +13,108 @@ const createMockFileForServer = (fileContents, project) => {
1413
}
1514

1615
describe('Emmet Completions', () => {
17-
it('shouldnt return emmet property completions when disabled', () => {
18-
const { server, mockFileName } = createMockFileForServer('const q = css`m10-20`', 'disabled-emmet-project-fixture');
16+
it('shouldnt return emmet property completions when disabled', async () => {
17+
const { server, mockFileName } = createMockFileForServer(
18+
'const q = css`m10-20`', 'disabled-emmet-project-fixture');
1919
server.sendCommand('completions', { file: mockFileName, offset: 21, line: 1 });
2020

21-
return server.close().then(() => {
22-
const completionsResponse = getFirstResponseOfType('completions', server);
23-
assert.isTrue(completionsResponse.body.every(item => item.name !== 'margin: 10px 20px;'));
24-
});
21+
await server.close();
22+
const completionsResponse = getFirstResponseOfType('completions', server);
23+
assert.isTrue(completionsResponse.body.every(item => item.name !== 'margin: 10px 20px;'));
2524
});
2625

27-
it('should return emmet property completions for single line string', () => {
26+
it('should return emmet property completions for single line string', async () => {
2827
const { server, mockFileName } = createMockFileForServer('const q = css`m10-20`');
2928
server.sendCommand('completions', { file: mockFileName, offset: 21, line: 1 });
3029

31-
return server.close().then(() => {
32-
const completionsResponse = getFirstResponseOfType('completions', server);
33-
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
34-
});
30+
await server.close();
31+
const completionsResponse = getFirstResponseOfType('completions', server);
32+
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
3533
});
3634

37-
38-
it('should return emmet property completions for multiline string', () => {
35+
it('should return emmet property completions for multiline string', async () => {
3936
const { server, mockFileName } = createMockFileForServer([
4037
'const q = css`',
4138
'm10-20',
4239
'`'
4340
].join('\n'));
4441
server.sendCommand('completions', { file: mockFileName, offset: 7, line: 2 });
4542

46-
return server.close().then(() => {
47-
const completionsResponse = getFirstResponseOfType('completions', server);
48-
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
49-
});
43+
await server.close();
44+
const completionsResponse = getFirstResponseOfType('completions', server);
45+
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
5046
});
5147

52-
it('should return emmet property completions for nested selector', () => {
53-
const { server, mockFileName } = createMockFileForServer('const q = css`position: relative; &:hover { m10-20 }`');
48+
it('should return emmet property completions for nested selector', async () => {
49+
const { server, mockFileName } = createMockFileForServer(
50+
'const q = css`position: relative; &:hover { m10-20 }`');
51+
5452
server.sendCommand('completions', { file: mockFileName, offset: 51, line: 1 });
5553

56-
return server.close().then(() => {
57-
const completionsResponse = getFirstResponseOfType('completions', server);
58-
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
59-
});
54+
await server.close();
55+
const completionsResponse = getFirstResponseOfType('completions', server);
56+
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
6057
});
6158

62-
it('should return emmet completions when placeholder is used as property', () => {
59+
it('should return emmet completions when placeholder is used as property', async () => {
6360
const { server, mockFileName } = createMockFileForServer('css`m10-20 ; boarder: 1px solid ${"red"};`');
6461
server.sendCommand('completions', { file: mockFileName, offset: 11, line: 1 });
6562

66-
return server.close().then(() => {
67-
const completionsResponse = getFirstResponseOfType('completions', server);
68-
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
69-
});
63+
await server.close();
64+
const completionsResponse = getFirstResponseOfType('completions', server);
65+
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
7066
});
7167

72-
it('should return emmet completions after where placeholder is used as property', () => {
68+
it('should return emmet completions after where placeholder is used as property', async () => {
7369
const { server, mockFileName } = createMockFileForServer('css`border: 1px solid ${"red"}; m10-20`');
7470
server.sendCommand('completions', { file: mockFileName, offset: 39, line: 1 });
7571

76-
return server.close().then(() => {
77-
const completionsResponse = getFirstResponseOfType('completions', server);
78-
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
79-
});
72+
await server.close();
73+
const completionsResponse = getFirstResponseOfType('completions', server);
74+
assert.isTrue(completionsResponse.body.some(item => item.name === 'margin: 10px 20px;'));
8075
});
8176

82-
it('should return emmet completions between were placeholders are used as properties', () => {
77+
it('should return emmet completions between were placeholders are used as properties', async () => {
8378
const { server, mockFileName } = createMockFileForServer('css`boarder: 1px solid ${"red"}; color: #12; margin: ${20}; `')
8479
server.sendCommand('completions', { file: mockFileName, offset: 44, line: 1 });
8580

86-
return server.close().then(() => {
87-
const completionsResponse = getFirstResponseOfType('completions', server);
88-
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
89-
});
81+
await server.close();
82+
const completionsResponse = getFirstResponseOfType('completions', server);
83+
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
9084
});
9185

92-
it('should return emmet completions on tagged template string with placeholder using dotted tag', () => {
86+
it('should return emmet completions on tagged template string with placeholder using dotted tag', async () => {
9387
const { server, mockFileName } = createMockFileForServer('css.x`color: #12 ; boarder: 1px solid ${"red"};`');
9488
server.sendCommand('completions', { file: mockFileName, offset: 17, line: 1 });
9589

96-
return server.close().then(() => {
97-
const completionsResponse = getFirstResponseOfType('completions', server);
98-
assert.isTrue(completionsResponse.success);
99-
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
100-
});
90+
await server.close();
91+
const completionsResponse = getFirstResponseOfType('completions', server);
92+
assert.isTrue(completionsResponse.success);
93+
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
10194
});
10295

103-
it('should return styled emmet completions inside of nested placeholder', () => {
96+
it('should return styled emmet completions inside of nested placeholder', async () => {
10497
const { server, mockFileName } = createMockFileForServer('styled`background: red; ${(() => css`color: #12`)()}`;');
10598
server.sendCommand('completions', { file: mockFileName, offset: 48, line: 1 });
10699

107-
return server.close().then(() => {
108-
const completionsResponse = getFirstResponseOfType('completions', server);
109-
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
110-
});
100+
await server.close();
101+
const completionsResponse = getFirstResponseOfType('completions', server);
102+
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
111103
});
112104

113-
it('should handle emmet completions in multiline value placeholder correctly ', () => {
105+
it('should handle emmet completions in multiline value placeholder correctly ', async () => {
114106
const { server, mockFileName } = createMockFileForServer([
115107
'css`margin: ${',
116108
'0',
117109
"}; color: #12`"].join('\n'));
118110
server.sendCommand('completions', { file: mockFileName, offset: 14, line: 3 });
119111

120-
return server.close().then(() => {
121-
const completionsResponse = getFirstResponseOfType('completions', server);
122-
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
123-
});
112+
await server.close();
113+
const completionsResponse = getFirstResponseOfType('completions', server);
114+
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
124115
});
125116

126-
it('should handle emmet completions in multiline rule placeholder correctly ', () => {
117+
it('should handle emmet completions in multiline rule placeholder correctly ', async () => {
127118
const { server, mockFileName } = createMockFileForServer([
128119
'css`',
129120
'${',
@@ -132,13 +123,12 @@ describe('Emmet Completions', () => {
132123
'color: #12`'].join('\n'));
133124
server.sendCommand('completions', { file: mockFileName, offset: 11, line: 5 });
134125

135-
return server.close().then(() => {
136-
const completionsResponse = getFirstResponseOfType('completions', server);
137-
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
138-
});
126+
await server.close();
127+
const completionsResponse = getFirstResponseOfType('completions', server);
128+
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
139129
});
140130

141-
it('should return emmet completions inside of nested selector xx', () => {
131+
it('should return emmet completions inside of nested selector xx', async () => {
142132
const { server, mockFileName } = createMockFileForServer([
143133
'css`',
144134
' color: red;',
@@ -148,9 +138,8 @@ describe('Emmet Completions', () => {
148138
'`'].join('\n'));
149139
server.sendCommand('completions', { file: mockFileName, line: 4, offset: 19 });
150140

151-
return server.close().then(() => {
152-
const completionsResponse = getFirstResponseOfType('completions', server);
153-
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
154-
});
141+
await server.close();
142+
const completionsResponse = getFirstResponseOfType('completions', server);
143+
assert.isTrue(completionsResponse.body.some(item => item.name === '#121212'));
155144
});
156145
});

0 commit comments

Comments
 (0)