Added expect() statements to test cleanups in order to catch any cleanup errors. Fixed cleanup not working in context tests.

Author: Nadegamra

integration-tests/access-control-native/group.test.ts

@@ -29,8 +29,8 @@ const tests = () => describe('group', () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult } = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should update group ims-group', async () => {

integration-tests/access-control-native/member/owner.test.ts

@@ -25,8 +25,8 @@ const tests = () => describe('owner', () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult } = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should add an internal member to an iTwin and remove owner member', async () => {

integration-tests/access-control-native/member/user.test.ts

@@ -25,8 +25,8 @@ const tests = () => describe('user', () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult } = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should add an internal member to an iTwin and remove user member', async () => {

integration-tests/access-control/group.test.ts

@@ -21,8 +21,8 @@ const tests = () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult } = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should create and update group info', async () => {

integration-tests/access-control/member/group.test.ts

@@ -32,8 +32,8 @@ const tests = () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult } = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should create, update and list info and delete member group', async () => {

integration-tests/access-control/member/invitations.test.ts

@@ -22,8 +22,8 @@ const tests = () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult } = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should get pending invitations', async () => {

integration-tests/access-control/member/owner.test.ts

@@ -24,8 +24,8 @@ const tests = () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult } = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should invite an external member to an iTwin, accept invitation and remove owner member', async () => {

integration-tests/access-control/member/user.test.ts

@@ -24,8 +24,8 @@ const tests = () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult } = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should invite an external member to an iTwin, accept sent invitation and remove user member', async () => {

integration-tests/access-control/permissions.test.ts

@@ -20,8 +20,8 @@ const tests = () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult} = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should retrieve my permissions', async () => {

integration-tests/access-control/role.test.ts

@@ -21,8 +21,8 @@ const tests = () => {
     });
 
     after(async () => {
-        const result = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
-        expect(result.stdout).to.contain('deleted');
+        const { result: deleteResult } = await runCommand(`itwin delete --itwin-id ${iTwinId}`);
+        expect(deleteResult).to.have.property('result', 'deleted');
     });
 
     it('Should create and update role info', async () => {