Skip to content

Commit 89d386e

Browse files
committed
use unique config for idempotency tests
1 parent b28ebd1 commit 89d386e

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

spec/Idempotency.spec.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ describe('Idempotency', () => {
1111
/** Enable TTL expiration simulated by removing entry instead of waiting for MongoDB TTL monitor which
1212
runs only every 60s, so it can take up to 119s until entry removal - ain't nobody got time for that */
1313
const SIMULATE_TTL = true;
14+
const applicationId = "testIdempotency";
15+
1416
// Helpers
1517
async function deleteRequestEntry(reqId) {
16-
const config = Config.get(Parse.applicationId);
18+
const config = Config.get(applicationId);
1719
const res = await rest.find(
1820
config,
1921
auth.master(config),
@@ -25,7 +27,7 @@ describe('Idempotency', () => {
2527
}
2628
async function setup(options) {
2729
await reconfigureServer({
28-
appId: Parse.applicationId,
30+
appId: applicationId,
2931
masterKey: Parse.masterKey,
3032
serverURL: Parse.serverURL,
3133
idempotencyOptions: options,
@@ -56,7 +58,7 @@ describe('Idempotency', () => {
5658
'X-Parse-Request-Id': 'abc-123',
5759
},
5860
};
59-
expect(Config.get(Parse.applicationId).idempotencyOptions.ttl).toBe(30);
61+
expect(Config.get(applicationId).idempotencyOptions.ttl).toBe(30);
6062
await request(params);
6163
await request(params).then(fail, e => {
6264
expect(e.status).toEqual(400);
@@ -74,7 +76,7 @@ describe('Idempotency', () => {
7476
method: 'POST',
7577
url: 'http://localhost:8378/1/functions/myFunction',
7678
headers: {
77-
'X-Parse-Application-Id': Parse.applicationId,
79+
'X-Parse-Application-Id': applicationId,
7880
'X-Parse-Master-Key': Parse.masterKey,
7981
'X-Parse-Request-Id': 'abc-123',
8082
},
@@ -98,7 +100,7 @@ describe('Idempotency', () => {
98100
method: 'POST',
99101
url: 'http://localhost:8378/1/jobs/myJob',
100102
headers: {
101-
'X-Parse-Application-Id': Parse.applicationId,
103+
'X-Parse-Application-Id': applicationId,
102104
'X-Parse-Master-Key': Parse.masterKey,
103105
'X-Parse-Request-Id': 'abc-123',
104106
},
@@ -120,7 +122,7 @@ describe('Idempotency', () => {
120122
method: 'POST',
121123
url: 'http://localhost:8378/1/classes/MyClass',
122124
headers: {
123-
'X-Parse-Application-Id': Parse.applicationId,
125+
'X-Parse-Application-Id': applicationId,
124126
'X-Parse-Master-Key': Parse.masterKey,
125127
'X-Parse-Request-Id': 'abc-123',
126128
},
@@ -146,7 +148,7 @@ describe('Idempotency', () => {
146148
password: 'pass',
147149
},
148150
headers: {
149-
'X-Parse-Application-Id': Parse.applicationId,
151+
'X-Parse-Application-Id': applicationId,
150152
'X-Parse-Master-Key': Parse.masterKey,
151153
'X-Parse-Request-Id': 'abc-123',
152154
},
@@ -172,7 +174,7 @@ describe('Idempotency', () => {
172174
deviceType: 'ios',
173175
},
174176
headers: {
175-
'X-Parse-Application-Id': Parse.applicationId,
177+
'X-Parse-Application-Id': applicationId,
176178
'X-Parse-Master-Key': Parse.masterKey,
177179
'X-Parse-Request-Id': 'abc-123',
178180
},
@@ -195,7 +197,7 @@ describe('Idempotency', () => {
195197
method: 'POST',
196198
url: 'http://localhost:8378/1/classes/MyClass',
197199
headers: {
198-
'X-Parse-Application-Id': Parse.applicationId,
200+
'X-Parse-Application-Id': applicationId,
199201
'X-Parse-Master-Key': Parse.masterKey,
200202
'X-Parse-Request-Id': uuid.v4(),
201203
},
@@ -213,7 +215,7 @@ describe('Idempotency', () => {
213215
method: 'POST',
214216
url: 'http://localhost:8378/1/functions/myFunction',
215217
headers: {
216-
'X-Parse-Application-Id': Parse.applicationId,
218+
'X-Parse-Application-Id': applicationId,
217219
'X-Parse-Master-Key': Parse.masterKey,
218220
'X-Parse-Request-Id': 'abc-123',
219221
},
@@ -226,10 +228,10 @@ describe('Idempotency', () => {
226228

227229
it('should use default configuration when none is set', async () => {
228230
await setup({});
229-
expect(Config.get(Parse.applicationId).idempotencyOptions.ttl).toBe(
231+
expect(Config.get(applicationId).idempotencyOptions.ttl).toBe(
230232
Definitions.IdempotencyOptions.ttl.default
231233
);
232-
expect(Config.get(Parse.applicationId).idempotencyOptions.paths).toBe(
234+
expect(Config.get(applicationId).idempotencyOptions.paths).toBe(
233235
Definitions.IdempotencyOptions.paths.default
234236
);
235237
});

src/Adapters/Storage/Mongo/MongoStorageAdapter.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ export class MongoStorageAdapter implements StorageAdapter {
666666
mongoFieldNames.forEach(fieldName => {
667667
indexCreationRequest[fieldName] = options.indexType !== undefined ? options.indexType : 1;
668668
});
669-
//const dropIndex = options.dropIndex !== undefined ? options.dropIndex : false;
669+
const dropIndex = options.dropIndex !== undefined ? options.dropIndex : false;
670670
const defaultOptions: Object = { background: true, sparse: true };
671671
const indexNameOptions: Object = indexName ? { name: indexName } : {};
672672
const ttlOptions: Object = options.ttl !== undefined ? { expireAfterSeconds: options.ttl } : {};
@@ -680,10 +680,10 @@ export class MongoStorageAdapter implements StorageAdapter {
680680
...ttlOptions,
681681
};
682682
const promises = [];
683-
/*if (dropIndex) {
683+
if (dropIndex) {
684684
const promise = this.dropIndex(className, indexName);
685685
promises.push(promise);
686-
}*/
686+
}
687687
return Promise.all(promises)
688688
.then(() => this._adaptiveCollection(className))
689689
.then(

0 commit comments

Comments
 (0)