test cleanups

Author: ZeeCoder

packages/container-query/src/Container.spec.js

@@ -1,5 +1,11 @@
 import Container from "./Container";
 import { QUERIES } from "@zeecoder/container-query-meta-builder";
+import raf from "raf";
+import processMeta from "./processMeta";
+import adjustContainer from "./adjustContainer";
+import containerRegistry from "./containerRegistry";
+import ResizeObserver from "resize-observer-polyfill";
+import MutationObserver from "mutation-observer";
 
 console.warn = jest.fn();
 jest.mock("./processMeta", () => jest.fn(config => config));
@@ -35,26 +41,18 @@ jest.mock("mutation-observer", () => {
 });
 
 beforeEach(() => {
-  require("raf").mockClear();
-  require("./processMeta").mockClear();
-  require("./adjustContainer").mockClear();
-  const ResizeObserver = require("resize-observer-polyfill");
+  raf.mockClear();
+  processMeta.mockClear();
+  adjustContainer.mockClear();
   ResizeObserver.prototype.observe.mockClear();
   ResizeObserver.prototype.unobserve.mockClear();
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.get.mockClear();
   containerRegistry.set.mockClear();
   containerRegistry.has.mockClear();
   containerRegistry.delete.mockClear();
 });
 
 test("should instantiate properly", () => {
-  const ResizeObserver = require("resize-observer-polyfill");
-  const processMeta = require("./processMeta");
-  const adjustContainer = require("./adjustContainer");
-  const containerRegistry = require("./containerRegistry");
-  const raf = require("raf");
-
   const containerElement = {
     parentNode: document.createElement("div")
   };
@@ -84,8 +82,6 @@ test("should instantiate properly", () => {
 });
 
 test("should create the initial query state based on the number of queries", () => {
-  const containerRegistry = require("./containerRegistry");
-
   const containerElement = {
     parentNode: document.createElement("div")
   };
@@ -103,11 +99,6 @@ test("should create the initial query state based on the number of queries", ()
 });
 
 test("should not call adjust if disabled by the options", () => {
-  const ResizeObserver = require("resize-observer-polyfill");
-  const processMeta = require("./processMeta");
-  const adjustContainer = require("./adjustContainer");
-  const raf = require("raf");
-
   const containerElement = {
     parentNode: document.createElement("div")
   };
@@ -128,10 +119,6 @@ test("should not call adjust if disabled by the options", () => {
 });
 
 test("should be able to observe resize events and switch off initial adjust call", () => {
-  const ResizeObserver = require("resize-observer-polyfill");
-  const raf = require("raf");
-  const adjustContainer = require("./adjustContainer");
-
   const containerElement = {
     parentNode: document.createElement("div")
   };
@@ -165,7 +152,6 @@ test("should be able to observe resize events and switch off initial adjust call
 });
 
 test("should call adjust() on resize changes", () => {
-  const containerRegistry = require("./containerRegistry");
   const randomElement = document.createElement("div");
   containerRegistry.get.mockImplementationOnce(queriedContainerElement => {
     expect(queriedContainerElement).toBe(randomElement);
@@ -177,7 +163,6 @@ test("should call adjust() on resize changes", () => {
 
     return registryData;
   });
-  const ResizeObserver = require("resize-observer-polyfill");
   const parentElement = document.createElement("div");
   const containerElement = document.createElement("div");
   parentElement.appendChild(containerElement);
@@ -232,10 +217,7 @@ test("should call adjust() on resize changes", () => {
 });
 
 test("should clean up after container element is detached from the DOM", () => {
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.has.mockImplementationOnce(() => true);
-  const MutationObserver = require("mutation-observer");
-  const ResizeObserver = require("resize-observer-polyfill");
   ResizeObserver.prototype.unobserve = jest.fn();
   const parentElement = document.createElement("div");
   const containerElement = document.createElement("div");

packages/container-query/src/getChangedStyles.spec.js

@@ -6,6 +6,7 @@ import {
   STYLES,
   VALUES
 } from "@zeecoder/container-query-meta-builder";
+import containerRegistry from "./containerRegistry";
 
 jest.mock("./containerRegistry", () => ({
   get: jest.fn()
@@ -18,7 +19,6 @@ test("should return empty object if the element is not registered", () => {
 });
 
 test("should apply default queries without a condition function", () => {
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.get.mockImplementation(() => {
     return {
       instance: { opts: { valuePrecision: 3 } },
@@ -124,7 +124,6 @@ test("should return change sets on first run", () => {
     }
   };
 
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.get.mockImplementation(() => registryData);
 
   const element = document.createElement("div");
@@ -223,7 +222,6 @@ test("should generate remove change set", () => {
     }
   };
 
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.get.mockImplementation(() => registryData);
 
   const element = document.createElement("div");
@@ -296,7 +294,6 @@ test("should generate empty change set if conditions allow", () => {
     }
   };
 
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.get.mockImplementation(() => registryData);
 
   const element = document.createElement("div");
@@ -362,7 +359,6 @@ test("should always recalculate values", () => {
       ]
     }
   };
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.get.mockImplementation(() => registryData);
 
   const element = document.createElement("div");
@@ -406,7 +402,6 @@ test("should be able to limit the precision of generated css values", () => {
     }
   };
 
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.get.mockImplementation(() => registryData);
 
   const element = document.createElement("div");
@@ -470,7 +465,6 @@ test("should handle multiple prop removal over multiple queries", () => {
     }
   };
 
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.get.mockImplementation(() => registryData);
 
   const element = document.createElement("div");
@@ -507,7 +501,6 @@ test("should use :self if the selector is not available", () => {
     }
   };
 
-  const containerRegistry = require("./containerRegistry");
   containerRegistry.get.mockImplementation(() => registryData);
 
   const element = document.createElement("div");

packages/container-query/src/processMeta.spec.js

@@ -4,11 +4,11 @@ import {
   CONDITIONS,
   SELECTOR
 } from "@zeecoder/container-query-meta-builder";
+import getConditionFunction from "./getConditionFunction";
 
 jest.mock("./getConditionFunction");
 
 test("should turn conditions to functions", () => {
-  const getConditionFunction = require("./getConditionFunction").default;
   getConditionFunction
     .mockImplementationOnce(() => () => 1)
     .mockImplementationOnce(() => () => 2)

packages/postcss-container-query/src/containerQuery.spec.js

@@ -9,6 +9,7 @@ import * as missingContainerDelcarationTest from "./test/missing-container-decla
 import * as missingDeclarationWithRUnitsTest from "./test/missing-declaration-with-r-units";
 import * as selfTest from "./test/self";
 import * as simpleTest from "./test/simple";
+import fs from "fs";
 
 const containerQuery = require("../dist");
 const getMetadataFromMessages = require("../getMetadataFromMessages");
@@ -66,7 +67,6 @@ test('should avoid accidentally creating ".default" exports', () => {
 });
 
 test("should use the default json saving function if none was supplied", () => {
-  const fs = require("fs");
   const pluginInstance = containerQuery();
 
   pluginInstance(new Root(), { messages: [] });

packages/postcss-container-query/src/saveMeta.spec.js

@@ -1,9 +1,9 @@
 import saveMeta from "./saveMeta";
+import fs from "fs";
 
 jest.mock("fs");
 
 test("should write contents when file does not exist", () => {
-  const fs = require("fs");
   const cssFilePath = __dirname + "/tmp/saveMeta.test.css";
   const jsonFilePath = `${cssFilePath}.json`;
   const json = { some: "JSON" };
@@ -24,7 +24,6 @@ test("should write contents when file does not exist", () => {
 });
 
 test("should not write contents when file already with same contents", () => {
-  const fs = require("fs");
   const cssFilePath = __dirname + "/tmp/saveMeta.test.css";
   const jsonFilePath = `${cssFilePath}.json`;
   const json = { some: "JSON" };
@@ -43,7 +42,6 @@ test("should not write contents when file already with same contents", () => {
 });
 
 test("should log error in case there's an issue writing the file", () => {
-  const fs = require("fs");
   const cssFilePath = __dirname + "/tmp/saveMeta.test.css";
   const jsonFilePath = `${cssFilePath}.json`;
   const json = { some: "JSON" };