Skip to content

Commit 1c4682f

Browse files
committed
refactor server integration
1 parent 7599610 commit 1c4682f

File tree

10 files changed

+250
-114
lines changed

10 files changed

+250
-114
lines changed

.eslintrc.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
},
88
"parserOptions": {
99
"ecmaVersion": 8,
10-
"sourceType": "module"
10+
"sourceType": "module",
11+
"requireConfigFile": false
1112
},
1213
"rules": {
1314
"indent": ["error", 2, { "SwitchCase": 1 }],
@@ -19,6 +20,12 @@
1920
"prefer-const": "error",
2021
"space-infix-ops": "error",
2122
"no-useless-escape": "off",
22-
"require-atomic-updates": "off"
23+
"require-atomic-updates": "off",
24+
"object-curly-spacing": ["error", "always"],
25+
"curly": ["error", "all"],
26+
"block-spacing": ["error", "always"]
27+
},
28+
"globals": {
29+
"Parse": true
2330
}
2431
}

package-lock.json

Lines changed: 119 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@
3333
"eslint": "7.13.0",
3434
"eslint-config-airbnb-base": "14.2.1",
3535
"eslint-plugin-import": "2.22.1",
36-
"nyc": "17.1.0",
36+
"express": "4.21.1",
3737
"jasmine": "3.5.0",
38+
"jasmine-spec-reporter": "7.0.0",
39+
"mongodb-runner": "5.6.4",
40+
"nyc": "17.1.0",
3841
"parse": "3.3.1",
3942
"parse-server": "7.3.0",
4043
"parse-server-conformance-tests": "1.0.0",
4144
"prettier": "3.3.3",
42-
"mongodb-runner": "5.6.4",
4345
"semantic-release": "17.4.6"
4446
},
4547
"scripts": {

spec/.eslintrc.json

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,10 @@
44
},
55
"globals": {
66
"Parse": true,
7-
"reconfigureServer": true,
8-
"createTestUser": true,
9-
"jfail": true,
10-
"ok": true,
11-
"strictEqual": true,
12-
"TestObject": true,
13-
"Item": true,
14-
"Container": true,
15-
"equal": true,
16-
"notEqual": true,
17-
"it_exclude_dbs": true,
18-
"describe_only_db": true,
19-
"on_db": true,
20-
"defaultConfiguration": true,
21-
"expectSuccess": true,
22-
"range": true,
23-
"expectError": true,
24-
"jequal": true,
25-
"create": true,
26-
"arrayContains": true
7+
"reconfigureServer": true
278
},
289
"rules": {
29-
"no-console": [0]
10+
"no-console": [0],
11+
"no-var": "error"
3012
}
3113
}

spec/integration.spec.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,8 @@
1-
const Parse = require('parse/node');
2-
const { TestUtils } = require('parse-server');
3-
const { PARSE_APP_ID, PARSE_MASTER_KEY, reconfigureServer, serverURL } = require('./mocks/server');
41
const { httpRequest } = require('./support/request');
52

63
const fileData = 'hello world';
74

85
describe('S3Adapter integration tests', () => {
9-
beforeEach(async () => {
10-
process.env.TESTING = true;
11-
12-
await reconfigureServer();
13-
14-
Parse.initialize(PARSE_APP_ID);
15-
Parse.serverURL = serverURL;
16-
Parse.CoreManager.set('SERVER_URL', serverURL);
17-
Parse.CoreManager.set('MASTER_KEY', PARSE_MASTER_KEY);
18-
}, 60 * 1000);
19-
20-
afterAll(async () => {
21-
Parse.Storage._clear();
22-
await TestUtils.destroyAllDataPermanently(true);
23-
});
24-
256
it('should create a file in Parse Server', async () => {
267
const fileName = 'test-1.txt';
278

spec/mocks/server.js

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

spec/support/helper.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
'use strict';
2+
const { SpecReporter } = require('jasmine-spec-reporter');
3+
const { startServer, stopServer, reconfigureServer } = require('./server');
4+
5+
// Setup jasmine
6+
jasmine.DEFAULT_TIMEOUT_INTERVAL = process.env.TESTING_TIMEOUT || "360000";
7+
jasmine.getEnv().addReporter(new SpecReporter());
8+
9+
// Setup env vars
10+
process.env.TESTING = "true";
11+
12+
beforeAll(async () => {
13+
await startServer();
14+
});
15+
16+
afterAll(async () => {
17+
await stopServer();
18+
});
19+
20+
beforeEach(async () => {
21+
await reconfigureServer();
22+
});

spec/support/jasmine.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"**/*[sS]pec.js"
55
],
66
"helpers": [
7-
"helpers/**/*.js"
8-
]
7+
"support/helper.js"
8+
],
9+
"random": true
910
}

0 commit comments

Comments
 (0)