cumulusci 3.52.0.dev0__tar.gz → 3.53.0.dev0__tar.gz

{cumulusci-3.52.0.dev0 → cumulusci-3.53.0.dev0}/HISTORY.rst

@@ -2,7 +2,27 @@
 History
 =======
 
+3.52.0 (2022-02-03)
+-------------------
+
+Changes
+
+* Flow steps can now be replaced with the same syntax for all step types! (Current step types are: 'task' or 'flow'). See the [replacing a flow step](https://cumulusci.readthedocs.io/en/latest/config.html?highlight=override#replace-a-flow-step) docs for more details. CumulusCI is still compatible with the old syntax which required setting the current step type to ``None`` when replacing with a step of a differing type. (#3043)
+* Whenever possible, while running the ``robot_libdoc`` task libdoc generates relative pathnames when creating CSV output (#3058)
+* Added a new option ``--preview`` to the ``robot_libdoc`` task. When set to ``true`` it automatically opens a browser window to the generated documentation. (#3057)
+* The robot keyword ``Locate element by label`` has been removed from the Salesforce.py library. This wasn't designed to be a keyword but was accidentally exported as one. If you want to find an input or textarea element by its label you can use a locator of the form ``label:<text>`` (eg: ``label:First Name``) (#3048)
+* Updated to `Snowfakery 2.5.0 <https://github.com/SFDO-Tooling/Snowfakery/releases/tag/v2.5.0>`__
+* If you have Python code that is importing CumulusCI's config classes, some of them have been reorganized into modules with a snake_case name. The old CamelCase imports should still work, but the new names are preferred for consistency with other parts of the codebase.
+
+Issues Closed
+
+* Fixed an issue where overriding flow steps was not working as documented. (#3043)
+* We fixed a bug where the ``Run Task`` and ``Run Task Class`` robot keywords throw an error like ``AttributeError: module 'robot.api.logger' has no attribute 'log'`` in rare cases (#3053)
+* Fixed a bug in the `snowfakery` task which caused Unique IDs to not always be actually unique. (#3059)
+
+
 3.51.1 (2022-01-25)
+-------------------
 
 Issues Closed
 

{cumulusci-3.52.0.dev0 → cumulusci-3.53.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cumulusci
-Version: 3.52.0.dev0
+Version: 3.53.0.dev0
 Summary: Build and release tools for Salesforce developers
 Home-page: https://github.com/SFDO-Tooling/CumulusCI
 Author: Salesforce.org
@@ -57,9 +57,7 @@ Description: =========
         Questions?
         ----------
         
-        Salesforce.org (http://salesforce.org/) customers and partners can ask in the `CumulusCI group in the Power of Us Hub <https://powerofus.force.com/s/group/0F980000000PSRHCA4/cumulusci-cci>`_.
-        
-        Others can ask in the `CumulusCI group in the Trailblazer Community <https://success.salesforce.com/_ui/core/chatter/groups/GroupProfilePage?g=0F9300000009M9ZCAU>`_.
+        Ask in the `CumulusCI group in the Trailblazer Community <https://success.salesforce.com/_ui/core/chatter/groups/GroupProfilePage?g=0F9300000009M9ZCAU>`_.
         
         *Please note:* CumulusCI is distributed under an `open source license <https://github.com/SFDO-Tooling/CumulusCI/blob/main/LICENSE>`_ and is not covered by the Salesforce Master Subscription Agreement.
         
@@ -68,7 +66,27 @@ Description: =========
         History
         =======
         
+        3.52.0 (2022-02-03)
+        -------------------
+        
+        Changes
+        
+        * Flow steps can now be replaced with the same syntax for all step types! (Current step types are: 'task' or 'flow'). See the [replacing a flow step](https://cumulusci.readthedocs.io/en/latest/config.html?highlight=override#replace-a-flow-step) docs for more details. CumulusCI is still compatible with the old syntax which required setting the current step type to ``None`` when replacing with a step of a differing type. (#3043)
+        * Whenever possible, while running the ``robot_libdoc`` task libdoc generates relative pathnames when creating CSV output (#3058)
+        * Added a new option ``--preview`` to the ``robot_libdoc`` task. When set to ``true`` it automatically opens a browser window to the generated documentation. (#3057)
+        * The robot keyword ``Locate element by label`` has been removed from the Salesforce.py library. This wasn't designed to be a keyword but was accidentally exported as one. If you want to find an input or textarea element by its label you can use a locator of the form ``label:<text>`` (eg: ``label:First Name``) (#3048)
+        * Updated to `Snowfakery 2.5.0 <https://github.com/SFDO-Tooling/Snowfakery/releases/tag/v2.5.0>`__
+        * If you have Python code that is importing CumulusCI's config classes, some of them have been reorganized into modules with a snake_case name. The old CamelCase imports should still work, but the new names are preferred for consistency with other parts of the codebase.
+        
+        Issues Closed
+        
+        * Fixed an issue where overriding flow steps was not working as documented. (#3043)
+        * We fixed a bug where the ``Run Task`` and ``Run Task Class`` robot keywords throw an error like ``AttributeError: module 'robot.api.logger' has no attribute 'log'`` in rare cases (#3053)
+        * Fixed a bug in the `snowfakery` task which caused Unique IDs to not always be actually unique. (#3059)
+        
+        
         3.51.1 (2022-01-25)
+        -------------------
         
         Issues Closed
         

{cumulusci-3.52.0.dev0 → cumulusci-3.53.0.dev0}/README.rst

@@ -49,8 +49,6 @@ from minute 36 through minute 54.
 Questions?
 ----------
 
-Salesforce.org (http://salesforce.org/) customers and partners can ask in the `CumulusCI group in the Power of Us Hub <https://powerofus.force.com/s/group/0F980000000PSRHCA4/cumulusci-cci>`_.
-
-Others can ask in the `CumulusCI group in the Trailblazer Community <https://success.salesforce.com/_ui/core/chatter/groups/GroupProfilePage?g=0F9300000009M9ZCAU>`_.
+Ask in the `CumulusCI group in the Trailblazer Community <https://success.salesforce.com/_ui/core/chatter/groups/GroupProfilePage?g=0F9300000009M9ZCAU>`_.
 
 *Please note:* CumulusCI is distributed under an `open source license <https://github.com/SFDO-Tooling/CumulusCI/blob/main/LICENSE>`_ and is not covered by the Salesforce Master Subscription Agreement.

{cumulusci-3.52.0.dev0 → cumulusci-3.53.0.dev0}/cumulusci/cli/cci.py

@@ -120,7 +120,7 @@ def handle_exception(
             traceback.print_exc(file=log_file)  # log stacktrace silently
 
     if should_show_stacktraces and not isinstance(error, USAGE_ERRORS):
-        raise error
+        error_console.print_exception()
 
 
 def connection_error_message(console: Console):

{cumulusci-3.52.0.dev0 → cumulusci-3.53.0.dev0}/cumulusci/cli/org.py

@@ -11,7 +11,12 @@ from rich.console import Console
 from cumulusci.cli.ui import CliTable, SimpleSalesforceUIHelpers
 from cumulusci.core.config import OrgConfig, ScratchOrgConfig
 from cumulusci.core.exceptions import OrgNotFound
-from cumulusci.oauth.client import OAuth2Client, OAuth2ClientConfig
+from cumulusci.oauth.client import (
+    PROD_LOGIN_URL,
+    SANDBOX_LOGIN_URL,
+    OAuth2Client,
+    OAuth2ClientConfig,
+)
 from cumulusci.salesforce_api.utils import get_simple_salesforce_connection
 from cumulusci.utils import parse_api_datetime
 
@@ -109,27 +114,35 @@ def org_browser(runtime, org_name, path, url_only):
     org_config.save()
 
 
-def setup_client(runtime, login_url=None, sandbox=None) -> OAuth2Client:
-    """Provides an OAuth2Client for Connecting and Org"""
-    connected_app = runtime.keychain.get_service("connected_app")
-    base_uri = "https://{}.salesforce.com"
-    base_uri = login_url or base_uri.format("test" if sandbox else "login")
-    auth_uri = base_uri + "/services/oauth2/authorize"
-    token_uri = base_uri + "/services/oauth2/token"
+def setup_client(connected_app, login_url=None, sandbox=None) -> OAuth2Client:
+    """Provides an OAuth2Client for connecting an Org"""
+    if login_url:
+        base_uri = login_url
+    elif sandbox:
+        base_uri = SANDBOX_LOGIN_URL
+    elif connected_app.login_url:
+        base_uri = connected_app.login_url
+    else:
+        base_uri = PROD_LOGIN_URL
+    base_uri = base_uri.rstrip("/")
 
     sf_client_config = OAuth2ClientConfig(
         client_id=connected_app.client_id,
         client_secret=connected_app.client_secret,
         redirect_uri=connected_app.callback_url,
-        auth_uri=auth_uri,
-        token_uri=token_uri,
+        auth_uri=f"{base_uri}/services/oauth2/authorize",
+        token_uri=f"{base_uri}/services/oauth2/token",
         scope="web full refresh_token",
     )
     return OAuth2Client(sf_client_config)
 
 
 def connect_org_to_keychain(
-    client: OAuth2Client, runtime, global_org: bool, org_name: str
+    client: OAuth2Client,
+    runtime,
+    global_org: bool,
+    org_name: str,
+    connected_app: str,
 ) -> None:
     """Use the given client to authorize into an org, and save the
     new OrgConfig to the keychain."""
@@ -137,6 +150,7 @@ def connect_org_to_keychain(
 
     global_org = global_org or runtime.project_config is None
     org_config = OrgConfig(oauth_dict, org_name, runtime.keychain, global_org)
+    org_config.config["connected_app"] = connected_app
     org_config.load_userinfo()
     org_config._load_orginfo()
     if org_config.organization_sobject["TrialExpirationDate"] is None:
@@ -153,6 +167,12 @@ def connect_org_to_keychain(
     name="connect", help="Connects a new org's credentials using OAuth Web Flow"
 )
 @orgname_option_or_argument(required=True)
+@click.option(
+    "--connected-app",
+    "--connected_app",
+    "connected_app_name",
+    help="Name of the connected_app service to use.",
+)
 @click.option(
     "--sandbox", is_flag=True, help="If set, connects to a Salesforce sandbox org"
 )
@@ -171,7 +191,9 @@ def connect_org_to_keychain(
     is_flag=True,
 )
 @pass_runtime(require_project=False, require_keychain=True)
-def org_connect(runtime, org_name, sandbox, login_url, default, global_org):
+def org_connect(
+    runtime, org_name, sandbox, login_url, default, global_org, connected_app_name=None
+):
     runtime.check_org_overwrite(org_name)
 
     if login_url and ".lightning." in login_url:
@@ -180,8 +202,15 @@ def org_connect(runtime, org_name, sandbox, login_url, default, global_org):
             "Use the my.salesforce.com version instead"
         )
 
-    sf_client = setup_client(runtime, login_url, sandbox)
-    connect_org_to_keychain(sf_client, runtime, global_org, org_name)
+    connected_app_name = (
+        connected_app_name or runtime.keychain.get_default_service_name("connected_app")
+    )
+    click.echo(f"Connecting org using the {connected_app_name} connected app...")
+    connected_app = runtime.keychain.get_service("connected_app", connected_app_name)
+    sf_client = setup_client(connected_app, login_url, sandbox)
+    connect_org_to_keychain(
+        sf_client, runtime, global_org, org_name, connected_app_name
+    )
 
     if default and runtime.project_config is not None:
         runtime.keychain.set_default_org(org_name)
@@ -273,6 +302,7 @@ def org_info(runtime, org_name, print_json):
         ui_key_set = {
             "config_file",
             "config_name",
+            "connected_app",
             "created",
             "date_created",
             "days",

{cumulusci-3.52.0.dev0 → cumulusci-3.53.0.dev0}/cumulusci/cli/service.py

@@ -1,4 +1,3 @@
-import json
 import os
 from pathlib import Path
 from typing import Callable, Optional
@@ -35,7 +34,7 @@ def service_list(runtime, plain, print_json):
 
     console = Console()
     if print_json:
-        console.print(json.dumps(services))
+        console.print_json(data=services)
         return None
 
     configured_services = runtime.keychain.list_services()
@@ -84,17 +83,43 @@ class ConnectServiceCommand(click.MultiCommand):
         return sorted(services.keys())
 
     def _build_param(self, attribute: str, details: dict) -> click.Option:
-        req = details["required"]
+        required = details.get("required", False)
         default_factory: Optional[Callable] = self._get_callable_default(
             details.get("default_factory")
         )
-        prompt = None if default_factory else req
+        default = details.get("default")
+        if default is not None:
+            # This gives the user a chance to change the default
+            # (but only if they didn't specify it as a command line option)
+            default_factory = lambda: default  # noqa
+            prompt = True
+            # Since there's a default value,
+            # we don't need to indicate this option as required in help,
+            required = False
+        elif default_factory:
+            # If there's a function to calculate the default,
+            # we'll call it instead of prompting the user.
+            # This provides a hook for collecting the value in other ways,
+            # such as via an oauth flow.
+            prompt = None
+        else:
+            # If there's no default, we prompt the user only if the option is required.
+            prompt = required
+
+        # Make sure the description is included in the prompt
+        description = details.get("description")
+        if prompt:
+            prompt = attribute
+            if description:
+                prompt += f" ({description})"
 
         kwargs = {
             "prompt": prompt,
-            "required": req,
-            "help": details.get("description"),
+            "required": required,
+            "help": description,
             "default": default_factory,
+            # If there is a preset default, this causes it to be shown in help.
+            "show_default": default,
         }
         return click.Option((f"--{attribute}",), **kwargs)
 
@@ -138,7 +163,7 @@ class ConnectServiceCommand(click.MultiCommand):
                 f"Sorry, I don't know about the '{service_type}' service."
             )
 
-        attributes = service_config["attributes"].items()
+        attributes = service_config.get("attributes", {}).items()
         params = [self._build_param(attr, cnfg) for attr, cnfg in attributes]
         params.extend(self._get_default_options(runtime))
 

{cumulusci-3.52.0.dev0 → cumulusci-3.53.0.dev0}/cumulusci/cli/tests/test_cci.py

@@ -114,6 +114,7 @@ def test_main__cci_show_stacktraces(
     init_logger,
     get_tempfile_logger,
     tee,
+    capsys,
 ):
     runtime = mock.Mock()
     runtime.universal_config.cli__show_stacktraces = True
@@ -121,7 +122,7 @@ def test_main__cci_show_stacktraces(
     cli.side_effect = Exception
     get_tempfile_logger.return_value = (mock.Mock(), "tempfile.log")
 
-    with pytest.raises(Exception):
+    with pytest.raises(SystemExit):
         cci.main(["cci"])
 
     check_latest_version.assert_called_once()
@@ -129,6 +130,8 @@ def test_main__cci_show_stacktraces(
     CliRuntime.assert_called_once()
     cli.assert_called_once()
     post_mortem.assert_not_called()
+    captured = capsys.readouterr()
+    assert "Traceback (most recent call last)" in captured.err
 
 
 @mock.patch("cumulusci.cli.cci.tee_stdout_stderr")

{cumulusci-3.52.0.dev0 → cumulusci-3.53.0.dev0}/cumulusci/cli/tests/test_org.py

@@ -1,6 +1,5 @@
 import io
 import json
-from contextlib import contextmanager
 from datetime import date, datetime, timedelta
 from pathlib import Path
 from unittest import mock
@@ -9,16 +8,22 @@ import click
 import pytest
 import responses
 
-from cumulusci.cli import cci
-from cumulusci.core.config import OrgConfig, ScratchOrgConfig
+from cumulusci.core.config import (
+    BaseProjectConfig,
+    OrgConfig,
+    ScratchOrgConfig,
+    ServiceConfig,
+    UniversalConfig,
+)
 from cumulusci.core.exceptions import (
     OrgNotFound,
     ScratchOrgException,
     ServiceNotConfigured,
 )
+from cumulusci.core.keychain import BaseProjectKeychain
 
 from .. import org
-from .utils import run_click_command
+from .utils import run_cli_command, run_click_command
 
 
 class TestOrgCommands:
@@ -81,22 +86,17 @@ class TestOrgCommands:
         click_echo.assert_called_once_with(start_url)
         org_config.save.assert_called_once_with()
 
-    @mock.patch("cumulusci.cli.org.OAuth2Client")
+    @mock.patch("cumulusci.oauth.client.OAuth2Client.auth_code_flow")
     @responses.activate
-    def test_org_connect(self, oauth2client):
-        client_instance = mock.Mock()
-        client_instance.auth_code_flow.return_value = {
+    def test_org_connect(self, auth_code_flow):
+        auth_code_flow.return_value = {
             "instance_url": "https://instance",
             "access_token": "BOGUS",
             "id": "OODxxxxxxxxxxxx/user",
         }
-        oauth2client.return_value = client_instance
         runtime = mock.Mock()
-        runtime.keychain.get_service.return_value = mock.Mock(
-            client_id="asdfasdf",
-            client_secret="asdfasdf",
-            callback_url="http://localhost:8080/callback",
-        )
+        runtime.project_config = BaseProjectConfig(UniversalConfig(), config={})
+        runtime.keychain = BaseProjectKeychain(runtime.project_config, None)
         responses.add(
             method="GET",
             url="https://instance/services/oauth2/userinfo",
@@ -116,37 +116,70 @@ class TestOrgCommands:
             status=200,
         )
         responses.add("GET", "https://instance/services/data", json=[{"version": 45.0}])
-        run_click_command(
-            org.org_connect,
-            runtime=runtime,
-            org_name="test",
-            sandbox=False,
-            login_url=None,
-            default=True,
-            global_org=False,
-        )
 
-        runtime.check_org_overwrite.assert_called_once()
-        runtime.keychain.set_org.assert_called_once()
-        org_config = runtime.keychain.set_org.call_args[0][0]
+        result = run_cli_command("org", "connect", "test", "--default", runtime=runtime)
+
+        name, org_config = runtime.keychain.get_default_org()
+        assert name == "test"
+        assert org_config.id == "OODxxxxxxxxxxxx/user"
+        assert org_config.connected_app == "built-in"
         assert org_config.expires == "Persistent"
-        runtime.keychain.set_default_org.assert_called_once_with("test")
+        assert "Connecting org using the built-in connected app..." in result.output
+        assert "test is now the default org" in result.output
 
-    @contextmanager
-    def mock_main_context(self):
-        with mock.patch(  # side effects break other tests
-            "cumulusci.cli.cci.init_logger", mock.Mock()
-        ), mock.patch(
-            "cumulusci.cli.cci.get_tempfile_logger",
-            mock.MagicMock(return_value=(None, "")),
-        ), mock.patch(
-            "cumulusci.cli.cci.tee_stdout_stderr", mock.MagicMock()
-        ):
-            yield
+    @mock.patch("cumulusci.oauth.client.OAuth2Client.auth_code_flow")
+    @responses.activate
+    def test_org_connect__non_default_connected_app(self, auth_code_flow):
+        auth_code_flow.return_value = {
+            "instance_url": "https://instance",
+            "access_token": "BOGUS",
+            "id": "OODxxxxxxxxxxxx/user",
+        }
+        runtime = mock.Mock()
+        runtime.project_config = BaseProjectConfig(UniversalConfig(), config={})
+        runtime.keychain = BaseProjectKeychain(runtime.project_config, None)
+        runtime.keychain.set_service(
+            "connected_app",
+            "other",
+            ServiceConfig(
+                {
+                    "login_url": "https://other",
+                    "callback_url": "http://localhost:8080/callback",
+                    "client_id": "ID",
+                    "client_secret": "SECRET",
+                }
+            ),
+        )
+        responses.add(
+            method="GET",
+            url="https://instance/services/oauth2/userinfo",
+            body=b"{}",
+            status=200,
+        )
+        responses.add(
+            method="GET",
+            url="https://instance/services/data/v45.0/sobjects/Organization/OODxxxxxxxxxxxx",
+            json={
+                "TrialExpirationDate": None,
+                "OrganizationType": "Developer Edition",
+                "IsSandbox": False,
+                "InstanceName": "CS420",
+                "NamespacePrefix": None,
+            },
+            status=200,
+        )
+        responses.add("GET", "https://instance/services/data", json=[{"version": 45.0}])
+
+        result = run_cli_command(
+            "org", "connect", "test", "--connected_app", "other", runtime=runtime
+        )
+
+        org_config = runtime.keychain.get_org("test")
+        assert org_config.connected_app == "other"
+        assert "Connecting org using the other connected app..." in result.output
 
     @mock.patch("cumulusci.cli.org.connect_org_to_keychain")
-    @mock.patch("cumulusci.cli.cci.CliRuntime")
-    def test_org_connect__sandbox(self, cli_runtime, connect_to_keychain):
+    def test_org_connect__sandbox(self, connect_to_keychain):
         mocked_connected_app = mock.Mock()
         mocked_connected_app.client_id = "foo"
         mocked_connected_app.client_secret = "bar"
@@ -155,30 +188,19 @@ class TestOrgCommands:
         runtime = mock.Mock()
         runtime.keychain.get_service.return_value = mocked_connected_app
 
-        cli_runtime.return_value = runtime
-
-        with self.mock_main_context():
-            cci.main(["cci", "org", "connect", "blah", "--sandbox"])
+        run_cli_command("org", "connect", "blah", "--sandbox", runtime=runtime)
 
         actual_client_config = connect_to_keychain.call_args_list[0][0][0].client_config
         assert actual_client_config.auth_uri.startswith("https://test.salesforce.com/")
         assert actual_client_config.token_uri.startswith("https://test.salesforce.com/")
 
     @mock.patch("cumulusci.cli.org.connect_org_to_keychain")
-    @mock.patch("cumulusci.cli.cci.CliRuntime")
-    def test_org_connect__prod_default(self, cli_runtime, connect_to_keychain):
-        mocked_connected_app = mock.Mock()
-        mocked_connected_app.client_id = "foo"
-        mocked_connected_app.client_secret = "bar"
-        mocked_connected_app.callback_url = "https://foo.bar.baz/"
-
+    def test_org_connect__prod_default(self, connect_to_keychain):
         runtime = mock.Mock()
-        runtime.keychain.get_service.return_value = mocked_connected_app
-
-        cli_runtime.return_value = runtime
+        runtime.project_config = BaseProjectConfig(UniversalConfig(), config={})
+        runtime.keychain = BaseProjectKeychain(runtime.project_config, None)
 
-        with self.mock_main_context():
-            cci.main(["cci", "org", "connect", "blah"])
+        run_cli_command("org", "connect", "blah", runtime=runtime)
 
         actual_client_config = connect_to_keychain.call_args_list[0][0][0].client_config
         assert actual_client_config.auth_uri.startswith("https://login.salesforce.com/")
@@ -186,6 +208,59 @@ class TestOrgCommands:
             "https://login.salesforce.com/"
         )
 
+    @mock.patch("cumulusci.cli.org.connect_org_to_keychain")
+    def test_org_connect__other_connected_app_login_url(self, connect_to_keychain):
+        runtime = mock.Mock()
+        runtime.project_config = BaseProjectConfig(UniversalConfig(), config={})
+        runtime.keychain = BaseProjectKeychain(runtime.project_config, None)
+        runtime.keychain.set_service(
+            "connected_app",
+            "other",
+            ServiceConfig(
+                {
+                    "client_id": "foo",
+                    "client_secret": "bar",
+                    "callback_url": "https://foo.bar.baz/",
+                    "login_url": "https://other",
+                }
+            ),
+        )
+
+        run_cli_command(
+            "org", "connect", "blah", "--connected-app", "other", runtime=runtime
+        )
+
+        actual_client_config = connect_to_keychain.call_args_list[0][0][0].client_config
+        assert actual_client_config.auth_uri.startswith("https://other/")
+        assert actual_client_config.token_uri.startswith("https://other/")
+
+    @mock.patch("cumulusci.cli.org.connect_org_to_keychain")
+    def test_org_connect__login_url_from_cli_option(self, connect_to_keychain):
+        runtime = mock.Mock()
+        runtime.project_config = BaseProjectConfig(UniversalConfig(), config={})
+        runtime.keychain = BaseProjectKeychain(runtime.project_config, None)
+
+        run_cli_command(
+            "org", "connect", "blah", "--login-url", "https://custom", runtime=runtime
+        )
+
+        actual_client_config = connect_to_keychain.call_args_list[0][0][0].client_config
+        assert actual_client_config.auth_uri.startswith("https://custom/")
+        assert actual_client_config.token_uri.startswith("https://custom/")
+
+    def test_org_connect__bad_connected_app_name(self):
+        runtime = mock.Mock()
+        runtime.project_config = BaseProjectConfig(UniversalConfig(), config={})
+        runtime.keychain = BaseProjectKeychain(runtime.project_config, None)
+
+        with pytest.raises(
+            ServiceNotConfigured,
+            match="No service of type connected_app configured with name: bogus",
+        ):
+            run_cli_command(
+                "org", "connect", "blah", "--connected-app", "bogus", runtime=runtime
+            )
+
     @mock.patch("cumulusci.cli.org.OAuth2Client")
     @responses.activate
     def test_org_connect_expires(self, oauth2client):
@@ -370,7 +445,12 @@ class TestOrgCommands:
 
     def test_org_info(self):
         org_config = mock.Mock()
-        org_config.config = {"days": 1, "default": True, "password": None}
+        org_config.config = {
+            "days": 1,
+            "default": True,
+            "password": None,
+            "connected_app": "built-in",
+        }
         org_config.expires = date.today()
         org_config.latest_api_version = "42.0"
         runtime = mock.Mock()
@@ -384,6 +464,7 @@ class TestOrgCommands:
                 [
                     ["Org: test", ""],
                     ["\x1b[1mapi_version\x1b[0m", "42.0"],
+                    ["\x1b[1mconnected_app\x1b[0m", "built-in"],
                     ["\x1b[1mdays\x1b[0m", "1"],
                     ["\x1b[1mdefault\x1b[0m", "True"],
                     ["\x1b[1mpassword\x1b[0m", "None"],