Skip to content

Commit ac6dfff

Browse files
committed
merged upstream
1 parent 37d2a89 commit ac6dfff

File tree

13 files changed

+18
-32
lines changed

13 files changed

+18
-32
lines changed

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66
.localdevserver
77
node_modules
88
coverage
9-
/.idea/codeStyles/
10-
/.idea/.gitignore
11-
/.idea/inspectionProfiles/
9+
/IlluminatedCloud/
10+
/.idea/

.gitmodules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
[submodule "submodules/fflib-apex-mocks"]
2-
path = submodules/fflib-apex-mocks
3-
url = git@github.com:Up2Go/fflib-apex-mocks.git
4-
[submodule "submodules/fflib-apex-common"]
5-
path = submodules/fflib-apex-common
6-
url = git@github.com:Up2Go/fflib-apex-common.git
71
[submodule "submodules/up2go-clean"]
82
path = submodules/up2go-clean
93
url = git@github.com:Up2Go/up2go-clean.git

.idea/illuminatedCloud.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/sfdc-ui-lookup-lwc.iml

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/project-scratch-def.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"orgName": "pozil",
3-
"edition": "Partner Developer",
3+
"edition": "Developer",
44
"language": "en_US",
55
"hasSampleData": true,
66
"settings": {
@@ -9,9 +9,6 @@
99
},
1010
"mobileSettings": {
1111
"enableS1EncryptedStoragePref2": false
12-
},
13-
"chatterSettings": {
14-
"enableChatter": true
1512
}
1613
}
1714
}

jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ module.exports = {
66
'^c/resourceIcon$':
77
'<rootDir>/submodules/up2go-clean/sfdx-source/up2go-clean/main/default/lwc/resourceIcon/resourceIcon'
88
},
9-
testMatch: ['**/__tests__/**/*.test.js']
9+
testMatch: ['<rootDir>/src/**/__tests__/**/*.test.js']
1010
};

src/main/default/lwc/lookup/__tests__/lookupEventFiring.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe('c-lookup event fires', () => {
6363
// Simulate search term input
6464
inputSearchTerm(lookupEl, SAMPLE_SEARCH_TOO_SHORT_SPECIAL);
6565

66-
// Check that search event isn't fired
66+
// Check that search event wasn't fired
6767
expect(mockSearchFn).not.toBeCalled();
6868
});
6969

src/main/default/lwc/lookup/__tests__/lookupRendering.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ describe('c-lookup rendering', () => {
226226

227227
// Query for rendered list items
228228
return Promise.resolve().then(() => {
229-
const listItemEls = lookupEl.shadowRoot.querySelectorAll('span[role=option]');
229+
const listItemEls = lookupEl.shadowRoot.querySelectorAll('div[role=option]');
230230
expect(listItemEls.length).toBe(1);
231231
expect(listItemEls[0].dataset.recordid).toBe(SAMPLE_SEARCH_ITEMS[0].id);
232232
});

0 commit comments

Comments
 (0)