Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/v1-promise.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -476,11 +476,10 @@ describe('Experimental Service', () => {
});

await client.writeSchema(request);

client.close();
});

it('can bulk import relationships', async (done) => {
it('can bulk import relationships', () => {
const { promises: client } = NewClient(
token,
'localhost:50051',
Expand All @@ -489,11 +488,14 @@ describe('Experimental Service', () => {

const writeStream = client.bulkImportRelationships((err, value) => {
if (err) {
done.fail(err);
fail(err);
}

expect(value?.numLoaded).toEqual('2');
done();
});

writeStream.on('error', (e) => {
fail(e);
});

const resource = ObjectReference.create({
Expand Down
144 changes: 70 additions & 74 deletions src/v1.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ describe('a check with an known namespace', () => {

describe('Lookup APIs', () => {
let token: string;
beforeEach(async () => {

beforeEach((done) => {
token = generateTestToken('v1-lookup');
const client = NewClient(
token,
Expand All @@ -303,13 +304,6 @@ describe('Lookup APIs', () => {
`,
});

await new Promise((resolve) => {
client.writeSchema(request, function (err, response) {
expect(err).toBe(null);
resolve(response);
});
});

const resource = ObjectReference.create({
objectType: 'test/document',
objectId: 'somedocument',
Expand Down Expand Up @@ -346,10 +340,12 @@ describe('Lookup APIs', () => {
],
});

await new Promise((resolve) => {
client.writeSchema(request, function (err, response) {
expect(err).toBe(null);

client.writeRelationships(writeRequest, function (err, response) {
expect(err).toBe(null);
resolve(response);
done();
});
});
});
Expand Down Expand Up @@ -484,7 +480,7 @@ describe('a check with a negative timeout', () => {
describe('Experimental Service', () => {
let token: string;

beforeEach(async () => {
beforeEach((done) => {
token = generateTestToken('v1-experimental-service');
const client = NewClient(
token,
Expand All @@ -502,17 +498,14 @@ describe('Experimental Service', () => {
`,
});

await new Promise((resolve) => {
client.writeSchema(request, function (err, response) {
expect(err).toBe(null);
resolve(response);
});
client.writeSchema(request, function (err, response) {
expect(err).toBe(null);
client.close();
done();
});

client.close();
});

it('can bulk import relationships', async (done) => {
it('can bulk import relationships', () => {
const client = NewClient(
token,
'localhost:50051',
Expand All @@ -521,11 +514,14 @@ describe('Experimental Service', () => {

const writeStream = client.bulkImportRelationships((err, value) => {
if (err) {
done.fail(err);
fail(err);
}

expect(value?.numLoaded).toEqual('2');
done();
});

writeStream.on('error', (e) => {
fail(e);
});

const resource = ObjectReference.create({
Expand Down Expand Up @@ -564,7 +560,7 @@ describe('Experimental Service', () => {
client.close();
});

it('can bulk export relationships', async (done) => {
it('can bulk export relationships', (done) => {
const client = NewClient(
token,
'localhost:50051',
Expand Down Expand Up @@ -607,63 +603,63 @@ describe('Experimental Service', () => {
],
});

await new Promise((resolve) => {
client.writeRelationships(writeRequest, function (err, response) {
expect(err).toBe(null);
resolve(response);
});
});
client.writeRelationships(writeRequest, function (err, response) {
expect(err).toBe(null);

const resStream = client.bulkExportRelationships(
BulkExportRelationshipsRequest.create({
consistency: Consistency.create({
requirement: {
oneofKind: 'fullyConsistent',
fullyConsistent: true,
},
}),
})
);
const resStream = client.bulkExportRelationships(
BulkExportRelationshipsRequest.create({
consistency: Consistency.create({
requirement: {
oneofKind: 'fullyConsistent',
fullyConsistent: true,
},
}),
})
);

resStream.on('data', function (response: BulkExportRelationshipsResponse) {
expect(response.relationships).toEqual([
{
relation: 'viewer',
resource: {
objectType: 'test/document',
objectId: 'somedocument',
},
subject: {
optionalRelation: '',
object: { objectType: 'test/user', objectId: 'someuser' },
},
},
{
relation: 'viewer',
resource: {
objectType: 'test/document',
objectId: 'somedocument',
},
subject: {
optionalRelation: '',
object: { objectType: 'test/user', objectId: 'someuser2' },
},
},
]);
});
resStream.on(
'data',
function (response: BulkExportRelationshipsResponse) {
expect(response.relationships).toEqual([
{
relation: 'viewer',
resource: {
objectType: 'test/document',
objectId: 'somedocument',
},
subject: {
optionalRelation: '',
object: { objectType: 'test/user', objectId: 'someuser' },
},
},
{
relation: 'viewer',
resource: {
objectType: 'test/document',
objectId: 'somedocument',
},
subject: {
optionalRelation: '',
object: { objectType: 'test/user', objectId: 'someuser2' },
},
},
]);
}
);

resStream.on('end', function () {
client.close();
done();
});
resStream.on('end', function () {
client.close();
done();
});

resStream.on('error', function (e) {
client.close();
done.fail(e);
});
resStream.on('error', function (e) {
client.close();
done.fail(e);
});

resStream.on('status', function (status) {
expect(status.code).toEqual(grpc.status.OK);
resStream.on('status', function (status) {
expect(status.code).toEqual(grpc.status.OK);
});
});
});
});