Update tests and ensure tests are run regardless of exp flag

This commit is contained in:
Peter Theill
2016-02-11 01:32:38 +01:00
parent 930573bb47
commit 1d576bcc9f
3 changed files with 5 additions and 25 deletions

View File

@@ -28,7 +28,7 @@ describe('a GlobalConfig', () => {
}); });
it('can be updated when a master key exists', (done) => { it('can be updated when a master key exists', (done) => {
request.post({ request.put({
url: 'http://localhost:8378/1/config', url: 'http://localhost:8378/1/config',
json: true, json: true,
body: { params: { companies: ['US', 'DK', 'SE'] } }, body: { params: { companies: ['US', 'DK', 'SE'] } },
@@ -38,13 +38,13 @@ describe('a GlobalConfig', () => {
}, },
}, (error, response, body) => { }, (error, response, body) => {
expect(response.statusCode).toEqual(200); expect(response.statusCode).toEqual(200);
expect(body.params.companies).toEqual(['US', 'DK', 'SE']); expect(body.result).toEqual(true);
done(); done();
}); });
}); });
it('fail to update if master key is missing', (done) => { it('fail to update if master key is missing', (done) => {
request.post({ request.put({
url: 'http://localhost:8378/1/config', url: 'http://localhost:8378/1/config',
json: true, json: true,
body: { params: { companies: [] } }, body: { params: { companies: [] } },
@@ -78,24 +78,4 @@ describe('a GlobalConfig', () => {
}); });
}); });
it('failed updating config when it is missing', (done) => {
database.rawCollection('_GlobalConfig')
.then(coll => coll.deleteOne({ '_id': 1}, {}, {}))
.then(_ => {
request.post({
url: 'http://localhost:8378/1/config',
json: true,
body: { params: { companies: ['US', 'DK', 'SE'] } },
headers: {
'X-Parse-Application-Id': 'test',
'X-Parse-Master-Key': 'test'
},
}, (error, response, body) => {
expect(response.statusCode).toEqual(404);
expect(body.code).toEqual(Parse.Error.INVALID_KEY_NAME);
done();
});
});
});
}); });

View File

@@ -27,7 +27,7 @@ function updateGlobalConfig(req) {
} }
return req.config.database.rawCollection('_GlobalConfig') return req.config.database.rawCollection('_GlobalConfig')
.then(coll => coll.findOneAndUpdate({ _id: 1 }, { $set: req.body }, { returnOriginal: false })) .then(coll => coll.findOneAndUpdate({ _id: 1 }, { $set: req.body }))
.then(response => { .then(response => {
return { response: { result: true } } return { response: { result: true } }
}) })

View File

@@ -121,7 +121,7 @@ function ParseServer(args) {
router.merge(require('./installations')); router.merge(require('./installations'));
router.merge(require('./functions')); router.merge(require('./functions'));
router.merge(require('./schemas')); router.merge(require('./schemas'));
if (process.env.PARSE_EXPERIMENTAL_CONFIG_ENABLED) { if (process.env.PARSE_EXPERIMENTAL_CONFIG_ENABLED || process.env.TESTING) {
router.merge(require('./global_config')); router.merge(require('./global_config'));
} }