Skip to content

ci: enable more tests on Postgres adapter #7641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Oct 18, 2021
Merged

ci: enable more tests on Postgres adapter #7641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ace4e0a
Enable tests for postgres
cbaker6 Oct 18, 2021
64473cd
More tests
cbaker6 Oct 18, 2021
a1f0c07
Update CHANGELOG.md
cbaker6 Oct 18, 2021
cef15ae
Run test on postgres and change expected to 2
cbaker6 Oct 18, 2021
b226858
Update CHANGELOG.md
cbaker6 Oct 18, 2021
8296f7a
Merge branch 'master' into enableTests
mtrezza Oct 18, 2021
8e7cbd2
Prepare Polygon test for enabling postgres
cbaker6 Oct 18, 2021
2da8383
Merge branch 'enableTests' of https://github.com/cbaker6/parse-server…
cbaker6 Oct 18, 2021
0b60199
Merge remote-tracking branch 'upstream/master' into enableTests
cbaker6 Oct 18, 2021
650f18d
add suggestions
cbaker6 Oct 18, 2021
7605d91
remove clearing cache
cbaker6 Oct 18, 2021
6bec14a
remove before
cbaker6 Oct 18, 2021
15ff030
revert some more
cbaker6 Oct 18, 2021
a21d152
Merge remote-tracking branch 'upstream/master' into enableTests
cbaker6 Oct 18, 2021
cdfb3ab
Add async on mongo polygon test
cbaker6 Oct 18, 2021
f02b9e0
add await to destory all for mongo
cbaker6 Oct 18, 2021
6a8f985
Update ParsePolygon test
cbaker6 Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spec/ParseAPI.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const headers = {
'X-Parse-Installation-Id': 'yolo',
};

describe_only_db('mongo')('miscellaneous', () => {
describe('miscellaneous', () => {
it('db contains document after successful save', async () => {
const obj = new Parse.Object('TestObject');
obj.set('foo', 'bar');
Expand Down
187 changes: 92 additions & 95 deletions spec/ParseGraphQLServer.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4013,64 +4013,61 @@ describe('ParseGraphQLServer', () => {
expect(someClassSubObject.someClassField).toEqual('imSomeClassTwo');
});

it_only_db('mongo')(
'should return many child objects in allow cyclic query',
async () => {
const obj1 = new Parse.Object('Employee');
const obj2 = new Parse.Object('Team');
const obj3 = new Parse.Object('Company');
const obj4 = new Parse.Object('Country');
it('should return many child objects in allow cyclic query', async () => {
const obj1 = new Parse.Object('Employee');
const obj2 = new Parse.Object('Team');
const obj3 = new Parse.Object('Company');
const obj4 = new Parse.Object('Country');

obj1.set('name', 'imAnEmployee');
await obj1.save();
obj1.set('name', 'imAnEmployee');
await obj1.save();

obj2.set('name', 'imATeam');
obj2.set('employees', [obj1]);
await obj2.save();
obj2.set('name', 'imATeam');
obj2.set('employees', [obj1]);
await obj2.save();

obj3.set('name', 'imACompany');
obj3.set('teams', [obj2]);
obj3.set('employees', [obj1]);
await obj3.save();
obj3.set('name', 'imACompany');
obj3.set('teams', [obj2]);
obj3.set('employees', [obj1]);
await obj3.save();

obj4.set('name', 'imACountry');
obj4.set('companies', [obj3]);
await obj4.save();
obj4.set('name', 'imACountry');
obj4.set('companies', [obj3]);
await obj4.save();

obj1.set('country', obj4);
await obj1.save();
obj1.set('country', obj4);
await obj1.save();

await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();
await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();

const result = (
await apolloClient.query({
query: gql`
query DeepComplexGraphQLQuery($id: ID!) {
country(id: $id) {
objectId
name
companies {
... on Company {
objectId
name
employees {
... on Employee {
objectId
name
}
const result = (
await apolloClient.query({
query: gql`
query DeepComplexGraphQLQuery($id: ID!) {
country(id: $id) {
objectId
name
companies {
... on Company {
objectId
name
employees {
... on Employee {
objectId
name
}
teams {
... on Team {
objectId
name
employees {
... on Employee {
}
teams {
... on Team {
objectId
name
employees {
... on Employee {
objectId
name
country {
objectId
name
country {
objectId
name
}
}
}
}
Expand All @@ -4079,54 +4076,54 @@ describe('ParseGraphQLServer', () => {
}
}
}
`,
variables: {
id: obj4.id,
},
})
).data.country;
}
`,
variables: {
id: obj4.id,
},
})
).data.country;

const expectedResult = {
objectId: obj4.id,
name: 'imACountry',
__typename: 'Country',
companies: [
{
objectId: obj3.id,
name: 'imACompany',
__typename: 'Company',
employees: [
{
objectId: obj1.id,
name: 'imAnEmployee',
__typename: 'Employee',
},
],
teams: [
{
objectId: obj2.id,
name: 'imATeam',
__typename: 'Team',
employees: [
{
objectId: obj1.id,
name: 'imAnEmployee',
__typename: 'Employee',
country: {
objectId: obj4.id,
name: 'imACountry',
__typename: 'Country',
},
const expectedResult = {
objectId: obj4.id,
name: 'imACountry',
__typename: 'Country',
companies: [
{
objectId: obj3.id,
name: 'imACompany',
__typename: 'Company',
employees: [
{
objectId: obj1.id,
name: 'imAnEmployee',
__typename: 'Employee',
},
],
teams: [
{
objectId: obj2.id,
name: 'imATeam',
__typename: 'Team',
employees: [
{
objectId: obj1.id,
name: 'imAnEmployee',
__typename: 'Employee',
country: {
objectId: obj4.id,
name: 'imACountry',
__typename: 'Country',
},
],
},
],
},
],
};
expect(result).toEqual(expectedResult);
}
);
},
],
},
],
},
],
};
expect(result).toEqual(expectedResult);
});

it('should respect level permissions', async () => {
await prepareData();
Expand Down Expand Up @@ -8689,7 +8686,7 @@ describe('ParseGraphQLServer', () => {
expect(result2.companies.edges[0].node.objectId).toEqual(company1.id);
});

it_only_db('mongo')('should support relational where query', async () => {
it('should support relational where query', async () => {
const president = new Parse.Object('President');
president.set('name', 'James');
await president.save();
Expand Down
4 changes: 2 additions & 2 deletions spec/ParseObject.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ describe('Parse.Object testing', () => {
});
});

it_exclude_dbs(['postgres'])('can set null', function (done) {
it('can set null', function (done) {
const obj = new Parse.Object('TestObject');
obj.set('foo', null);
obj.save().then(
Expand All @@ -232,7 +232,7 @@ describe('Parse.Object testing', () => {
equal(obj.get('foo'), null);
});
on_db('postgres', () => {
fail('should not succeed');
equal(obj.get('foo'), null);
});
done();
},
Expand Down
17 changes: 12 additions & 5 deletions spec/ParsePolygon.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const TestObject = Parse.Object.extend('TestObject');
const MongoStorageAdapter = require('../lib/Adapters/Storage/Mongo/MongoStorageAdapter').default;
const mongoURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
const request = require('../lib/request');
const TestUtils = require('../lib/TestUtils');
const defaultHeaders = {
'X-Parse-Application-Id': 'test',
'X-Parse-Rest-API-Key': 'rest',
Expand Down Expand Up @@ -210,7 +209,7 @@ describe('Parse.Polygon testing', () => {

describe('with location', () => {
if (process.env.PARSE_SERVER_TEST_DB !== 'postgres') {
beforeEach(() => require('../lib/TestUtils').destroyAllDataPermanently());
beforeEach(async () => await TestUtils.destroyAllDataPermanently());
}

it('polygonContain query', done => {
Expand Down Expand Up @@ -425,7 +424,15 @@ describe('Parse.Polygon testing', () => {
});

describe_only_db('mongo')('Parse.Polygon testing', () => {
beforeEach(() => require('../lib/TestUtils').destroyAllDataPermanently());
const Config = require('../lib/Config');
let config;
beforeEach(async () => {
if (process.env.PARSE_SERVER_TEST_DB !== 'postgres') {
await TestUtils.destroyAllDataPermanently();
}
config = Config.get('test');
config.schemaCache.clear();
});
it('support 2d and 2dsphere', done => {
const coords = [
[0, 0],
Expand All @@ -437,7 +444,7 @@ describe_only_db('mongo')('Parse.Polygon testing', () => {
// testings against REST API, use raw formats
const polygon = { __type: 'Polygon', coordinates: coords };
const location = { __type: 'GeoPoint', latitude: 10, longitude: 10 };
const databaseAdapter = new MongoStorageAdapter({ uri: mongoURI });
const databaseAdapter = config.database.adapter;
return reconfigureServer({
appId: 'test',
restAPIKey: 'rest',
Expand Down
6 changes: 3 additions & 3 deletions spec/ParseRelation.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ describe('Parse.Relation testing', () => {
.then(done, done.fail);
});

it_exclude_dbs(['postgres'])('queries with relations', async () => {
it('queries with relations', async () => {
const ChildObject = Parse.Object.extend('ChildObject');
const childObjects = [];
for (let i = 0; i < 10; i++) {
Expand Down Expand Up @@ -283,7 +283,7 @@ describe('Parse.Relation testing', () => {
});
});

it_exclude_dbs(['postgres'])('query on pointer and relation fields with equal', done => {
it('query on pointer and relation fields with equal', done => {
const ChildObject = Parse.Object.extend('ChildObject');
const childObjects = [];
for (let i = 0; i < 10; i++) {
Expand Down Expand Up @@ -366,7 +366,7 @@ describe('Parse.Relation testing', () => {
});
});

it_exclude_dbs(['postgres'])('or queries on pointer and relation fields', done => {
it('or queries on pointer and relation fields', done => {
const ChildObject = Parse.Object.extend('ChildObject');
const childObjects = [];
for (let i = 0; i < 10; i++) {
Expand Down
8 changes: 3 additions & 5 deletions spec/SchemaPerformance.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
const Config = require('../lib/Config');
const MongoStorageAdapter = require('../lib/Adapters/Storage/Mongo/MongoStorageAdapter').default;
const mongoURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';

describe_only_db('mongo')('Schema Performance', function () {
describe('Schema Performance', function () {
let getAllSpy;
let config;

beforeEach(async () => {
config = Config.get('test');
config.schemaCache.clear();
const databaseAdapter = new MongoStorageAdapter({ uri: mongoURI });
const databaseAdapter = config.database.adapter;
await reconfigureServer({ databaseAdapter });
getAllSpy = spyOn(databaseAdapter, 'getAllClasses').and.callThrough();
});
Expand Down Expand Up @@ -204,6 +202,6 @@ describe_only_db('mongo')('Schema Performance', function () {
{},
config.database
);
expect(getAllSpy.calls.count()).toBe(0);
expect(getAllSpy.calls.count()).toBe(2);
});
});