Merge pull request #812 from salesforcecli/sm/pr805

Sm/pr805

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Add a new deploy command
 
-The deploy-retrieve plugin does not have any commands for deploying or or retrieving specific pieces of a salesforce project (e.g. metadata to a scratch or functions to a compute environment). Instead, we ask developers to create their own plugin with those commands. In order for the `deploy` or `retrieve` commands to know about the individual plugins, each plugin must implement an [oclif hook](https://oclif.io/docs/hooks) which returns [`Deployers`](https://github.com/salesforcecli/plugin-deploy-retrieve-utils/blob/main/src/deployer.ts) and `Retirevers`.
+The deploy-retrieve plugin does not have any commands for deploying or or retrieving specific pieces of a salesforce project (e.g. metadata to a scratch or functions to a compute environment). Instead, we ask developers to create their own plugin with those commands. In order for the `deploy` or `retrieve` commands to know about the individual plugins, each plugin must implement an [oclif hook](https://oclif.io/docs/hooks) which returns [`Deployers`](https://github.com/salesforcecli/plugin-deploy-retrieve-utils/blob/main/src/deployer.ts) and `Retrievers`.
 
 This method allows developers to own their own plugins while also allowing a simple way for the overarching `project` topic to interact with those plugins.
 

src/utils/flags.ts

@@ -72,6 +72,7 @@ export const ensuredDirFlag = Flags.custom<string>({
 export const testLevelFlag = Flags.custom<TestLevel>({
   char: 'l',
   parse: (input) => Promise.resolve(input as TestLevel),
+  default: async (context) => Promise.resolve(context.flags.tests ? TestLevel.RunSpecifiedTests : undefined),
   options: Object.values(TestLevel),
 });
 
@@ -92,7 +93,6 @@ export const zipFileFlag = Flags.custom<string>({
 export const testsFlag = Flags.custom({
   char: 't',
   multiple: true,
-  dependsOn: ['test-level'],
   summary: commonFlagMessages.getMessage('flags.tests.summary'),
   description: commonFlagMessages.getMessage('flags.tests.description'),
   // the old version allowed comma separated values, and the change is confusing enough to deserve a warning

test/nuts/seeds/deploy.metadata.test-level.seed.ts

@@ -70,6 +70,15 @@ context('deploy metadata --test-level NUTs [name: %REPO_NAME%]', () => {
       });
       await testkit.expect.specificApexTestsToBeRun(REPO.deploy.testLevel.specifiedTests);
     });
+
+    it('should set --test-level flag to (RunSpecifiedTests) if --tests flag is included', async () => {
+      const packages = testkit.packageNames.map((p) => `--source-dir ${p}`).join(' ');
+      const tests = REPO.deploy.testLevel.specifiedTests.join(',');
+      await testkit.deploy({
+        args: `${packages} --tests ${tests} --ignore-errors`,
+      });
+      await testkit.expect.specificApexTestsToBeRun(REPO.deploy.testLevel.specifiedTests);
+    });
   });
 
   describe('test result format', () => {