cumulusci 3.65.0.dev1__tar.gz → 3.66.0.dev1__tar.gz

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/HISTORY.rst

@@ -2,6 +2,14 @@
 History
 =======
 
+3.65.0 (2022-09-16)
+-------------------
+
+Changes 🎉
+~~~~~~~~~~
+
+* Improve logging and add error handling for Vlocity tasks by @prescod in (#3357)
+
 3.64.0 (2022-08-18)
 -------------------
 

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cumulusci
-Version: 3.65.0.dev1
+Version: 3.66.0.dev1
 Summary: Build and release tools for Salesforce developers
 Home-page: https://github.com/SFDO-Tooling/CumulusCI
 Author: Salesforce.org
@@ -66,6 +66,14 @@ Description: =========
         History
         =======
         
+        3.65.0 (2022-09-16)
+        -------------------
+        
+        Changes 🎉
+        ~~~~~~~~~~
+        
+        * Improve logging and add error handling for Vlocity tasks by @prescod in (#3357)
+        
         3.64.0 (2022-08-18)
         -------------------
         

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/cli/cci.py

@@ -183,8 +183,24 @@ def display_release_notes_link(latest_version: str) -> None:
     )
 
 
+def version_info_wrapper(
+    ctx: click.Context, param: click.Parameter, value: bool
+) -> None:
+    if not value:
+        return
+    show_version_info()
+    ctx.exit()
+
+
 @click.group("main", help="")
-@click.version_option(show_version_info, message="")
+@click.option(  # based on https://click.palletsprojects.com/en/8.1.x/options/#callbacks-and-eager-options
+    "--version",
+    is_flag=True,
+    expose_value=False,
+    is_eager=True,
+    help="Show the version and exit.",
+    callback=version_info_wrapper,
+)
 def cli():
     """Top-level `click` command group."""
 

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/cli/tests/test_cci.py

@@ -514,3 +514,28 @@ def mock_validate_debug(value):
         assert bool(self.debug_mode) == bool(value)
 
     return _run_task
+
+
+@mock.patch("cumulusci.cli.cci.tee_stdout_stderr")
+@mock.patch("cumulusci.cli.cci.get_tempfile_logger")
+@mock.patch("cumulusci.cli.cci.init_logger")
+@mock.patch("cumulusci.cli.cci.check_latest_version")
+@mock.patch("cumulusci.cli.cci.CliRuntime")
+@mock.patch("cumulusci.cli.cci.show_version_info")
+def test_dash_dash_version(
+    show_version_info,
+    CliRuntime,
+    check_latest_version,
+    init_logger,
+    get_tempfile_logger,
+    tee,
+):
+    get_tempfile_logger.return_value = mock.Mock(), "tempfile.log"
+    cci.main(["cci", "--help"])
+    assert len(show_version_info.mock_calls) == 0
+
+    cci.main(["cci", "version"])
+    assert len(show_version_info.mock_calls) == 1
+
+    cci.main(["cci", "--version"])
+    assert len(show_version_info.mock_calls) == 2

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/cumulusci.yml

@@ -552,6 +552,10 @@ tasks:
         class_path: cumulusci.tasks.metadata_etl.SetDuplicateRuleStatus
         options:
             namespace_inject: $project_config.project__package__namespace
+    set_object_settings:
+        description: Enable and disable object level settings on standard and custom objects
+        class_path: cumulusci.tasks.metadata_etl.SetObjectSettings
+        group: Metadata Transformations
     set_organization_wide_defaults:
         group: Metadata Transformations
         description: Sets the Organization-Wide Defaults for specific sObjects, and waits for sharing recalculation to complete.

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/robotframework/Salesforce.robot

@@ -134,17 +134,25 @@ Open Test Browser Firefox
     [Documentation]  Opens a Firefox browser window and navigates to the org
     ...  This keyword isn't normally called directly by a test. It is used
     ...  by the `Open Test Browser` keyword.
+    ...
+    ...  The firefox profile is set to accept all cookies.
 
     [Arguments]     ${login_url}  ${alias}=${NONE}
     Open Browser  ${login_url}  firefox  alias=${alias}
+    #    http://kb.mozillazine.org/Network.cookie.cookieBehavior
+    ...  ff_profile_dir=set_preference("network.cookie.cookieBehavior", 0)
 
 Open Test Browser Headless Firefox
     [Documentation]  Opens the firefox browser in headless mode
     ...  This keyword isn't normally called directly by a test. It is used
     ...  by the `Open Test Browser` keyword.
+    ...
+    ...  The firefox profile is set to accept all cookies.
 
     [Arguments]     ${login_url}  ${alias}=${NONE}
     Open Browser  ${login_url}  headlessfirefox  alias=${alias}
+    #    http://kb.mozillazine.org/Network.cookie.cookieBehavior
+    ...  ff_profile_dir=set_preference("network.cookie.cookieBehavior", 0)
 
 Get Chrome Options
     [Documentation]

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/robotframework/SalesforcePlaywright.py

@@ -4,7 +4,10 @@ from Browser import SupportedBrowsers
 
 from cumulusci.robotframework.base_library import BaseLibrary
 from cumulusci.robotframework.faker_mixin import FakerMixin
-from cumulusci.robotframework.utils import WAIT_FOR_AURA_SCRIPT
+from cumulusci.robotframework.utils import (
+    WAIT_FOR_AURA_SCRIPT,
+    capture_screenshot_on_error,
+)
 
 
 class SalesforcePlaywright(FakerMixin, BaseLibrary):
@@ -88,10 +91,6 @@ class SalesforcePlaywright(FakerMixin, BaseLibrary):
             else self.cumulusci.login_url()
         )
 
-        # browser's (or robot's?) automatic type conversion doesn't
-        # seem to work when calling the function directly, so we have
-        # to pass the enum rather than string representation of the
-        # browser. _sigh_
         if record_video:
             # ugh. the "dir" value must be non-empty, and will be treated as
             # a folder name under the browser/video folder. using "../video"
@@ -106,10 +105,10 @@ class SalesforcePlaywright(FakerMixin, BaseLibrary):
         )
         page_details = self.browser.new_page(login_url)
 
-        self.browser.wait_until_network_is_idle()
-
+        self.wait_until_loading_is_complete()
         return browser_id, context_id, page_details
 
+    @capture_screenshot_on_error
     def wait_until_loading_is_complete(self, locator=None):
         """Wait for a lightning page to load.
 
@@ -127,14 +126,14 @@ class SalesforcePlaywright(FakerMixin, BaseLibrary):
             if locator is None
             else locator
         )
+        self.browser.get_element(locator)
+        self.browser.execute_javascript(function=WAIT_FOR_AURA_SCRIPT)
+
+        # this seems to fail once in a while for an unknown reason, so we'll
+        # try twice. This seems to be more effective than calling the
+        # function once and waiting 30 seconds.
         try:
-            self.browser.get_element(locator)
-            self.browser.execute_javascript(function=WAIT_FOR_AURA_SCRIPT)
-            self.browser.wait_until_network_is_idle()
-
-        except Exception:
-            try:
-                self.browser.take_screenshot()
-            except Exception as e:
-                self.builtin.warn("unable to capture screenshot: {}".format(str(e)))
-            raise
+            self.browser.wait_until_network_is_idle("15 seconds")
+        except Exception as e:
+            self.builtin.log(f"caught error waiting for idle: {e}", "WARN")
+            self.browser.wait_until_network_is_idle("15 seconds")

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/robotframework/form_handlers.py

@@ -194,18 +194,16 @@ class LightningLookupHandler(BaseFormHandler):
     tags = ["lightning-lookup", "lightning-grouped-combobox"]
 
     def set(self, value):
-        wait = 5
+        wait = 10
         # I wonder if I should/could anchor this to the element
         # instead of searching the whole document?
-        value_locator = f'//div[@role="listbox"]//*[.="{value}"]'
+        value_locator = f'//lightning-base-combobox-formatted-text[@title="{value}"]'
         self.element.click()
         self.input_element.send_keys(value)
         try:
             self.selenium.wait_until_element_is_visible(value_locator, wait)
             self.selenium.click_element(value_locator)
         except Exception:
-            # *sigh* this still fails randomly even though
-            # I can see the dadgum item in the dropdown.
             raise TimeoutException(
                 f"Lookup value '{value}' for '{self.locator}' not found after {wait} seconds"
             )

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/robotframework/tests/salesforce/forms.robot

@@ -124,9 +124,10 @@ Non-lightning based form - radiobutton
     [Documentation]  Verify we can set a plain non-lightning radiobutton
 
     [Setup]     Run keywords
-    ...  Skip if  "firefox" in $browser
-    ...  AND  Go to My Email Settings
-    ...  AND  Select frame  //div[@class="setupcontent"]//iframe
+    ...  Go to My Email Settings
+    ...  AND  Select frame                   //div[@class="setupcontent"]//iframe
+    ...  AND  Select radio button            use_external_email  1
+    ...  AND  Radio button should be set to  use_external_email  1
     [Teardown]  Unselect frame
 
     # The settings page is just about the only page I could find
@@ -134,9 +135,6 @@ Non-lightning based form - radiobutton
     # Thankfully, I can use built-in keywords to validate that
     # the radiobuttons have actually bet set.
 
-    # make sure it is set to 1
-    Select radio button  use_external_email  1
-
     # then try to use our keyword to set it
     Input form data
     ...  Send through Salesforce  selected

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/robotframework/tests/salesforce/pageobjects/listing_page.robot

@@ -14,7 +14,13 @@ Create Test Data
     [Documentation]
     ...  Create contacts used by tests in this suite
 
-    # First, delete all existing contacts
+    # Delete all cases, in case they are holding on to some contacts
+    ${records}=  Salesforce Query  Case
+    FOR  ${record}  IN  @{records}
+        Salesforce Delete  Case  ${record['Id']}
+    END
+
+    # Next, delete all existing contacts
     ${records}=  Salesforce Query  Contact
     FOR  ${record}  IN  @{records}
         Salesforce Delete  Contact  ${record['Id']}

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/robotframework/tests/salesforce/pageobjects/objectmanager.robot

@@ -38,7 +38,6 @@ Navigate To The Object Manager page For Specified Object
 Create Custom Lookup Field Using Object Manager
     [Documentation]     To test the ability of creating a custom lookup field using object manager and verify field got created
 
-    Skip if  "firefox" in $browser
     Create Custom Field In Object Manager
     ...                                                    Object=Contact
     ...                                                    Field_Type=Lookup
@@ -52,7 +51,6 @@ Create Custom Lookup Field Using Object Manager
 Create Custom Text Field Using Object Manager
     [Documentation]     To test the ability of creating a custom text field using object manager and verify field got created
 
-    Skip if  "firefox" in $browser
     Create Custom Field In Object Manager
     ...                                                    Object=Contact
     ...                                                    Field_Type=Text
@@ -66,7 +64,6 @@ Create Custom Text Field Using Object Manager
 Create Custom Currency Field Using Object Manager
     [Documentation]     To test the ability of creating a custom currency field and verify field got created
 
-    Skip if  "firefox" in $browser
     Create Custom Field In Object Manager
     ...                                                    Object=Account
     ...                                                    Field_Type=Currency

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/robotframework/tests/salesforce/playwright/playwright.robot

@@ -17,7 +17,7 @@ Go to user profile
 
 Go to contacts home
     Click            button:has-text("App Launcher")
-    Fill text        input[placeholder='Search apps and items...']  Contacts
+    Type text        input[placeholder='Search apps and items...']  Contacts
     Click            one-app-launcher-menu-item:has-text("Contacts")
 
     Wait until network is idle

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/robotframework/tests/test_utils.py

@@ -6,11 +6,21 @@ from unittest import mock
 import cumulusci.robotframework.utils as robot_utils
 from cumulusci.utils import touch
 
+mock_SeleniumLibrary = mock.Mock()
+
+
+class MockBuiltIn:
+    get_library_instance = mock.Mock(
+        return_value={"SeleniumLibrary": mock_SeleniumLibrary}
+    )
+
+
+robot_utils.BuiltIn = MockBuiltIn
+
 
 class TestRobotframeworkUtils:
     def setup_method(self):
-        robot_utils.BuiltIn = mock.Mock(name="BuiltIn")
-        self.mock_selib = robot_utils.BuiltIn().get_library_instance("SeleniumLibrary")
+        mock_SeleniumLibrary.reset_mock()
 
     def test_screenshot_decorator_fail(self):
         """Verify that the decorator will capture a screenshot on keyword failure"""
@@ -23,7 +33,7 @@ class TestRobotframeworkUtils:
             example_function()
         except Exception:
             pass
-        self.mock_selib.failure_occurred.assert_called_once()
+        mock_SeleniumLibrary.capture_page_screenshot.assert_called_once()
 
     def test_screenshot_decorator_pass(self):
         """Verify that decorator does NOT capture screenshot on keyword success"""
@@ -33,7 +43,8 @@ class TestRobotframeworkUtils:
             return True
 
         example_function()
-        self.mock_selib.failure_occurred.assert_not_called()
+
+        mock_SeleniumLibrary.capture_page_screenshot.assert_not_called()
 
 
 class TestGetLocatorModule:

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/robotframework/utils.py

@@ -95,7 +95,7 @@ class RetryingSeleniumLibraryMixin(object):
                         result = orig_execute(driver_command, params)
                 except Exception:
                     if driver_command != Command.SCREENSHOT:
-                        self.selenium.capture_page_screenshot()
+                        safe_screenshot()
                     if self.debug:
                         self.selenium.log_source()
                     raise
@@ -212,17 +212,17 @@ def selenium_retry(target=None, retry=True):
 def capture_screenshot_on_error(func):
     """Decorator for capturing a screenshot if a keyword throws an error
 
-    The name is slightly misleading. While it was designed to capture a
-    screenshot on error, it actually ties in to the same feature in
-    SeleniumLibrary.
+    This decorator will work for both SeleniumLibrary and Browser.
 
-    SeleniumLibrary lets you define any keyword to be run on error,
-    though I doubt we would ever use it for anything other than to
-    capture screenshots. However, if you do configure SeleniumLibrary
-    to do something other than (or in addition to) capturing a
-    screenshot, any keyword that uses this decorator will behave just
-    like a SeleniumLibrary keyword.
+    If a screenshot cannot be taken for any reason, the screenshot error
+    will be logged before the original exception is re-raised.
 
+    For keywords using the Browser library, this will call the keyword
+    "Take screenshot".
+
+    For keywords using SeleniumLibrary, this decorator will call whatever
+    keyword SeleniumLibrary is configured to call on failure. Normally
+    that will be "Capture page screenshot".
     """
 
     @functools.wraps(func)
@@ -230,13 +230,28 @@ def capture_screenshot_on_error(func):
         try:
             func(*args, **kwargs)
         except Exception:
-            selib = BuiltIn().get_library_instance("SeleniumLibrary")
-            selib.failure_occurred()
+            safe_screenshot()
             raise
 
     return wrapper
 
 
+def safe_screenshot():
+    """Take a screenshot, but log and then ignore errors if the screenshot fails
+
+    This function should work for both selenium and browser (playwright) libraries
+    """
+
+    libs = BuiltIn().get_library_instance(all=True)
+    try:
+        if "Browser" in libs:
+            libs["Browser"].take_screenshot()
+        elif "SeleniumLibrary" in libs:
+            libs["SeleniumLibrary"].capture_page_screenshot()
+    except Exception as e:
+        BuiltIn().log(f"unable to capture screenshot: {e}")
+
+
 def get_locator_module_name(version):
     """Return module name of locator file for the specified version
 

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/tasks/metadata/metadata_map.yml

@@ -10,6 +10,10 @@ actionPlanTemplates:
     - type: ActionPlanTemplate
       class: MetadataFilenameParser
       extension: apt
+aiApplicationConfigs:
+    - type: AIApplicationConfig
+      class: MetadataFilenameParser
+      extension: aiapplicationconfig
 analyticSnapshots:
     - type: AnalyticSnapshot
       class: MetadataFilenameParser

{cumulusci-3.65.0.dev1 → cumulusci-3.66.0.dev1}/cumulusci/tasks/metadata_etl/__init__.py

@@ -8,6 +8,7 @@ from cumulusci.tasks.metadata_etl.base import (
 )
 from cumulusci.tasks.metadata_etl.duplicate_rules import SetDuplicateRuleStatus
 from cumulusci.tasks.metadata_etl.layouts import AddRelatedLists
+from cumulusci.tasks.metadata_etl.objects import SetObjectSettings
 from cumulusci.tasks.metadata_etl.permissions import AddPermissionSetPermissions
 from cumulusci.tasks.metadata_etl.value_sets import AddValueSetEntries
 from cumulusci.tasks.metadata_etl.sharing import SetOrgWideDefaults
@@ -20,6 +21,7 @@ flake8 = (
     AddRelatedLists,
     AddPermissionSetPermissions,
     AddValueSetEntries,
+    SetObjectSettings,
     SetOrgWideDefaults,
     MetadataOperation,
     SetDuplicateRuleStatus,

cumulusci-3.66.0.dev1/cumulusci/tasks/metadata_etl/objects.py

@@ -0,0 +1,68 @@
+from cumulusci.core.exceptions import TaskOptionsError
+from cumulusci.core.utils import process_list_arg
+from cumulusci.tasks.metadata_etl import MetadataSingleEntityTransformTask
+from cumulusci.utils.xml.metadata_tree import MetadataElement
+
+OBJ_SETTINGS = [
+    "Activities",
+    "BulkApi",
+    "Feeds",
+    "History",
+    "Licensing",
+    "Reports",
+    "Search",
+    "Sharing",
+    "StreamingApi",
+]
+OBJ_SETTINGS_STR = ", ".join(OBJ_SETTINGS)
+
+
+class SetObjectSettings(MetadataSingleEntityTransformTask):
+    entity = "CustomObject"
+    task_options = {
+        "enable": {
+            "description": f"Array of object settings to enable. Uses the setting name.  Available values: {OBJ_SETTINGS_STR}"
+        },
+        "disable": {
+            "description": f"Array of object settings to disable. Uses the setting name.  Available values: {OBJ_SETTINGS_STR}"
+        },
+        **MetadataSingleEntityTransformTask.task_options,
+    }
+
+    def _init_options(self, kwargs):
+        super()._init_options(kwargs)
+        if not self.options.get("enable") and not self.options.get("disable"):
+            raise TaskOptionsError(
+                "You must provide values for either 'enable' or 'disable'"
+            )
+        self.options["enable"] = self._process_settings(self.options.get("enable"))
+        self.options["disable"] = self._process_settings(self.options.get("disable"))
+
+    def _process_settings(self, settings):
+        settings = process_list_arg(settings)
+        if settings is None:
+            settings = []
+        invalid = []
+        for setting in settings:
+            if setting not in OBJ_SETTINGS:
+                invalid.append(setting)
+        if invalid:
+            invalid_settings = ", ".join(invalid)
+            raise TaskOptionsError(
+                f"Invalid settings: {invalid_settings}.  Valid settings are: {OBJ_SETTINGS_STR}"
+            )
+        return settings
+
+    def _transform_entity(self, metadata: MetadataElement, api_name: str):
+        for setting in self.options["enable"]:
+            self._apply_setting(metadata, setting, True)
+        for setting in self.options["disable"]:
+            self._apply_setting(metadata, setting, False)
+        return metadata
+
+    def _apply_setting(self, metadata: MetadataElement, setting: str, enable: bool):
+        name = f"enable{setting}"
+        elem = metadata.find(name)
+        if elem is None:
+            elem = metadata.append(name)
+        elem.text = "true" if enable else "false"