Skip to content

Commit dc8e702

Browse files
Jinjiu96bso-odoo
Jinjiu96
authored and
bso-odoo
committed
clean carousel related tests, remove repeated ones and merge/rename files
1 parent 48edd7d commit dc8e702

File tree

5 files changed

+57
-214
lines changed

5 files changed

+57
-214
lines changed

‎addons/website/static/tests/interactions/carousel/carousel_section_slider.edit.test.js‎ renamed to ‎addons/website/static/tests/interactions/carousel/carousel.edit.test.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
import {
2-
startInteractions,
3-
setupInteractionWhiteList,
4-
} from "@web/../tests/public/helpers";
5-
1+
import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
62
import { describe, expect, test } from "@odoo/hoot";
7-
83
import { switchToEditMode } from "../../helpers";
94
import { queryAll } from "@odoo/hoot-dom";
105

116
setupInteractionWhiteList("website.carousel_edit");
127

138
describe.current.tags("interaction_dev");
149

15-
test("carousel_section_slider resets slide to attributes", async () => {
16-
const { core } = await startInteractions(`
10+
test("[EDIT] carousel_edit resets slide to attributes", async () => {
11+
const { core } = await startInteractions(
12+
`
1713
<section>
1814
<div id="slideshow_sample" class="carousel carousel-dark slide" data-bs-ride="ride" data-bs-interval="0">
1915
<div class="carousel-inner">
@@ -44,7 +40,9 @@ test("carousel_section_slider resets slide to attributes", async () => {
4440
</div>
4541
</div>
4642
</section>
47-
`, { waitForStart: true, editMode: true });
43+
`,
44+
{ waitForStart: true, editMode: true }
45+
);
4846
await switchToEditMode(core);
4947

5048
expect(core.interactions).toHaveLength(1);

‎addons/website/static/tests/interactions/carousel/carousel_bootstrap_upgrade_fix.edit.test.js‎

Lines changed: 50 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,68 @@
1-
import {
2-
startInteractions,
3-
setupInteractionWhiteList,
4-
} from "@web/../tests/public/helpers";
5-
1+
import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
62
import { describe, expect, test } from "@odoo/hoot";
7-
import { queryOne } from "@odoo/hoot-dom";
8-
3+
import { click, queryOne } from "@odoo/hoot-dom";
4+
import { advanceTime } from "@odoo/hoot-mock";
95
import { switchToEditMode } from "../../helpers";
106

117
setupInteractionWhiteList("website.carousel_bootstrap_upgrade_fix");
128

139
describe.current.tags("interaction_dev");
1410

15-
test("[EDIT] carousel_bootstrap_upgrade_fix prevents ride", async () => {
16-
const { core } = await startInteractions(`
17-
<section class="s_image_gallery o_slideshow pt24 pb24 s_image_gallery_controllers_outside s_image_gallery_controllers_outside_arrows_right s_image_gallery_indicators_dots s_image_gallery_arrows_default" data-snippet="s_image_gallery" data-vcss="002" data-columns="3">
18-
<div class="o_container_small overflow-hidden">
19-
<div id="slideshow_sample" class="carousel carousel-dark slide" data-bs-interval="5000">
20-
<div class="carousel-inner">
21-
<div class="carousel-item active">
22-
<img class="img img-fluid d-block mh-100 mw-100 mx-auto rounded object-fit-cover" src="/web/image/website.library_image_08" data-name="Image" data-index="0" alt=""/>
23-
</div>
24-
<div class="carousel-item">
25-
<img class="img img-fluid d-block mh-100 mw-100 mx-auto rounded object-fit-cover" src="/web/image/website.library_image_03" data-name="Image" data-index="1" alt=""/>
26-
</div>
27-
<div class="carousel-item">
28-
<img class="img img-fluid d-block mh-100 mw-100 mx-auto rounded object-fit-cover" src="/web/image/website.library_image_02" data-name="Image" data-index="2" alt=""/>
29-
</div>
11+
const imageGalleryCarouselStyleSnippet = `
12+
<section class="s_image_gallery o_slideshow pt24 pb24 s_image_gallery_controllers_outside s_image_gallery_controllers_outside_arrows_right s_image_gallery_indicators_dots s_image_gallery_arrows_default" data-snippet="s_image_gallery" data-vcss="002" data-columns="3">
13+
<div class="o_container_small overflow-hidden">
14+
<div id="slideshow_sample" class="carousel carousel-dark slide" data-bs-interval="5000">
15+
<div class="carousel-inner">
16+
<div class="carousel-item active">
17+
<img class="img img-fluid d-block mh-100 mw-100 mx-auto rounded object-fit-cover" src="/web/image/website.library_image_08" data-name="Image" data-index="0" alt=""/>
18+
</div>
19+
<div class="carousel-item">
20+
<img class="img img-fluid d-block mh-100 mw-100 mx-auto rounded object-fit-cover" src="/web/image/website.library_image_03" data-name="Image" data-index="1" alt=""/>
3021
</div>
31-
<div class="o_carousel_controllers">
32-
<button class="carousel-control-prev o_not_editable" contenteditable="false" data-bs-target="#slideshow_sample" data-bs-slide="prev" aria-label="Previous" title="Previous">
33-
<span class="carousel-control-prev-icon" aria-hidden="true"/>
34-
<span class="visually-hidden">Previous</span>
35-
</button>
36-
<div class="carousel-indicators">
37-
<button type="button" data-bs-target="#slideshow_sample" data-bs-slide-to="0" style="background-image: url(/web/image/website.library_image_08)" class="active" aria-label="Carousel indicator"/>
38-
<button type="button" style="background-image: url(/web/image/website.library_image_03)" data-bs-target="#slideshow_sample" data-bs-slide-to="1" aria-label="Carousel indicator"/>
39-
<button type="button" style="background-image: url(/web/image/website.library_image_02)" data-bs-target="#slideshow_sample" data-bs-slide-to="2" aria-label="Carousel indicator"/>
40-
</div>
41-
<button class="carousel-control-next o_not_editable" contenteditable="false" data-bs-target="#slideshow_sample" data-bs-slide="next" aria-label="Next" title="Next">
42-
<span class="carousel-control-next-icon" aria-hidden="true"/>
43-
<span class="visually-hidden">Next</span>
44-
</button>
22+
<div class="carousel-item">
23+
<img class="img img-fluid d-block mh-100 mw-100 mx-auto rounded object-fit-cover" src="/web/image/website.library_image_02" data-name="Image" data-index="2" alt=""/>
4524
</div>
4625
</div>
26+
<div class="o_carousel_controllers">
27+
<button class="carousel-control-prev o_not_editable" contenteditable="false" data-bs-target="#slideshow_sample" data-bs-slide="prev" aria-label="Previous" title="Previous">
28+
<span class="carousel-control-prev-icon" aria-hidden="true"/>
29+
<span class="visually-hidden">Previous</span>
30+
</button>
31+
<div class="carousel-indicators">
32+
<button type="button" data-bs-target="#slideshow_sample" data-bs-slide-to="0" style="background-image: url(/web/image/website.library_image_08)" class="active" aria-label="Carousel indicator"/>
33+
<button type="button" style="background-image: url(/web/image/website.library_image_03)" data-bs-target="#slideshow_sample" data-bs-slide-to="1" aria-label="Carousel indicator"/>
34+
<button type="button" style="background-image: url(/web/image/website.library_image_02)" data-bs-target="#slideshow_sample" data-bs-slide-to="2" aria-label="Carousel indicator"/>
35+
</div>
36+
<button class="carousel-control-next o_not_editable" contenteditable="false" data-bs-target="#slideshow_sample" data-bs-slide="next" aria-label="Next" title="Next">
37+
<span class="carousel-control-next-icon" aria-hidden="true"/>
38+
<span class="visually-hidden">Next</span>
39+
</button>
40+
</div>
4741
</div>
48-
</section>
49-
`);
42+
</div>
43+
</section>`;
44+
45+
test("[EDIT] carousel_bootstrap_upgrade_fix prevents ride", async () => {
46+
const { core } = await startInteractions(imageGalleryCarouselStyleSnippet);
5047
expect(core.interactions).toHaveLength(1);
5148
await switchToEditMode(core);
5249
const carouselEl = queryOne(".carousel");
5350
const carouselBS = window.Carousel.getInstance(carouselEl);
5451
expect(carouselBS._config.ride).toBe(false);
5552
expect(carouselBS._config.pause).toBe(true);
5653
});
54+
55+
test("carousel_bootstrap_upgrade_fix is tagged while sliding", async () => {
56+
const { core } = await startInteractions(imageGalleryCarouselStyleSnippet);
57+
expect(core.interactions).toHaveLength(1);
58+
59+
const carouselEl = queryOne(".carousel");
60+
expect(carouselEl).toHaveAttribute("data-bs-interval", "5000");
61+
expect(carouselEl).not.toHaveClass("o_carousel_sliding");
62+
63+
await click(carouselEl.querySelector(".carousel-control-next"));
64+
65+
expect(carouselEl).toHaveClass("o_carousel_sliding");
66+
await advanceTime(750);
67+
expect(carouselEl).not.toHaveClass("o_carousel_sliding");
68+
});

‎addons/website/static/tests/interactions/carousel/carousel_bootstrap_upgrade_fix.test.js‎

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

‎addons/website/static/tests/interactions/carousel/carousel_slider.edit.test.js‎

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

‎addons/website/static/tests/interactions/carousel/carousel_slider.test.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { setupInteractionWhiteList, startInteractions } from "@web/../tests/public/helpers";
2-
32
import { beforeEach, describe, expect, test } from "@odoo/hoot";
43
import { queryAll } from "@odoo/hoot-dom";
54
import { enableTransitions } from "@odoo/hoot-mock";

0 commit comments

Comments
 (0)