Skip to content

Commit 99072a8

Browse files
gaganpsandhugaganpsandhu
authored
Merge pull request #47 from SalesforceFoundation/feature/232
232 Major Release / Summer '21 🌞 ⛵ 🌊
2 parents 88592b9 + dc98881 commit 99072a8

10 files changed

Lines changed: 98 additions & 84 deletions

File tree

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Outbound Funds Module NPSP
2+
3+
## Latest Release
4+
5+
Summer '21 🌞 ⛵ 🌊

‎cumulusci.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project:
88
- github: "https://github.com/SalesforceFoundation/NPSP"
99
- github: "https://github.com/SalesforceFoundation/OutboundFundsModule"
1010
dependency_resolutions:
11-
preproduction: include_beta
11+
preproduction: commit_status
1212
git:
1313
repo_url: "https://github.com/SalesforceFoundation/OutboundFundsModuleNPSP"
1414
source_format: sfdx
@@ -106,3 +106,11 @@ flows:
106106
flow: config_managed
107107
3:
108108
task: snapshot_changes
109+
110+
ci_beta:
111+
steps:
112+
1:
113+
flow: dependencies
114+
options:
115+
update_dependencies:
116+
resolution_strategy: include_beta

‎force-app/main/default/lwc/gauExpenditureRow/gauExpenditureRow.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.custom-percent-style {
2-
padding-top: 0.25rem;
3-
padding-left: 0.25rem;
2+
padding-top: 0.25rem;
3+
padding-left: 0.25rem;
44
}
55

66
.slds-form-element__label {
7-
display: none;
7+
display: none;
88
}

‎force-app/main/default/lwc/lookup/lookup.css‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
.slds-combobox__input,
22
.slds-combobox_container {
3-
transition: border 0.1s linear, box-shadow 0.1 linear;
3+
transition: border 0.1s linear, box-shadow 0.1 linear;
44
}
55

66
.slds-combobox__input {
7-
box-shadow: none;
7+
box-shadow: none;
88
}
99

1010
.slds-combobox__input.has-custom-border {
11-
box-shadow: 0 0 0 2px #fff inset, 0 0 0 3px rgb(221, 219, 218) inset;
11+
box-shadow: 0 0 0 2px #fff inset, 0 0 0 3px rgb(221, 219, 218) inset;
1212
}
1313

1414
.slds-combobox__input.has-custom-error {
15-
border: 1px solid rgb(194, 57, 52);
16-
box-shadow: rgb(194, 57, 52) 0 0 0 1px inset;
15+
border: 1px solid rgb(194, 57, 52);
16+
box-shadow: rgb(194, 57, 52) 0 0 0 1px inset;
1717
}
1818

1919
.slds-combobox_container.has-custom-error {
20-
border: none !important;
20+
border: none !important;
2121
}
2222

2323
.slds-combobox__input.has-custom-height {
24-
height: 32px !important;
24+
height: 32px !important;
2525
}
2626

2727
.form-error {
28-
color: rgb(194, 57, 52);
29-
display: block;
28+
color: rgb(194, 57, 52);
29+
display: block;
3030
}
3131

3232
.truncate {
33-
white-space: nowrap;
34-
overflow: hidden;
35-
text-overflow: ellipsis;
33+
white-space: nowrap;
34+
overflow: hidden;
35+
text-overflow: ellipsis;
3636
}
3737

3838
label {
39-
display: none;
39+
display: none;
4040
}

‎force-app/main/default/lwc/manageExpenditures/manageExpenditures.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.VALID {
2-
color: black;
2+
color: black;
33
}
44

55
.INVALID {
6-
color: red;
6+
color: red;
77
}

‎robot/OutboundFundsNPSP/resources/OutboundFundsNPSP.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
from BaseObjects import BaseOutboundFundsNPSPPage
77
from robot.libraries.BuiltIn import RobotNotRunningError
8+
from locators_52 import outboundfundsnpsp_lex_locators as locators_52
89
from locators_51 import outboundfundsnpsp_lex_locators as locators_51
9-
from locators_50 import outboundfundsnpsp_lex_locators as locators_50
1010
from cumulusci.robotframework.utils import selenium_retry, capture_screenshot_on_error
1111

1212
locators_by_api_version = {
13-
50.0: locators_50, # winter '21
1413
51.0: locators_51, # Spring '21
14+
52.0: locators_52, # Summer '21
1515
}
1616
# will get populated in _init_locators
1717
outboundfundsnpsp_lex_locators = {}

‎robot/OutboundFundsNPSP/resources/layouts/applications/outfunds__Outbound_Funds.app-meta.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<tabs>outfunds__Funding_Program__c</tabs>
3838
<tabs>outfunds__Funding_Request__c</tabs>
3939
<tabs>outfunds__Requirement__c</tabs>
40+
<tabs>outfunds__Review__c</tabs>
4041
<tabs>standard-report</tabs>
4142
<tabs>standard-Dashboard</tabs>
4243
<uiType>Lightning</uiType>

‎robot/OutboundFundsNPSP/resources/locators_50.py‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎robot/OutboundFundsNPSP/resources/locators_51.py‎

Lines changed: 6 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,6 @@
1-
# Spring '21 locators
2-
outboundfundsnpsp_lex_locators = {
3-
"app_launcher": {
4-
"view_all_button": "//button[text()='View All']",
5-
"app_link": "//p[contains(@title,'{}')]",
6-
"app_link_search_result": "//mark[contains(text(),'{}')]",
7-
"search_input": "//input[contains(@placeholder,'Search apps or items...')]",
8-
},
9-
"new_record": {
10-
"label": "//label[text()='{}']",
11-
"title": "//h2[contains(@class, 'inlineTitle') and text()='{}']",
12-
"field_label": "//div[./*/*[text()='{}']]",
13-
"edit_title": "//h2[contains(@class, 'title') and text()='{}']",
14-
"list": "//div[contains(@class,'forcePageBlockSectionRow')]/div[contains(@class,'forcePageBlockItem')]/div[contains(@class,'slds-hint-parent')]/div[@class='slds-form-element__control']/div[.//span[text()='{}']][//div[contains(@class,'uiMenu')]//a[@class='select']]",
15-
"text_field": "//div[contains(@class, 'uiInput')][.//label[contains(@class, 'uiLabel')][.//span[text()='{}']]]//*[self::input or self::textarea]",
16-
"dropdown_field": "//lightning-combobox[./label[text()='{}']]/div//input[contains(@class,'combobox__input')]",
17-
"dropdown_popup": "//div[contains(@class, 'slds-dropdown-trigger')]/div[contains(@class, 'slds-listbox')]",
18-
"dropdown_value": "//div[contains(@class,'slds-listbox')]//lightning-base-combobox-item//span[text()='{}']",
19-
"dd_selection": "//lightning-base-combobox-item[@data-value='{}']",
20-
"button": "//button[contains(@class, 'slds-button') and text()='{}']",
21-
"lookup_field": "//div[contains(@class, 'autocompleteWrapper')]//input[@title='{}']",
22-
"lightning_lookup": "//label[text()='{}']/following-sibling::div//input",
23-
"lookup_value": "//div[contains(@class, 'listContent')]//div[contains(@class, 'slds-truncate') and @title='{}']",
24-
"checkbox": "//div[contains(@class,'uiInputCheckbox')]/label/span[text()='{}']/../following-sibling::input[@type='checkbox']",
25-
"field_input": '//label[text()="{}"]/following-sibling::div//*[self::input or self::textarea]',
26-
"date_field": "//div[contains(@class,'slds-dropdown-trigger')][./label[text()='{}']]/div/input",
27-
"select_date": "//div[contains(@class,'uiDatePickerGrid')]/table[@class='calGrid']//*[text()='{}']",
28-
"text-field": "//label/span[text()='{}']/../following-sibling::input",
29-
"footer_button": "//lightning-button//button[text()='{}']",
30-
},
31-
"confirm": {
32-
"check_value": "//div[contains(@class, 'forcePageBlockItem') or contains(@class, 'slds-form-element_stacked')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]//*[text()='{}']",
33-
"check_status": "//div[contains(@class, 'field-label-container')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]/span//lightning-formatted-text[text()='{}']",
34-
"check_numbers": "//div[contains(@class, 'field-label-container')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]/span//lightning-formatted-number[text()='{}']",
35-
},
36-
"tab": {
37-
"tab_header": "//a[@class='slds-tabs_default__link' and text()='{}']",
38-
"record_detail_tab": "//a[contains(@data-label,'{}')]",
39-
"verify_header": "//div[contains(@class, 'entityNameTitle')]",
40-
"verify_details": "//div[contains(@class, 'slds-form-element')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]/span",
41-
},
42-
"related": {
43-
"title": '//div[contains(@class, "slds-card")]/header[.//span[@title="{}"]]',
44-
"button": "//div[contains(@class, 'forceRelatedListSingleContainer')][.//img][.//span[@title='{}']]//a[@title='{}']",
45-
"count": "//tbody/tr/td[1]",
46-
"flexi_button": "//div[@lst-listviewmanagerheader_listviewmanagerheader][.//span[@title='{}']]//lightning-button//button[text()='{}']",
47-
"flexi_link": "//a//span[contains(text(),'{}')]",
48-
},
49-
"details": {
50-
"button": "//button[contains(@class, 'slds-button') and text() = '{}']",
51-
"header": "//h1//div[contains(@class, 'entityNameTitle') and contains(text(),'{}')]",
52-
},
53-
"link": "//a[contains(text(),'{}')]",
54-
"id": "//input[@type='text' and @inputmode='decimal' and @step='0.01']",
55-
"button-with-text": "//button[contains(text(),'{}')]",
56-
"error_locator": "//div[@class='INVALID']//lightning-formatted-number[contains(text(),'-')]",
57-
}
1+
""" Locators for Spring '21 """
2+
3+
from locators_52 import outboundfundsnpsp_lex_locators
4+
import copy
5+
6+
outboundfundsnpsp_lex_locators = copy.deepcopy(outboundfundsnpsp_lex_locators)

‎robot/OutboundFundsNPSP/resources/locators_52.py‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Summer '21 locators
2+
outboundfundsnpsp_lex_locators = {
3+
"app_launcher": {
4+
"view_all_button": "//button[text()='View All']",
5+
"app_link": "//p[contains(@title,'{}')]",
6+
"app_link_search_result": "//mark[contains(text(),'{}')]",
7+
"search_input": "//input[contains(@placeholder,'Search apps or items...')]",
8+
},
9+
"new_record": {
10+
"label": "//label[text()='{}']",
11+
"title": "//h2[contains(@class, 'inlineTitle') and text()='{}']",
12+
"field_label": "//div[./*/*[text()='{}']]",
13+
"edit_title": "//h2[contains(@class, 'title') and text()='{}']",
14+
"list": "//div[contains(@class,'forcePageBlockSectionRow')]/div[contains(@class,'forcePageBlockItem')]/div[contains(@class,'slds-hint-parent')]/div[@class='slds-form-element__control']/div[.//span[text()='{}']][//div[contains(@class,'uiMenu')]//a[@class='select']]",
15+
"text_field": "//div[contains(@class, 'uiInput')][.//label[contains(@class, 'uiLabel')][.//span[text()='{}']]]//*[self::input or self::textarea]",
16+
"dropdown_field": "//lightning-combobox[./label[text()='{}']]/div//input[contains(@class,'combobox__input')]",
17+
"dropdown_popup": "//div[contains(@class, 'slds-dropdown-trigger')]/div[contains(@class, 'slds-listbox')]",
18+
"dropdown_value": "//div[contains(@class,'slds-listbox')]//lightning-base-combobox-item//span[text()='{}']",
19+
"dd_selection": "//lightning-base-combobox-item[@data-value='{}']",
20+
"button": "//button[contains(@class, 'slds-button') and text()='{}']",
21+
"lookup_field": "//div[contains(@class, 'autocompleteWrapper')]//input[@title='{}']",
22+
"lightning_lookup": "//label[text()='{}']/following-sibling::div//input",
23+
"lookup_value": "//div[contains(@class, 'listContent')]//div[contains(@class, 'slds-truncate') and @title='{}']",
24+
"checkbox": "//div[contains(@class,'uiInputCheckbox')]/label/span[text()='{}']/../following-sibling::input[@type='checkbox']",
25+
"field_input": '//label[text()="{}"]/following-sibling::div//*[self::input or self::textarea]',
26+
"date_field": "//div[contains(@class,'slds-dropdown-trigger')][./label[text()='{}']]/div/input",
27+
"select_date": "//div[contains(@class,'uiDatePickerGrid')]/table[@class='calGrid']//*[text()='{}']",
28+
"text-field": "//label/span[text()='{}']/../following-sibling::input",
29+
"footer_button": "//lightning-button//button[text()='{}']",
30+
},
31+
"confirm": {
32+
"check_value": "//div[contains(@class, 'forcePageBlockItem') or contains(@class, 'slds-form-element_stacked')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]//*[text()='{}']",
33+
"check_status": "//div[contains(@class, 'field-label-container')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]/span//lightning-formatted-text[text()='{}']",
34+
"check_numbers": "//div[contains(@class, 'field-label-container')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]/span//lightning-formatted-number[text()='{}']",
35+
},
36+
"tab": {
37+
"tab_header": "//a[@class='slds-tabs_default__link' and text()='{}']",
38+
"record_detail_tab": "//a[contains(@data-label,'{}')]",
39+
"verify_header": "//div[contains(@class, 'entityNameTitle')]",
40+
"verify_details": "//div[contains(@class, 'slds-form-element')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]/span",
41+
},
42+
"related": {
43+
"title": '//div[contains(@class, "slds-card")]/header[.//span[@title="{}"]]',
44+
"button": "//div[contains(@class, 'forceRelatedListSingleContainer')][.//img][.//span[@title='{}']]//a[@title='{}']",
45+
"count": "//tbody/tr/td[1]",
46+
"flexi_button": "//div[@lst-listviewmanagerheader_listviewmanagerheader][.//span[@title='{}']]//lightning-button//button[text()='{}']",
47+
"flexi_link": "//a//span[contains(text(),'{}')]",
48+
},
49+
"details": {
50+
"button": "//button[contains(@class, 'slds-button') and text() = '{}']",
51+
"header": "//h1//div[contains(@class, 'entityNameTitle') and contains(text(),'{}')]",
52+
},
53+
"link": "//a[contains(text(),'{}')]",
54+
"id": "//input[@type='text' and @inputmode='decimal' and @step='0.01']",
55+
"button-with-text": "//button[contains(text(),'{}')]",
56+
"error_locator": "//div[@class='INVALID']//lightning-formatted-number[contains(text(),'-')]",
57+
}

0 commit comments

Comments
 (0)