Skip to content

Commit 0a1d3a1

Browse files
Add missing test dam asset of fileinput v4 (#1683)
* Add missing test dam asset of fileinput v4 * @fix datepicker runtime test fix * Fixing test * Fixing test --------- Co-authored-by: Rishi Mehta <rismehta@adobe.com>
1 parent d007faa commit 0a1d3a1

File tree

4 files changed

+41
-8
lines changed

4 files changed

+41
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
3+
jcr:mixinTypes="[rep:AccessControllable]"
4+
jcr:primaryType="sling:Folder"
5+
lcFolder="{Long}0"
6+
type="lcFolder"
7+
/>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
3+
jcr:primaryType="dam:Asset">
4+
<jcr:content
5+
jcr:lastModified="{Date}2023-01-25T17:24:29.344+05:30"
6+
jcr:primaryType="dam:AssetContent"
7+
sling:resourceType="fd/fm/af/render"
8+
guide="1"
9+
type="guide">
10+
<metadata
11+
fd:version="2.1"
12+
jcr:primaryType="nt:unstructured"
13+
allowedRenderFormat="HTML"
14+
author="admin"
15+
availableInMobileApp="{Boolean}false"
16+
dorTemplateChanged="Boolean"
17+
dorType="none"
18+
formmodel="none"
19+
hasCustomThumbnail="{Boolean}false"
20+
themeRef="/libs/fd/af/themes/canvas"
21+
title="Adaptive Form V4 (IT)"/>
22+
</jcr:content>
23+
</jcr:root>

it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
jcr:lastModifiedBy="admin"
3030
jcr:primaryType="nt:unstructured"
3131
jcr:title="File Input - 1"
32-
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
32+
sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
3333
accept="[audio/*, video/*, image/*, text/*, application/pdf]"
3434
buttonText="Attach Files"
3535
enabled="{Boolean}true"
@@ -43,15 +43,15 @@
4343
<fileinput2
4444
jcr:primaryType="nt:unstructured"
4545
jcr:title="File Input - 2"
46-
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
46+
sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
4747
accept="[audio/*, video/*, image/*, text/*, application/pdf]"
4848
fieldType="file-input"
4949
name="fileinput2"
5050
type="file"/>
5151
<fileinput3
5252
jcr:primaryType="nt:unstructured"
5353
jcr:title="File Input - 3"
54-
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
54+
sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
5555
accept="[application/pdf]"
5656
description="This is long description"
5757
fieldType="file-input"
@@ -63,7 +63,7 @@
6363
<fileinput4
6464
jcr:primaryType="nt:unstructured"
6565
jcr:title="File Input - 4"
66-
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
66+
sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
6767
accept="[application/x-msdownload,application/vnd.ms-outlook,application/pdf]"
6868
description="This is long description"
6969
fieldType="file-input"
@@ -77,7 +77,7 @@
7777
jcr:lastModifiedBy="admin"
7878
jcr:primaryType="nt:unstructured"
7979
jcr:title="File Input - 5"
80-
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
80+
sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
8181
accept="[audio/*, video/*, image/*, text/*, application/pdf]"
8282
buttonText="Attach Files"
8383
enabled="{Boolean}true"
@@ -91,7 +91,7 @@
9191
<fileinput6
9292
jcr:primaryType="nt:unstructured"
9393
jcr:title="File Input - 6"
94-
sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
94+
sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
9595
accept="[audio/*, video/*, image/*, text/*, application/pdf]"
9696
buttonText="Attach Files"
9797
enabled="{Boolean}true"

ui.tests/test-module/specs/datepicker/datepicker.runtime.cy.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,9 @@ describe("Form Runtime with Date Picker", () => {
415415

416416
cy.get(`#${datePicker7}`).find("input").should("have.attr", "type", "text"); // Custom format uses text input
417417
cy.get(`#${datePicker7}`).find(".cmp-adaptiveform-datepicker__calendar-icon").should("have.attr", "tabindex", "0");
418-
cy.get(`#${datePicker7}`).find("input").focus().tab();
418+
419+
// Test that calendar icon can be focused and activated
420+
cy.get(`#${datePicker7}`).find(".cmp-adaptiveform-datepicker__calendar-icon").focus();
419421
cy.focused().should("have.class", "cmp-adaptiveform-datepicker__calendar-icon");
420422
cy.focused().type("{enter}");
421423
cy.get(".datetimepicker").should("be.visible");
@@ -442,6 +444,7 @@ describe("Form Runtime with Date Picker", () => {
442444
cy.get(`#${datePicker7}`).find(".cmp-adaptiveform-datepicker__calendar-icon").focus().type("{enter}");
443445
cy.get(".datetimepicker").should("be.visible");
444446
cy.get("body").type("{esc}");
447+
});
445448

446449
// Mobile Touch Functionality Tests
447450
describe("Mobile Touch Functionality", () => {
@@ -510,4 +513,4 @@ describe("Form Runtime with Date Picker", () => {
510513
})
511514
});
512515
});
513-
})
516+
});

0 commit comments

Comments
 (0)