Skip to content

Commit 9d01b94

Browse files
Merge branch 'main' into feature/select_records
2 parents bb72bfb + 189548e commit 9d01b94

10 files changed

Lines changed: 85 additions & 61 deletions

File tree

.github/workflows/feature_test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: SFDO-Tooling-Ubuntu
2020
steps:
2121
- name: "Checkout"
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 1
2525
- name: Set up Python 3.8
@@ -49,7 +49,7 @@ jobs:
4949
- os: macos-13
5050
python-version: 3.8
5151
steps:
52-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v4
5353
- name: Set up Python
5454
uses: actions/setup-python@v4
5555
with:
@@ -65,7 +65,7 @@ jobs:
6565
name: "Robot: No browser"
6666
runs-on: SFDO-Tooling-Ubuntu
6767
steps:
68-
- uses: actions/checkout@v2
68+
- uses: actions/checkout@v4
6969
- name: Set up Python 3.8
7070
uses: actions/setup-python@v4
7171
with:
@@ -81,9 +81,9 @@ jobs:
8181
echo $(realpath sfdx/bin) >> $GITHUB_PATH
8282
- name: Authenticate Dev Hub
8383
run: |
84-
sfdx plugins --core
84+
sf plugins --core
8585
echo $SFDX_HUB_KEY_BASE64 | base64 --decode > sfdx.key
86-
sfdx auth:jwt:grant --clientid $SFDX_CLIENT_ID --jwtkeyfile sfdx.key --username $SFDX_HUB_USERNAME --setdefaultdevhubusername -a hub
86+
sf org login jwt --client-id $SFDX_CLIENT_ID --jwt-key-file sfdx.key --username $SFDX_HUB_USERNAME --setdefaultdevhubusername -a hub
8787
env:
8888
SFDX_HUB_KEY_BASE64: ${{ secrets.SFDX_HUB_KEY_BASE64 }}
8989
SFDX_CLIENT_ID: ${{ secrets.SFDX_CLIENT_ID }}
@@ -101,7 +101,7 @@ jobs:
101101
cci org scratch_delete dev
102102
- name: Store robot results
103103
if: failure()
104-
uses: actions/upload-artifact@v1
104+
uses: actions/upload-artifact@v4
105105
with:
106106
name: robot
107107
path: robot/CumulusCI/results

.github/workflows/slow_integration_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ jobs:
8484
- name: Install sfdx
8585
run: |
8686
mkdir sfdx
87-
wget -qO- https://developer.salesforce.com/media/salesforce-cli/sfdx/channels/stable/sfdx-linux-x64.tar.xz | tar xJ -C sfdx --strip-components 1
87+
wget -qO- https://developer.salesforce.com/media/salesforce-cli/sfdx/channels/stable/sf-linux-x64.tar.xz | tar xJ -C sfdx --strip-components 1
8888
echo $(realpath sfdx/bin) >> $GITHUB_PATH
8989
- name: Initialize Browser/Playwright
9090
run: cci robot install_playwright
9191
- name: Authenticate Dev Hub
9292
run: |
9393
sfdx plugins --core
9494
echo $SFDX_HUB_KEY_BASE64 | base64 --decode > sfdx.key
95-
sfdx auth:jwt:grant --clientid $SFDX_CLIENT_ID --jwtkeyfile sfdx.key --username $SFDX_HUB_USERNAME --setdefaultdevhubusername -a hub
95+
sf org login jwt --client-id $SFDX_CLIENT_ID --jwt-key-file sfdx.key --username $SFDX_HUB_USERNAME --setdefaultdevhubusername -a hub
9696
env:
9797
SFDX_HUB_KEY_BASE64: ${{ secrets.SFDX_HUB_KEY_BASE64 }}
9898
SFDX_CLIENT_ID: ${{ secrets.SFDX_CLIENT_ID }}
@@ -110,7 +110,7 @@ jobs:
110110
cci org scratch_delete ${{ matrix.org-shape }}
111111
- name: Store robot results
112112
if: failure()
113-
uses: actions/upload-artifact@v1
113+
uses: actions/upload-artifact@v4
114114
with:
115115
name: robot
116116
path: robot/CumulusCI/results

cumulusci/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "3.91.0"
1+
__version__ = "3.92.0"

cumulusci/robotframework/form_handlers.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,12 @@ def clear(self):
160160
class LightningInputHandler(BaseFormHandler):
161161
"""An input handler for components that can be treated as an input or textarea"""
162162

163-
tags = ["lightning-input", "lightning-textarea", "lightning-datepicker"]
163+
tags = [
164+
"lightning-primitive-input-checkbox",
165+
"lightning-primitive-input-simple",
166+
"lightning-textarea",
167+
"lightning-datepicker",
168+
]
164169

165170
def set(self, value):
166171
self.focus()

cumulusci/tasks/preflight/permsets.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ def _run_task(self):
99
for result in self.sf.query_all(query)["records"]:
1010
if result["PermissionSet"]["Name"] not in self.return_values:
1111
self.return_values.append(result["PermissionSet"]["Name"])
12-
1312
if result["PermissionSetGroupId"] is not None:
1413
psg_query = f"SELECT PermissionSet.Name from PermissionSetGroupComponent where PermissionSetGroupId = '{result['PermissionSetGroupId']}'"
1514
for psg_result in self.sf.query_all(psg_query)["records"]:
16-
if psg_result["PermissionSet"]["Name"] not in self.return_values:
15+
if (
16+
psg_result["PermissionSet"]
17+
and psg_result["PermissionSet"]["Name"]
18+
not in self.return_values
19+
):
1720
self.return_values.append(psg_result["PermissionSet"]["Name"])
1821

1922
permsets_str = "\n".join(self.return_values)

cumulusci/tasks/salesforce/EnsureRecordTypes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import os
22
import re
3+
from xml.sax.saxutils import escape
34

45
from cumulusci.core.exceptions import TaskOptionsError
56
from cumulusci.core.utils import process_bool_arg
@@ -152,7 +153,7 @@ def _build_package(self):
152153
record_type_developer_name=self.options[
153154
"record_type_developer_name"
154155
],
155-
stage_name=self.options["stage_name"],
156+
stage_name=escape(self.options["stage_name"]),
156157
default=default,
157158
)
158159
business_process_link = BUSINESS_PROCESS_LINK.format(

cumulusci/tasks/salesforce/tests/test_EnsureRecordTypes.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<fullName>NPSP_Default</fullName>
1616
<isActive>true</isActive>
1717
<values>
18-
<fullName>Test</fullName>
18+
<fullName>Identify &amp; Qualify</fullName>
1919
<default>false</default>
2020
</values>
2121
</businessProcesses>
@@ -79,7 +79,7 @@
7979
"name": "StageName",
8080
"picklistValues": [
8181
{"value": "Bad", "active": False},
82-
{"value": "Test", "active": True},
82+
{"value": "Identify & Qualify", "active": True},
8383
],
8484
},
8585
],
@@ -134,7 +134,7 @@ def test_infers_correct_business_process(self):
134134

135135
assert task.options["generate_business_process"]
136136
assert task.options["generate_record_type"]
137-
assert task.options["stage_name"] == "Test"
137+
assert task.options["stage_name"] == "Identify & Qualify"
138138

139139
def test_no_business_process_where_unneeded(self):
140140
task = create_task(
@@ -178,7 +178,6 @@ def test_generates_record_type_and_business_process(self):
178178
with open(os.path.join("objects", "Opportunity.object"), "r") as f:
179179
opp_contents = f.read()
180180
assert OPPORTUNITY_METADATA == opp_contents
181-
assert OPPORTUNITY_METADATA == opp_contents
182181
with open(os.path.join("package.xml"), "r") as f:
183182
pkg_contents = f.read()
184183
assert PACKAGE_XML == pkg_contents
@@ -203,8 +202,8 @@ def test_generates_record_type_and_business_process__case(self):
203202
with temporary_dir():
204203
task._build_package()
205204
with open(os.path.join("objects", "Case.object"), "r") as f:
206-
opp_contents = f.read()
207-
assert CASE_METADATA == opp_contents
205+
case_contents = f.read()
206+
assert CASE_METADATA == case_contents
208207
with open(os.path.join("package.xml"), "r") as f:
209208
pkg_contents = f.read()
210209
assert PACKAGE_XML == pkg_contents

docs/history.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22

33
<!-- latest-start -->
44

5+
## v3.92.0 (2024-09-18)
6+
7+
<!-- Release notes generated using configuration in .github/release.yml at main -->
8+
9+
## What's Changed
10+
11+
### Changes 🎉
12+
13+
- fix: Update input handlers with new Salesforce lightning-primitive tags by [@chanyahn-st](https://github.com/chanyahn-st) in [#3822](https://github.com/SFDO-Tooling/CumulusCI/pull/3822)
14+
15+
## New Contributors
16+
17+
- @chanyahn-st made their first contribution in [#3822](https://github.com/SFDO-Tooling/CumulusCI/pull/3822)
18+
19+
**Full Changelog**: https://github.com/SFDO-Tooling/CumulusCI/compare/v3.91.0...v3.92.0
20+
21+
<!-- latest-stop -->
22+
523
## v3.91.0 (2024-08-22)
624

725
<!-- Release notes generated using configuration in .github/release.yml at main -->
@@ -14,8 +32,6 @@
1432

1533
**Full Changelog**: https://github.com/SFDO-Tooling/CumulusCI/compare/v3.90.1...v3.91.0
1634

17-
<!-- latest-stop -->
18-
1935
## v3.90.1 (2024-08-20)
2036

2137
<!-- Release notes generated using configuration in .github/release.yml at main -->

0 commit comments

Comments
 (0)