Skip to content

Commit

Permalink
Merge pull request #47 from SalesforceFoundation/feature/232
Browse files Browse the repository at this point in the history
232 Major Release / Summer '21 🌞 β›΅ 🌊
  • Loading branch information
gaganpsandhu authored Jul 15, 2021
2 parents 88592b9 + dc98881 commit 99072a8
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 84 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Outbound Funds Module NPSP

## Latest Release

Summer '21 🌞 β›΅ 🌊
10 changes: 9 additions & 1 deletion cumulusci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project:
- github: "https://github.com/SalesforceFoundation/NPSP"
- github: "https://github.com/SalesforceFoundation/OutboundFundsModule"
dependency_resolutions:
preproduction: include_beta
preproduction: commit_status
git:
repo_url: "https://github.com/SalesforceFoundation/OutboundFundsModuleNPSP"
source_format: sfdx
Expand Down Expand Up @@ -106,3 +106,11 @@ flows:
flow: config_managed
3:
task: snapshot_changes

ci_beta:
steps:
1:
flow: dependencies
options:
update_dependencies:
resolution_strategy: include_beta
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.custom-percent-style {
padding-top: 0.25rem;
padding-left: 0.25rem;
padding-top: 0.25rem;
padding-left: 0.25rem;
}

.slds-form-element__label {
display: none;
display: none;
}
26 changes: 13 additions & 13 deletions force-app/main/default/lwc/lookup/lookup.css
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
.slds-combobox__input,
.slds-combobox_container {
transition: border 0.1s linear, box-shadow 0.1 linear;
transition: border 0.1s linear, box-shadow 0.1 linear;
}

.slds-combobox__input {
box-shadow: none;
box-shadow: none;
}

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

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

.slds-combobox_container.has-custom-error {
border: none !important;
border: none !important;
}

.slds-combobox__input.has-custom-height {
height: 32px !important;
height: 32px !important;
}

.form-error {
color: rgb(194, 57, 52);
display: block;
color: rgb(194, 57, 52);
display: block;
}

.truncate {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

label {
display: none;
display: none;
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.VALID {
color: black;
color: black;
}

.INVALID {
color: red;
color: red;
}
4 changes: 2 additions & 2 deletions robot/OutboundFundsNPSP/resources/OutboundFundsNPSP.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

from BaseObjects import BaseOutboundFundsNPSPPage
from robot.libraries.BuiltIn import RobotNotRunningError
from locators_52 import outboundfundsnpsp_lex_locators as locators_52
from locators_51 import outboundfundsnpsp_lex_locators as locators_51
from locators_50 import outboundfundsnpsp_lex_locators as locators_50
from cumulusci.robotframework.utils import selenium_retry, capture_screenshot_on_error

locators_by_api_version = {
50.0: locators_50, # winter '21
51.0: locators_51, # Spring '21
52.0: locators_52, # Summer '21
}
# will get populated in _init_locators
outboundfundsnpsp_lex_locators = {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<tabs>outfunds__Funding_Program__c</tabs>
<tabs>outfunds__Funding_Request__c</tabs>
<tabs>outfunds__Requirement__c</tabs>
<tabs>outfunds__Review__c</tabs>
<tabs>standard-report</tabs>
<tabs>standard-Dashboard</tabs>
<uiType>Lightning</uiType>
Expand Down
6 changes: 0 additions & 6 deletions robot/OutboundFundsNPSP/resources/locators_50.py

This file was deleted.

63 changes: 6 additions & 57 deletions robot/OutboundFundsNPSP/resources/locators_51.py
Original file line number Diff line number Diff line change
@@ -1,57 +1,6 @@
# Spring '21 locators
outboundfundsnpsp_lex_locators = {
"app_launcher": {
"view_all_button": "//button[text()='View All']",
"app_link": "//p[contains(@title,'{}')]",
"app_link_search_result": "//mark[contains(text(),'{}')]",
"search_input": "//input[contains(@placeholder,'Search apps or items...')]",
},
"new_record": {
"label": "//label[text()='{}']",
"title": "//h2[contains(@class, 'inlineTitle') and text()='{}']",
"field_label": "//div[./*/*[text()='{}']]",
"edit_title": "//h2[contains(@class, 'title') and text()='{}']",
"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']]",
"text_field": "//div[contains(@class, 'uiInput')][.//label[contains(@class, 'uiLabel')][.//span[text()='{}']]]//*[self::input or self::textarea]",
"dropdown_field": "//lightning-combobox[./label[text()='{}']]/div//input[contains(@class,'combobox__input')]",
"dropdown_popup": "//div[contains(@class, 'slds-dropdown-trigger')]/div[contains(@class, 'slds-listbox')]",
"dropdown_value": "//div[contains(@class,'slds-listbox')]//lightning-base-combobox-item//span[text()='{}']",
"dd_selection": "//lightning-base-combobox-item[@data-value='{}']",
"button": "//button[contains(@class, 'slds-button') and text()='{}']",
"lookup_field": "//div[contains(@class, 'autocompleteWrapper')]//input[@title='{}']",
"lightning_lookup": "//label[text()='{}']/following-sibling::div//input",
"lookup_value": "//div[contains(@class, 'listContent')]//div[contains(@class, 'slds-truncate') and @title='{}']",
"checkbox": "//div[contains(@class,'uiInputCheckbox')]/label/span[text()='{}']/../following-sibling::input[@type='checkbox']",
"field_input": '//label[text()="{}"]/following-sibling::div//*[self::input or self::textarea]',
"date_field": "//div[contains(@class,'slds-dropdown-trigger')][./label[text()='{}']]/div/input",
"select_date": "//div[contains(@class,'uiDatePickerGrid')]/table[@class='calGrid']//*[text()='{}']",
"text-field": "//label/span[text()='{}']/../following-sibling::input",
"footer_button": "//lightning-button//button[text()='{}']",
},
"confirm": {
"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()='{}']",
"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()='{}']",
"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()='{}']",
},
"tab": {
"tab_header": "//a[@class='slds-tabs_default__link' and text()='{}']",
"record_detail_tab": "//a[contains(@data-label,'{}')]",
"verify_header": "//div[contains(@class, 'entityNameTitle')]",
"verify_details": "//div[contains(@class, 'slds-form-element')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]/span",
},
"related": {
"title": '//div[contains(@class, "slds-card")]/header[.//span[@title="{}"]]',
"button": "//div[contains(@class, 'forceRelatedListSingleContainer')][.//img][.//span[@title='{}']]//a[@title='{}']",
"count": "//tbody/tr/td[1]",
"flexi_button": "//div[@lst-listviewmanagerheader_listviewmanagerheader][.//span[@title='{}']]//lightning-button//button[text()='{}']",
"flexi_link": "//a//span[contains(text(),'{}')]",
},
"details": {
"button": "//button[contains(@class, 'slds-button') and text() = '{}']",
"header": "//h1//div[contains(@class, 'entityNameTitle') and contains(text(),'{}')]",
},
"link": "//a[contains(text(),'{}')]",
"id": "//input[@type='text' and @inputmode='decimal' and @step='0.01']",
"button-with-text": "//button[contains(text(),'{}')]",
"error_locator": "//div[@class='INVALID']//lightning-formatted-number[contains(text(),'-')]",
}
""" Locators for Spring '21 """

from locators_52 import outboundfundsnpsp_lex_locators
import copy

outboundfundsnpsp_lex_locators = copy.deepcopy(outboundfundsnpsp_lex_locators)
57 changes: 57 additions & 0 deletions robot/OutboundFundsNPSP/resources/locators_52.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# Summer '21 locators
outboundfundsnpsp_lex_locators = {
"app_launcher": {
"view_all_button": "//button[text()='View All']",
"app_link": "//p[contains(@title,'{}')]",
"app_link_search_result": "//mark[contains(text(),'{}')]",
"search_input": "//input[contains(@placeholder,'Search apps or items...')]",
},
"new_record": {
"label": "//label[text()='{}']",
"title": "//h2[contains(@class, 'inlineTitle') and text()='{}']",
"field_label": "//div[./*/*[text()='{}']]",
"edit_title": "//h2[contains(@class, 'title') and text()='{}']",
"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']]",
"text_field": "//div[contains(@class, 'uiInput')][.//label[contains(@class, 'uiLabel')][.//span[text()='{}']]]//*[self::input or self::textarea]",
"dropdown_field": "//lightning-combobox[./label[text()='{}']]/div//input[contains(@class,'combobox__input')]",
"dropdown_popup": "//div[contains(@class, 'slds-dropdown-trigger')]/div[contains(@class, 'slds-listbox')]",
"dropdown_value": "//div[contains(@class,'slds-listbox')]//lightning-base-combobox-item//span[text()='{}']",
"dd_selection": "//lightning-base-combobox-item[@data-value='{}']",
"button": "//button[contains(@class, 'slds-button') and text()='{}']",
"lookup_field": "//div[contains(@class, 'autocompleteWrapper')]//input[@title='{}']",
"lightning_lookup": "//label[text()='{}']/following-sibling::div//input",
"lookup_value": "//div[contains(@class, 'listContent')]//div[contains(@class, 'slds-truncate') and @title='{}']",
"checkbox": "//div[contains(@class,'uiInputCheckbox')]/label/span[text()='{}']/../following-sibling::input[@type='checkbox']",
"field_input": '//label[text()="{}"]/following-sibling::div//*[self::input or self::textarea]',
"date_field": "//div[contains(@class,'slds-dropdown-trigger')][./label[text()='{}']]/div/input",
"select_date": "//div[contains(@class,'uiDatePickerGrid')]/table[@class='calGrid']//*[text()='{}']",
"text-field": "//label/span[text()='{}']/../following-sibling::input",
"footer_button": "//lightning-button//button[text()='{}']",
},
"confirm": {
"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()='{}']",
"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()='{}']",
"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()='{}']",
},
"tab": {
"tab_header": "//a[@class='slds-tabs_default__link' and text()='{}']",
"record_detail_tab": "//a[contains(@data-label,'{}')]",
"verify_header": "//div[contains(@class, 'entityNameTitle')]",
"verify_details": "//div[contains(@class, 'slds-form-element')][.//span[text()='{}']]//following-sibling::div[.//span[contains(@class, 'test-id__field-value')]]/span",
},
"related": {
"title": '//div[contains(@class, "slds-card")]/header[.//span[@title="{}"]]',
"button": "//div[contains(@class, 'forceRelatedListSingleContainer')][.//img][.//span[@title='{}']]//a[@title='{}']",
"count": "//tbody/tr/td[1]",
"flexi_button": "//div[@lst-listviewmanagerheader_listviewmanagerheader][.//span[@title='{}']]//lightning-button//button[text()='{}']",
"flexi_link": "//a//span[contains(text(),'{}')]",
},
"details": {
"button": "//button[contains(@class, 'slds-button') and text() = '{}']",
"header": "//h1//div[contains(@class, 'entityNameTitle') and contains(text(),'{}')]",
},
"link": "//a[contains(text(),'{}')]",
"id": "//input[@type='text' and @inputmode='decimal' and @step='0.01']",
"button-with-text": "//button[contains(text(),'{}')]",
"error_locator": "//div[@class='INVALID']//lightning-formatted-number[contains(text(),'-')]",
}

0 comments on commit 99072a8

Please sign in to comment.