start and steps tests

src/packages/tour/mock.ts

@@ -1,4 +1,4 @@
-import van from "../dom/van"
+import van from "../dom/van";
 import { TourStep } from "./steps";
 import { Tour } from "./tour";
 import {

src/packages/tour/start.test.ts

@@ -1,6 +1,5 @@
 import { start } from "./start";
 import * as steps from "./steps";
-import * as addOverlayLayer from "./addOverlayLayer";
 import * as nextStep from "./steps";
 import { getMockTour } from "./mock";
 
@@ -10,35 +9,38 @@ describe("start", () => {
   });
 
   test("should call the onstart callback", () => {
+    // Arrange
     jest.spyOn(steps, "fetchSteps").mockReturnValue([]);
-    jest.spyOn(addOverlayLayer, "default").mockReturnValue(true);
     jest.spyOn(nextStep, "nextStep").mockReturnValue(Promise.resolve(true));
 
     const onstartCallback = jest.fn();
 
     const mockTour = getMockTour();
     mockTour.onStart(onstartCallback);
 
+    // Act
     start(mockTour);
 
+    // Assert
     expect(onstartCallback).toBeCalledTimes(1);
     expect(onstartCallback).toBeCalledWith(document.body);
   });
 
   test("should not start the tour if isActive is false", () => {
+    // Arrange
     const fetchIntroStepsMock = jest
       .spyOn(steps, "fetchSteps")
       .mockReturnValue([]);
-    const addOverlayLayerMock = jest.spyOn(addOverlayLayer, "default");
     const nextStepMock = jest.spyOn(nextStep, "nextStep");
 
     const mockTour = getMockTour();
     mockTour.setOption("isActive", false);
 
+    // Act
     start(mockTour);
 
+    // Assert
     expect(fetchIntroStepsMock).toBeCalledTimes(0);
-    expect(addOverlayLayerMock).toBeCalledTimes(0);
     expect(nextStepMock).toBeCalledTimes(0);
   });
 

src/packages/tour/steps.test.ts

@@ -1,12 +1,14 @@
+import van from "../dom/van";
 import { fetchSteps, nextStep, previousStep } from "./steps";
-import _showElement from "./showElement";
 import {
   appendMockSteps,
   getMockPartialSteps,
   getMockSteps,
   getMockTour,
 } from "./mock";
-import createElement from "../../util/createElement";
+import { showElement } from "./showElement";
+
+const { div, h1 } = van.tags;
 
 jest.mock("./showElement");
 jest.mock("./exitIntro");
@@ -54,7 +56,7 @@ describe("steps", () => {
     test("should call ShowElement", async () => {
       // Arrange
       const showElementMock = jest.fn();
-      (_showElement as jest.Mock).mockImplementation(showElementMock);
+      (showElement as jest.Mock).mockImplementation(showElementMock);
       const mockTour = getMockTour();
       mockTour.setSteps(getMockSteps());
 
@@ -88,7 +90,7 @@ describe("steps", () => {
       // Arrange
       const mockTour = getMockTour();
       const showElementMock = jest.fn();
-      (_showElement as jest.Mock).mockImplementation(showElementMock);
+      (showElement as jest.Mock).mockImplementation(showElementMock);
       const fnBeforeChangeCallback = jest.fn();
       fnBeforeChangeCallback.mockReturnValue(false);
 
@@ -107,7 +109,7 @@ describe("steps", () => {
       const mockTour = getMockTour();
       mockTour.setSteps(getMockSteps());
       const showElementMock = jest.fn();
-      (_showElement as jest.Mock).mockImplementation(showElementMock);
+      (showElement as jest.Mock).mockImplementation(showElementMock);
 
       const onBeforeChangeMock = jest.fn();
       const sideEffect: number[] = [];
@@ -153,7 +155,7 @@ describe("steps", () => {
       // Arrange
       const mockTour = getMockTour();
       mockTour.addStep({
-        element: createElement("div"),
+        element: div(),
         intro: "test step",
       });
 
@@ -174,7 +176,7 @@ describe("steps", () => {
           intro: "first step",
         },
         {
-          element: createElement("div"),
+          element: div(),
           intro: "second step",
         },
       ]);
@@ -214,7 +216,7 @@ describe("steps", () => {
 
     test("should find and add elements from options.steps to the list", () => {
       // Arrange
-      document.body.appendChild(createElement("h1"));
+      document.body.appendChild(h1());
 
       const mockTour = getMockTour();
       mockTour.addSteps(getMockPartialSteps());
@@ -252,7 +254,7 @@ describe("steps", () => {
 
     test("should find the data-* elements from the DOM with the correct order", () => {
       // Arrange
-      const targetElement = createElement("div");
+      const targetElement = div();
       const [
         mockElementOne,
         mockElementTwo,

src/util/elementInViewport.test.ts

@@ -1,7 +1,7 @@
 import van from "../packages/dom/van";
 import elementInViewport from "./elementInViewport";
 
-const {div} = van.tags;
+const { div } = van.tags;
 
 describe("elementInViewport", () => {
   test("should return true when element is in viewport", () => {

src/util/positionRelativeTo.test.ts

@@ -1,8 +1,8 @@
 import { setPositionRelativeTo } from "./positionRelativeTo";
 import { getBoundingClientRectSpy } from "../../tests/jest/helper";
-import van from "../packages/dom/van"
+import van from "../packages/dom/van";
 
-const {div} = van.tags;
+const { div } = van.tags;
 
 describe("setPositionRelativeTo", () => {
   it("should return if helperLayer or currentStep is null", () => {

src/util/queryElement.ts

@@ -19,7 +19,6 @@ export const queryElementsByClassName = (
   return queryElements(`.${className}`, container);
 };
 
-
 export const getElement = (
   selector: string,
   container?: HTMLElement | null