From 879463b14eb5e361dcca557d844f37287c52654b Mon Sep 17 00:00:00 2001 From: Ophelia Goldstein <159258143+opheliagoldstein@users.noreply.github.com> Date: Wed, 8 Oct 2025 01:58:06 +0300 Subject: [PATCH] refactor: organize imports inside tests files (#4542) Co-authored-by: Alexandr --- tests/api.test.js | 16 ++++++++-------- tests/calculateRank.test.js | 2 +- tests/card.test.js | 2 +- tests/e2e/e2e.test.js | 4 ++-- tests/fetchGist.test.js | 2 +- tests/fetchRepo.test.js | 2 +- tests/fetchStats.test.js | 2 +- tests/fetchTopLanguages.test.js | 2 +- tests/fetchWakatime.test.js | 2 +- tests/flexLayout.test.js | 2 +- tests/gist.test.js | 4 ++-- tests/i18n.test.js | 2 +- tests/pat-info.test.js | 17 +++++++++-------- tests/pin.test.js | 2 +- tests/renderGistCard.test.js | 6 +++--- tests/renderRepoCard.test.js | 3 +-- tests/renderStatsCard.test.js | 6 ++---- tests/renderTopLanguagesCard.test.js | 26 ++++++++++++-------------- tests/renderWakatimeCard.test.js | 2 +- tests/retryer.test.js | 4 ++-- tests/status.up.test.js | 2 +- tests/top-langs.test.js | 2 +- tests/utils.test.js | 4 ++-- tests/wakatime.test.js | 2 +- 24 files changed, 57 insertions(+), 61 deletions(-) diff --git a/tests/api.test.js b/tests/api.test.js index b20fa69..caaa1c5 100644 --- a/tests/api.test.js +++ b/tests/api.test.js @@ -1,19 +1,19 @@ // @ts-check +import { + afterEach, + beforeEach, + describe, + expect, + it, + jest, +} from "@jest/globals"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import api from "../api/index.js"; import { calculateRank } from "../src/calculateRank.js"; import { renderStatsCard } from "../src/cards/stats.js"; import { CONSTANTS, renderError } from "../src/common/utils.js"; -import { - expect, - it, - describe, - afterEach, - beforeEach, - jest, -} from "@jest/globals"; /** * @type {import("../src/fetchers/stats").StatsData} diff --git a/tests/calculateRank.test.js b/tests/calculateRank.test.js index 65f60df..662dd26 100644 --- a/tests/calculateRank.test.js +++ b/tests/calculateRank.test.js @@ -1,6 +1,6 @@ +import { describe, expect, it } from "@jest/globals"; import "@testing-library/jest-dom"; import { calculateRank } from "../src/calculateRank.js"; -import { expect, it, describe } from "@jest/globals"; describe("Test calculateRank", () => { it("new user gets C rank", () => { diff --git a/tests/card.test.js b/tests/card.test.js index 61e7ec0..02e476c 100644 --- a/tests/card.test.js +++ b/tests/card.test.js @@ -1,10 +1,10 @@ +import { describe, expect, it } from "@jest/globals"; import { queryByTestId } from "@testing-library/dom"; import "@testing-library/jest-dom"; import { cssToObject } from "@uppercod/css-to-object"; import { Card } from "../src/common/Card.js"; import { icons } from "../src/common/icons.js"; import { getCardColors } from "../src/common/utils.js"; -import { expect, it, describe } from "@jest/globals"; describe("Card", () => { it("should hide border", () => { diff --git a/tests/e2e/e2e.test.js b/tests/e2e/e2e.test.js index 1051775..63e5e4f 100644 --- a/tests/e2e/e2e.test.js +++ b/tests/e2e/e2e.test.js @@ -4,13 +4,13 @@ import dotenv from "dotenv"; dotenv.config(); +import { beforeAll, describe, expect, test } from "@jest/globals"; import axios from "axios"; +import { renderGistCard } from "../../src/cards/gist.js"; import { renderRepoCard } from "../../src/cards/repo.js"; import { renderStatsCard } from "../../src/cards/stats.js"; import { renderTopLanguages } from "../../src/cards/top-languages.js"; import { renderWakatimeCard } from "../../src/cards/wakatime.js"; -import { renderGistCard } from "../../src/cards/gist.js"; -import { expect, describe, beforeAll, test } from "@jest/globals"; const REPO = "curly-fiesta"; const USER = "catelinemnemosyne"; diff --git a/tests/fetchGist.test.js b/tests/fetchGist.test.js index ee9be98..ba5f3e5 100644 --- a/tests/fetchGist.test.js +++ b/tests/fetchGist.test.js @@ -1,7 +1,7 @@ +import { afterEach, describe, expect, it } from "@jest/globals"; import "@testing-library/jest-dom"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; -import { expect, it, describe, afterEach } from "@jest/globals"; import { fetchGist } from "../src/fetchers/gist.js"; const gist_data = { diff --git a/tests/fetchRepo.test.js b/tests/fetchRepo.test.js index 604b34b..e976dd7 100644 --- a/tests/fetchRepo.test.js +++ b/tests/fetchRepo.test.js @@ -1,8 +1,8 @@ +import { afterEach, describe, expect, it } from "@jest/globals"; import "@testing-library/jest-dom"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import { fetchRepo } from "../src/fetchers/repo.js"; -import { expect, it, describe, afterEach } from "@jest/globals"; const data_repo = { repository: { diff --git a/tests/fetchStats.test.js b/tests/fetchStats.test.js index e0b0a14..6c7edb4 100644 --- a/tests/fetchStats.test.js +++ b/tests/fetchStats.test.js @@ -1,9 +1,9 @@ +import { afterEach, beforeEach, describe, expect, it } from "@jest/globals"; import "@testing-library/jest-dom"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import { calculateRank } from "../src/calculateRank.js"; import { fetchStats } from "../src/fetchers/stats.js"; -import { expect, it, describe, beforeEach, afterEach } from "@jest/globals"; // Test parameters. const data_stats = { diff --git a/tests/fetchTopLanguages.test.js b/tests/fetchTopLanguages.test.js index 287c8ed..e9764a2 100644 --- a/tests/fetchTopLanguages.test.js +++ b/tests/fetchTopLanguages.test.js @@ -1,8 +1,8 @@ +import { afterEach, describe, expect, it } from "@jest/globals"; import "@testing-library/jest-dom"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import { fetchTopLanguages } from "../src/fetchers/top-languages.js"; -import { expect, it, describe, afterEach } from "@jest/globals"; const mock = new MockAdapter(axios); diff --git a/tests/fetchWakatime.test.js b/tests/fetchWakatime.test.js index 0cfbe4d..a0f8b12 100644 --- a/tests/fetchWakatime.test.js +++ b/tests/fetchWakatime.test.js @@ -1,8 +1,8 @@ +import { afterEach, describe, expect, it } from "@jest/globals"; import "@testing-library/jest-dom"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import { fetchWakatimeStats } from "../src/fetchers/wakatime.js"; -import { expect, it, describe, afterEach } from "@jest/globals"; const mock = new MockAdapter(axios); diff --git a/tests/flexLayout.test.js b/tests/flexLayout.test.js index e07aae2..a2bb580 100644 --- a/tests/flexLayout.test.js +++ b/tests/flexLayout.test.js @@ -1,5 +1,5 @@ +import { describe, expect, it } from "@jest/globals"; import { flexLayout } from "../src/common/utils.js"; -import { expect, it, describe } from "@jest/globals"; describe("flexLayout", () => { it("should work with row & col layouts", () => { diff --git a/tests/gist.test.js b/tests/gist.test.js index 98670ad..e136c2b 100644 --- a/tests/gist.test.js +++ b/tests/gist.test.js @@ -1,12 +1,12 @@ // @ts-check +import { afterEach, describe, expect, it, jest } from "@jest/globals"; import "@testing-library/jest-dom"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; -import { expect, it, describe, afterEach, jest } from "@jest/globals"; +import gist from "../api/gist.js"; import { renderGistCard } from "../src/cards/gist.js"; import { CONSTANTS, renderError } from "../src/common/utils.js"; -import gist from "../api/gist.js"; const gist_data = { data: { diff --git a/tests/i18n.test.js b/tests/i18n.test.js index 0466682..2258002 100644 --- a/tests/i18n.test.js +++ b/tests/i18n.test.js @@ -1,4 +1,4 @@ -import { expect, it, describe } from "@jest/globals"; +import { describe, expect, it } from "@jest/globals"; import { I18n } from "../src/common/I18n.js"; import { statCardLocales } from "../src/translations.js"; diff --git a/tests/pat-info.test.js b/tests/pat-info.test.js index 0f8783d..a46eee1 100644 --- a/tests/pat-info.test.js +++ b/tests/pat-info.test.js @@ -1,20 +1,21 @@ /** * @file Tests for the status/pat-info cloud function. */ + import dotenv from "dotenv"; dotenv.config(); +import { + afterEach, + beforeAll, + describe, + expect, + it, + jest, +} from "@jest/globals"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import patInfo, { RATE_LIMIT_SECONDS } from "../api/status/pat-info.js"; -import { - expect, - it, - describe, - afterEach, - beforeAll, - jest, -} from "@jest/globals"; const mock = new MockAdapter(axios); diff --git a/tests/pin.test.js b/tests/pin.test.js index 3421264..035f4fb 100644 --- a/tests/pin.test.js +++ b/tests/pin.test.js @@ -1,12 +1,12 @@ // @ts-check +import { afterEach, describe, expect, it, jest } from "@jest/globals"; import "@testing-library/jest-dom"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import pin from "../api/pin.js"; import { renderRepoCard } from "../src/cards/repo.js"; import { CONSTANTS, renderError } from "../src/common/utils.js"; -import { expect, it, describe, afterEach, jest } from "@jest/globals"; const data_repo = { repository: { diff --git a/tests/renderGistCard.test.js b/tests/renderGistCard.test.js index 9d36005..c397281 100644 --- a/tests/renderGistCard.test.js +++ b/tests/renderGistCard.test.js @@ -1,9 +1,9 @@ -import { renderGistCard } from "../src/cards/gist.js"; import { describe, expect, it } from "@jest/globals"; import { queryByTestId } from "@testing-library/dom"; -import { cssToObject } from "@uppercod/css-to-object"; -import { themes } from "../themes/index.js"; import "@testing-library/jest-dom"; +import { cssToObject } from "@uppercod/css-to-object"; +import { renderGistCard } from "../src/cards/gist.js"; +import { themes } from "../themes/index.js"; /** * @type {import("../src/fetchers/gist").GistData} diff --git a/tests/renderRepoCard.test.js b/tests/renderRepoCard.test.js index 04c1090..9fb5ab3 100644 --- a/tests/renderRepoCard.test.js +++ b/tests/renderRepoCard.test.js @@ -1,9 +1,8 @@ +import { describe, expect, it } from "@jest/globals"; import { queryByTestId } from "@testing-library/dom"; import "@testing-library/jest-dom"; import { cssToObject } from "@uppercod/css-to-object"; import { renderRepoCard } from "../src/cards/repo.js"; -import { expect, it, describe } from "@jest/globals"; - import { themes } from "../themes/index.js"; const data_repo = { diff --git a/tests/renderStatsCard.test.js b/tests/renderStatsCard.test.js index a460454..4001094 100644 --- a/tests/renderStatsCard.test.js +++ b/tests/renderStatsCard.test.js @@ -1,16 +1,14 @@ +import { describe, expect, it } from "@jest/globals"; import { getByTestId, queryAllByTestId, queryByTestId, } from "@testing-library/dom"; +import "@testing-library/jest-dom"; import { cssToObject } from "@uppercod/css-to-object"; import { renderStatsCard } from "../src/cards/stats.js"; -import { expect, it, describe } from "@jest/globals"; import { CustomError } from "../src/common/utils.js"; -// adds special assertions like toHaveTextContent -import "@testing-library/jest-dom"; - import { themes } from "../themes/index.js"; const stats = { diff --git a/tests/renderTopLanguagesCard.test.js b/tests/renderTopLanguagesCard.test.js index 0a7aba6..58532fa 100644 --- a/tests/renderTopLanguagesCard.test.js +++ b/tests/renderTopLanguagesCard.test.js @@ -1,27 +1,25 @@ +import { describe, expect, it } from "@jest/globals"; import { queryAllByTestId, queryByTestId } from "@testing-library/dom"; +import "@testing-library/jest-dom"; import { cssToObject } from "@uppercod/css-to-object"; import { - getLongestLang, - degreesToRadians, - radiansToDegrees, - polarToCartesian, - cartesianToPolar, - getCircleLength, + MIN_CARD_WIDTH, calculateCompactLayoutHeight, - calculateNormalLayoutHeight, calculateDonutLayoutHeight, calculateDonutVerticalLayoutHeight, + calculateNormalLayoutHeight, calculatePieLayoutHeight, + cartesianToPolar, + degreesToRadians, donutCenterTranslation, - trimTopLanguages, - renderTopLanguages, - MIN_CARD_WIDTH, + getCircleLength, getDefaultLanguagesCountByLayout, + getLongestLang, + polarToCartesian, + radiansToDegrees, + renderTopLanguages, + trimTopLanguages, } from "../src/cards/top-languages.js"; -import { expect, it, describe } from "@jest/globals"; - -// adds special assertions like toHaveTextContent -import "@testing-library/jest-dom"; import { themes } from "../themes/index.js"; diff --git a/tests/renderWakatimeCard.test.js b/tests/renderWakatimeCard.test.js index ca23814..24743f8 100644 --- a/tests/renderWakatimeCard.test.js +++ b/tests/renderWakatimeCard.test.js @@ -1,8 +1,8 @@ +import { describe, expect, it } from "@jest/globals"; import { queryByTestId } from "@testing-library/dom"; import "@testing-library/jest-dom"; import { renderWakatimeCard } from "../src/cards/wakatime.js"; import { wakaTimeData } from "./fetchWakatime.test.js"; -import { expect, it, describe } from "@jest/globals"; describe("Test Render WakaTime Card", () => { it("should render correctly", () => { diff --git a/tests/retryer.test.js b/tests/retryer.test.js index e231a36..967441e 100644 --- a/tests/retryer.test.js +++ b/tests/retryer.test.js @@ -1,7 +1,7 @@ +import { describe, expect, it, jest } from "@jest/globals"; import "@testing-library/jest-dom"; -import { retryer, RETRIES } from "../src/common/retryer.js"; +import { RETRIES, retryer } from "../src/common/retryer.js"; import { logger } from "../src/common/utils.js"; -import { expect, it, describe, jest } from "@jest/globals"; const fetcher = jest.fn((variables, token) => { logger.log(variables, token); diff --git a/tests/status.up.test.js b/tests/status.up.test.js index f7c0869..a4cf00b 100644 --- a/tests/status.up.test.js +++ b/tests/status.up.test.js @@ -2,10 +2,10 @@ * @file Tests for the status/up cloud function. */ +import { afterEach, describe, expect, it, jest } from "@jest/globals"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import up, { RATE_LIMIT_SECONDS } from "../api/status/up.js"; -import { expect, it, describe, afterEach, jest } from "@jest/globals"; const mock = new MockAdapter(axios); diff --git a/tests/top-langs.test.js b/tests/top-langs.test.js index 1e48ccf..62ad349 100644 --- a/tests/top-langs.test.js +++ b/tests/top-langs.test.js @@ -1,12 +1,12 @@ // @ts-check +import { afterEach, describe, expect, it, jest } from "@jest/globals"; import "@testing-library/jest-dom"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import topLangs from "../api/top-langs.js"; import { renderTopLanguages } from "../src/cards/top-languages.js"; import { CONSTANTS, renderError } from "../src/common/utils.js"; -import { expect, it, describe, afterEach, jest } from "@jest/globals"; const data_langs = { data: { diff --git a/tests/utils.test.js b/tests/utils.test.js index ad72b8c..21a78e4 100644 --- a/tests/utils.test.js +++ b/tests/utils.test.js @@ -1,15 +1,15 @@ +import { describe, expect, it } from "@jest/globals"; import { queryByTestId } from "@testing-library/dom"; import "@testing-library/jest-dom"; import { encodeHTML, + formatBytes, getCardColors, kFormatter, parseBoolean, renderError, wrapTextMultiline, - formatBytes, } from "../src/common/utils.js"; -import { expect, it, describe } from "@jest/globals"; describe("Test utils.js", () => { it("should test kFormatter", () => { diff --git a/tests/wakatime.test.js b/tests/wakatime.test.js index 8afdecf..ce9843d 100644 --- a/tests/wakatime.test.js +++ b/tests/wakatime.test.js @@ -1,9 +1,9 @@ +import { afterEach, describe, expect, it, jest } from "@jest/globals"; import "@testing-library/jest-dom"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import wakatime from "../api/wakatime.js"; import { renderWakatimeCard } from "../src/cards/wakatime.js"; -import { expect, it, describe, afterEach, jest } from "@jest/globals"; const wakaTimeData = { data: {