chore: fix merge conflict

Author: cristiand391

.github/workflows/slackprnotification.yml

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.13.2](https://github.com/salesforcecli/plugin-org/compare/v1.13.1...v1.13.2) (2022-05-20)
+
+### Bug Fixes
+
+- add back a long description that got lost ([83a2341](https://github.com/salesforcecli/plugin-org/commit/83a2341f96908f33647b609f7082f0f9e52bc289))
+- update list so the examples render correctly in CLI Ref ([7c024a6](https://github.com/salesforcecli/plugin-org/commit/7c024a6272b70121e32ece4063c17a7c13c080db))
+- update messages so the examples render correctly in CLI Ref ([1329901](https://github.com/salesforcecli/plugin-org/commit/13299011fb917f77008f985af6b70bf005a2f4b6))
+- update open so the examples render correctly in CLI Ref ([73f60ff](https://github.com/salesforcecli/plugin-org/commit/73f60ffeeb934eee1a2af584357aa7b24b62bad6))
+- update status so the examples render correctly in CLI Ref ([0d3792f](https://github.com/salesforcecli/plugin-org/commit/0d3792fa3019eb008e39716c5aacfaebb0a33bc2))
+
+### [1.13.1](https://github.com/salesforcecli/plugin-org/compare/v1.13.0...v1.13.1) (2022-05-11)
+
 ## [1.13.0](https://github.com/salesforcecli/plugin-org/compare/v1.12.1...v1.13.0) (2022-05-10)
 
 ### Features

CHANGELOG.md

@@ -151,7 +151,7 @@ EXAMPLES
   $ sfdx force:org:create -t sandbox -f config/dev-sandbox-def.json -a MyDevSandbox -u prodOrg
 ```
 
-_See code: [src/commands/force/org/beta/create.ts](https://github.com/salesforcecli/plugin-org/blob/v1.12.1/src/commands/force/org/beta/create.ts)_
+_See code: [src/commands/force/org/beta/create.ts](https://github.com/salesforcecli/plugin-org/blob/v1.13.1/src/commands/force/org/beta/create.ts)_
 
 ## `sfdx force:org:clone [name=value...] -t sandbox [-f <filepath>] [-s] [-a <string>] [-w <minutes>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
@@ -196,7 +196,7 @@ EXAMPLES
   $ sfdx force:org:clone -t sandbox SandboxName=DevSbx1 SourceSandboxName=Sbx2Clone -u prodOrg -a MyDevSandbox
 ```
 
-_See code: [src/commands/force/org/clone.ts](https://github.com/salesforcecli/plugin-org/blob/v1.12.1/src/commands/force/org/clone.ts)_
+_See code: [src/commands/force/org/clone.ts](https://github.com/salesforcecli/plugin-org/blob/v1.13.1/src/commands/force/org/clone.ts)_
 
 ## `sfdx force:org:delete [-p] [-v <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
@@ -232,7 +232,7 @@ EXAMPLES
   $ sfdx force:org:delete -u MyOrgAlias -p
 ```
 
-_See code: [src/commands/force/org/delete.ts](https://github.com/salesforcecli/plugin-org/blob/v1.12.1/src/commands/force/org/delete.ts)_
+_See code: [src/commands/force/org/delete.ts](https://github.com/salesforcecli/plugin-org/blob/v1.13.1/src/commands/force/org/delete.ts)_
 
 ## `sfdx force:org:display [-u <string>] [--apiversion <string>] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
@@ -267,13 +267,13 @@ DESCRIPTION
   auth:jwt:grant)
 
 EXAMPLES
-  sfdx force:org:display
-  sfdx force:org:display -u [email protected]
-  sfdx force:org:display -u TestOrg1 --json
-  sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json
+  $ sfdx force:org:display
+  $ sfdx force:org:display -u [email protected]
+  $ sfdx force:org:display -u TestOrg1 --json
+  $ sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json
 ```
 
-_See code: [src/commands/force/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/v1.12.1/src/commands/force/org/display.ts)_
+_See code: [src/commands/force/org/display.ts](https://github.com/salesforcecli/plugin-org/blob/v1.13.1/src/commands/force/org/display.ts)_
 
 ## `sfdx force:org:list [--all] [-p --clean] [--skipconnectionstatus] [--verbose] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
@@ -306,12 +306,12 @@ OPTIONS
   --verbose                                                                         list more information about each org
 
 EXAMPLES
-  sfdx force:org:list
-  sfdx force:org:list --verbose --json
-  sfdx force:org:list --verbose --json > tmp/MyOrgList.json
+  $ sfdx force:org:list
+  $ sfdx force:org:list --verbose --json
+  $ sfdx force:org:list --verbose --json > tmp/MyOrgList.json
 ```
 
-_See code: [src/commands/force/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/v1.12.1/src/commands/force/org/list.ts)_
+_See code: [src/commands/force/org/list.ts](https://github.com/salesforcecli/plugin-org/blob/v1.13.1/src/commands/force/org/list.ts)_
 
 ## `sfdx force:org:open [-b <string> | -r] [-p <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
@@ -349,14 +349,14 @@ DESCRIPTION
    you don't specify --browser, the org opens in your default browser.
 
 EXAMPLES
-  sfdx force:org:open
-  sfdx force:org:open -u [email protected]
-  sfdx force:org:open -u MyTestOrg1
-  sfdx force:org:open -r -p lightning
-  sfdx force:org:open -u [email protected] -b firefox
+  $ sfdx force:org:open
+  $ sfdx force:org:open -u [email protected]
+  $ sfdx force:org:open -u MyTestOrg1
+  $ sfdx force:org:open -r -p lightning
+  $ sfdx force:org:open -u [email protected] -b firefox
 ```
 
-_See code: [src/commands/force/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/v1.12.1/src/commands/force/org/open.ts)_
+_See code: [src/commands/force/org/open.ts](https://github.com/salesforcecli/plugin-org/blob/v1.13.1/src/commands/force/org/open.ts)_
 
 ## `sfdx force:org:status -n <string> [-s] [-a <string>] [-w <minutes>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
@@ -400,10 +400,10 @@ DESCRIPTION
   license.
 
 EXAMPLES
-  sfdx force:org:status --sandboxname DevSbx1 --setalias MySandbox -u prodOrg
-  sfdx force:org:status --sandboxname DevSbx1 --wait 45 --setdefaultusername -u prodOrg
+  $ sfdx force:org:status --sandboxname DevSbx1 --setalias MySandbox -u prodOrg
+  $ sfdx force:org:status --sandboxname DevSbx1 --wait 45 --setdefaultusername -u prodOrg
 ```
 
-_See code: [src/commands/force/org/status.ts](https://github.com/salesforcecli/plugin-org/blob/v1.12.1/src/commands/force/org/status.ts)_
+_See code: [src/commands/force/org/status.ts](https://github.com/salesforcecli/plugin-org/blob/v1.13.1/src/commands/force/org/status.ts)_
 
 <!-- commandsstop -->

README.md

@@ -12,6 +12,9 @@
     "setalias": "alias for the cloned org",
     "definitionfile": "path to the sandbox definition file"
   },
+  "flagsLong": {
+    "wait": "Sets the streaming client socket timeout, in minutes. If the streaming client socket has no contact from the server for a number of minutes, the client exits. Specify a longer wait time if timeouts occur frequently."
+  },
   "commandSuccess": "The sandbox org cloning process %s is in progress. Run \"sfdx force:org:status -n %s\" to check for status. If the org is ready, checking the status also logs the requesting user in to the sandbox org and authorizes the org for use with Salesforce CLI.",
   "missingLicenseType": "The sandbox license type is required, but you didn't provide a value.  Specify the license type in the sandbox definition file with the \"licenseType\" option, or specify the option as a name-value pair at the command-line.  See https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_sandbox_definition.htm for more information.",
   "commandOrganizationTypeNotSupport": "The only supported org type is: %s",

messages/clone.json

@@ -1,10 +1,10 @@
 {
   "description": "get the description for the current or target org\nOutput includes your access token, client Id, connected status, org ID, instance URL, username, and alias, if applicable.\nUse --verbose to include the SFDX auth URL. WARNING: The SFDX auth URL contains sensitive information, such as a refresh token that can be used to access an org. Don't share or distribute this URL or token.\nIncluding --verbose displays the sfdxAuthUrl property only if you authenticated to the org using auth:web:login (not auth:jwt:grant)",
   "examples": [
-    "sfdx force:org:display",
-    "sfdx force:org:display -u [email protected]",
-    "sfdx force:org:display -u TestOrg1 --json",
-    "sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json"
+    "$ sfdx force:org:display",
+    "$ sfdx force:org:display -u [email protected]",
+    "$ sfdx force:org:display -u TestOrg1 --json",
+    "$ sfdx force:org:display -u TestOrg1 --json > tmp/MyOrgDesc.json"
   ],
   "noScratchOrgInfoError": "No information for scratch org with ID %s found in Dev Hub %s.",
   "noScratchOrgInfoAction": "First check that you can access your Dev Hub. Then check that the ScratchOrgInfo standard object in your Dev Hub contains a record for your scratch org. In Setup, navigate to the Dev Hub page and click the Scratch Org Infos tab. If you find your scratch org, try again."

messages/display.json

@@ -1,9 +1,9 @@
 {
   "description": "list all orgs you’ve created or authenticated to",
   "examples": [
-    "sfdx force:org:list",
-    "sfdx force:org:list --verbose --json",
-    "sfdx force:org:list --verbose --json > tmp/MyOrgList.json"
+    "$ sfdx force:org:list",
+    "$ sfdx force:org:list --verbose --json",
+    "$ sfdx force:org:list --verbose --json > tmp/MyOrgList.json"
   ],
   "verbose": "list more information about each org",
   "all": "include expired, deleted, and unknown-status scratch orgs",

messages/list.json

@@ -1,11 +1,11 @@
 {
   "description": "open your default scratch org, or another specified org\nTo open a specific page, specify the portion of the URL after \"https://MyDomainName.my.salesforce.com/\" as --path.\nFor example, specify \"--path lightning\" to open Lightning Experience, or specify \"--path /apex/YourPage\" to open a Visualforce page.\nTo generate a URL but not launch it in your browser, specify --urlonly.\nTo open in a specific browser, use the --browser parameter. Supported browsers are \"chrome\", \"edge\", and \"firefox\". If you don't specify --browser, the org opens in your default browser.",
   "examples": [
-    "sfdx force:org:open",
-    "sfdx force:org:open -u [email protected]",
-    "sfdx force:org:open -u MyTestOrg1",
-    "sfdx force:org:open -r -p lightning",
-    "sfdx force:org:open -u [email protected] -b firefox"
+    "$ sfdx force:org:open",
+    "$ sfdx force:org:open -u [email protected]",
+    "$ sfdx force:org:open -u MyTestOrg1",
+    "$ sfdx force:org:open -r -p lightning",
+    "$ sfdx force:org:open -u [email protected] -b firefox"
   ],
   "browser": "browser where the org opens",
   "cliPath": "navigation URL path",

messages/open.json

@@ -1,7 +1,7 @@
 {
   "examples": [
-    "sfdx force:org:status --sandboxname DevSbx1 --setalias MySandbox -u prodOrg",
-    "sfdx force:org:status --sandboxname DevSbx1 --wait 45 --setdefaultusername -u prodOrg"
+    "$ sfdx force:org:status --sandboxname DevSbx1 --setalias MySandbox -u prodOrg",
+    "$ sfdx force:org:status --sandboxname DevSbx1 --wait 45 --setdefaultusername -u prodOrg"
   ],
   "description": "report status of sandbox creation or clone and authenticate to it\nUse this command to check the status of your sandbox creation or clone and, if the sandbox is ready, authenticate to it.\nUse the --wait (-w) parameter to specify the number of minutes that the command waits for the sandbox creation or clone to complete before returning control of the terminal to you.\nSet the --targetusername (-u) parameter to the username or alias of the production org that contains the sandbox license.",
   "flags": {

messages/status.json

@@ -58,6 +58,7 @@ export class OrgCloneCommand extends SfdxCommand {
     wait: flags.minutes({
       char: 'w',
       description: messages.getMessage('flags.wait'),
+      longDescription: messages.getMessage('flagsLong.wait'),
       min: Duration.minutes(2),
       default: Duration.minutes(6),
     }),

src/commands/force/org/clone.ts

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2021, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { TestSession, execCmd } from '@salesforce/cli-plugins-testkit';
+import { expect } from 'chai';
+
+let session: TestSession;
+
+describe('test org:open command', () => {
+  before(async () => {
+    session = await TestSession.create({
+      project: { name: 'forceOrgList' },
+      setupCommands: ['sfdx force:org:create -f config/project-scratch-def.json --setdefaultusername --wait 10'],
+    });
+  });
+
+  it('org:open command', async () => {
+    const result = execCmd('force:org:open --urlonly --json', {
+      ensureExitCode: 0,
+    }).jsonOutput.result as { url: string; orgId: string; username: string };
+    expect(result).to.be.ok;
+    expect(result).to.have.keys(['url', 'orgId', 'username']);
+    expect(result?.url).to.include('/secur/frontdoor.jsp');
+  });
+
+  after(async () => {
+    await session.zip(undefined, 'artifacts');
+    await session.clean();
+  });
+});