Skip to content

Commit 1c48da8

Browse files
dplewisdplewis
committed
test: Investigate integration test timeout
1 parent 539ba2a commit 1c48da8

File tree

4 files changed

+24
-32
lines changed

4 files changed

+24
-32
lines changed

‎integration/test/ParseEventuallyQueueTest.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ describe('Parse EventuallyQueue', () => {
194194
const parseServer = await reconfigureServer();
195195
const object = new TestObject({ hash: 'saveSecret' });
196196
await parseServer.handleShutdown();
197-
await new Promise(resolve => parseServer.server.close(resolve));
197+
// await new Promise(resolve => parseServer.server.close(resolve));
198198
await object.saveEventually();
199199

200200
const length = await Parse.EventuallyQueue.length();
@@ -226,7 +226,7 @@ describe('Parse EventuallyQueue', () => {
226226
const object = new TestObject({ hash: 'saveSecret' });
227227
object.setACL(acl);
228228
await parseServer.handleShutdown();
229-
await new Promise(resolve => parseServer.server.close(resolve));
229+
// await new Promise(resolve => parseServer.server.close(resolve));
230230
await object.saveEventually();
231231

232232
const length = await Parse.EventuallyQueue.length();
@@ -252,7 +252,7 @@ describe('Parse EventuallyQueue', () => {
252252
const object = new TestObject({ hash: 'deleteSecret' });
253253
await object.save();
254254
await parseServer.handleShutdown();
255-
await new Promise(resolve => parseServer.server.close(resolve));
255+
// await new Promise(resolve => parseServer.server.close(resolve));
256256
await object.destroyEventually();
257257
const length = await Parse.EventuallyQueue.length();
258258

‎integration/test/ParseServerTest.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ describe('ParseServer', () => {
77
const parseServer = await reconfigureServer({ serverURL: 'www.google.com' });
88
assert.strictEqual(parseServer.config.serverURL, 'www.google.com');
99
await parseServer.handleShutdown();
10-
await new Promise(resolve => parseServer.server.close(resolve));
10+
// await new Promise(resolve => parseServer.server.close(resolve));
1111
await reconfigureServer();
1212
});
1313

1414
it('can shutdown', async () => {
1515
const parseServer = await reconfigureServer();
1616
const object = new TestObject({ foo: 'bar' });
1717
await parseServer.handleShutdown();
18-
await new Promise(resolve => parseServer.server.close(resolve));
18+
// await new Promise(resolve => parseServer.server.close(resolve));
1919
await expectAsync(object.save()).toBeRejectedWithError(
2020
'XMLHttpRequest failed: "Unable to connect to the Parse API"'
2121
);

‎integration/test/clear.js‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎integration/test/helper.js‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const ParseServer = require('parse-server').default;
77
const CustomAuth = require('./CustomAuth');
88
const { TestUtils } = require('parse-server');
99
const Parse = require('../../node');
10-
const fs = require('fs');
10+
const fs = require('fs').promises;
1111
const path = require('path');
1212
const dns = require('dns');
1313
const MockEmailAdapterWithOptions = require('./support/MockEmailAdapterWithOptions');
@@ -21,6 +21,7 @@ const port = 1337;
2121
const mountPath = '/parse';
2222
const serverURL = 'http://localhost:1337/parse';
2323
let didChangeConfiguration = false;
24+
const distFiles = {};
2425

2526
/*
2627
To generate the auth data below, the Twitter app "GitHub CI Test App" has
@@ -97,7 +98,7 @@ let parseServer;
9798
const reconfigureServer = async (changedConfiguration = {}) => {
9899
if (parseServer) {
99100
await parseServer.handleShutdown();
100-
await new Promise(resolve => parseServer.server.close(resolve));
101+
// await new Promise(resolve => parseServer.server.close(resolve));
101102
parseServer = undefined;
102103
return reconfigureServer(changedConfiguration);
103104
}
@@ -113,8 +114,7 @@ const reconfigureServer = async (changedConfiguration = {}) => {
113114
return reconfigureServer(newConfiguration);
114115
}
115116
const app = parseServer.expressApp;
116-
for (const fileName of ['parse.js', 'parse.min.js']) {
117-
const file = fs.readFileSync(path.resolve(__dirname, `./../../dist/${fileName}`)).toString();
117+
for (const [fileName, file] of Object.entries(distFiles)) {
118118
app.get(`/${fileName}`, (_req, res) => {
119119
res.send(`<html><head>
120120
<meta charset="utf-8">
@@ -132,12 +132,6 @@ const reconfigureServer = async (changedConfiguration = {}) => {
132132
</body></html>`);
133133
});
134134
}
135-
app.get('/clear/:fast', (req, res) => {
136-
const { fast } = req.params;
137-
TestUtils.destroyAllDataPermanently(fast).then(() => {
138-
res.send('{}');
139-
});
140-
});
141135
parseServer.server.on('connection', connection => {
142136
const key = `${connection.remoteAddress}:${connection.remotePort}`;
143137
openConnections[key] = connection;
@@ -157,18 +151,28 @@ global.TestObject = Parse.Object.extend('TestObject');
157151
global.reconfigureServer = reconfigureServer;
158152

159153
beforeAll(async () => {
154+
const promise = ['parse.js', 'parse.min.js'].map(fileName => {
155+
return fs.readFile(path.resolve(__dirname, `./../../dist/${fileName}`), 'utf8').then(file => {
156+
distFiles[fileName] = file;
157+
});
158+
});
159+
await Promise.all(promise);
160160
await reconfigureServer();
161161
Parse.initialize('integration');
162162
Parse.CoreManager.set('SERVER_URL', serverURL);
163163
Parse.CoreManager.set('MASTER_KEY', 'notsosecret');
164164
});
165165

166166
afterEach(async () => {
167-
await Parse.User.logOut();
168-
Parse.Storage._clear();
169-
await TestUtils.destroyAllDataPermanently(true);
170-
if (didChangeConfiguration) {
171-
await reconfigureServer();
167+
try {
168+
await Parse.User.logOut();
169+
Parse.Storage._clear();
170+
await TestUtils.destroyAllDataPermanently(true);
171+
if (didChangeConfiguration) {
172+
await reconfigureServer();
173+
}
174+
} catch (error) {
175+
console.error('Error in afterEach', error);
172176
}
173177
});
174178

0 commit comments

Comments
 (0)