test: slightly improve some tests

Author: amtrack

src/plugins/customer-portal/index.e2e-spec.ts

@@ -120,16 +120,15 @@ describe('CustomerPortal', () => {
     it('should cleanup', async () => {
       const conn = global.bf.org.getConnection();
       await conn.metadata.delete('Profile', ['Dummy']);
-      const permSetUnassignCmd = child.spawnSync('sf', [
-        'data',
-        'delete',
-        'record',
-        '-s',
-        'PermissionSetAssignment',
-        '-w',
-        'PermissionSet.Name=Customer_Portal_Admin',
-      ]);
-      assert.deepStrictEqual(permSetUnassignCmd.status, 0, permSetUnassignCmd.output.toString());
+      const result = await conn.query(
+        "SELECT Id FROM PermissionSetAssignment WHERE PermissionSet.Name='Customer_Portal_Admin'",
+      );
+      if (result.records.length) {
+        await conn.delete(
+          'PermissionSetAssignment',
+          result.records.map((rec) => rec.Id),
+        );
+      }
       await conn.metadata.delete('PermissionSet', ['Customer_Portal_Admin']);
     });
   });

src/plugins/security/certificate-and-key-management/index.e2e-spec.ts

@@ -11,11 +11,11 @@ describe(CertificateAndKeyManagement.name, function () {
     pluginCertificateManagement = new CertificateAndKeyManagement(global.bf);
   });
 
-  const configGeneratedCert = {
+  const configCreatedCert = {
     certificates: [
       {
-        name: 'identity_provider',
-        label: 'identity_provider',
+        name: 'foo',
+        label: 'foo',
       },
     ],
   };
@@ -35,11 +35,11 @@ describe(CertificateAndKeyManagement.name, function () {
     assert.deepStrictEqual(sourceDeployCmd.status, 0, sourceDeployCmd.output.toString());
   });
   it('should create a self-signed certificate', async () => {
-    await pluginCertificateManagement.apply(configGeneratedCert);
+    await pluginCertificateManagement.apply(configCreatedCert);
   });
   it('should not do anything if self-signed certificate is already available', async () => {
     // explictly pass definition to retrieve
-    const res = await pluginCertificateManagement.run(configGeneratedCert);
+    const res = await pluginCertificateManagement.run(configCreatedCert);
     assert.deepStrictEqual(res, { message: 'no action necessary' });
   });
   it('should import a cert from a keystore', async () => {
@@ -49,9 +49,15 @@ describe(CertificateAndKeyManagement.name, function () {
     const res = await pluginCertificateManagement.run(configImportFromKeystore);
     assert.deepStrictEqual(res, { message: 'no action necessary' });
   });
+  it('should disable Identity Provider', async () => {
+    const __dirname = fileURLToPath(new URL('.', import.meta.url));
+    const dir = resolve(join(__dirname, 'sfdx-source', 'disable-identity-provider'));
+    const sourceDeployCmd = spawnSync('sf', ['project', 'deploy', 'start', '-d', dir, '--json']);
+    assert.deepStrictEqual(sourceDeployCmd.status, 0, sourceDeployCmd.output.toString());
+  });
   it('should delete certificates using Metadata API', async () => {
     const org = await Org.create({});
     const conn = org.getConnection();
-    await conn.metadata.delete('Certificate', ['identity_provider', 'Dummy']);
+    await conn.metadata.delete('Certificate', ['identity_provider', 'foo', 'Dummy']);
   });
 });

src/plugins/security/certificate-and-key-management/sfdx-source/disable-identity-provider/settings/IdentityProvider.settings-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<IdentityProviderSettings xmlns="http://soap.sforce.com/2006/04/metadata">
+    <certificateName>identity_provider</certificateName>
+    <enableIdentityProvider>false</enableIdentityProvider>
+</IdentityProviderSettings>