diff --git a/backend/tests/api.test.js b/backend/tests/api.test.js index aa4b0107..98ebbd3a 100644 --- a/backend/tests/api.test.js +++ b/backend/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-renamed/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/backend/tests/calculateRank.test.js b/backend/tests/calculateRank.test.js index 65f60df3..662dd267 100644 --- a/backend/tests/calculateRank.test.js +++ b/backend/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/backend/tests/card.test.js b/backend/tests/card.test.js index 61e7ec0e..02e476c3 100644 --- a/backend/tests/card.test.js +++ b/backend/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/backend/tests/e2e/e2e.test.js b/backend/tests/e2e/e2e.test.js index 10517759..63e5e4fd 100644 --- a/backend/tests/e2e/e2e.test.js +++ b/backend/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/backend/tests/fetchGist.test.js b/backend/tests/fetchGist.test.js index ee9be987..ba5f3e52 100644 --- a/backend/tests/fetchGist.test.js +++ b/backend/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/backend/tests/fetchRepo.test.js b/backend/tests/fetchRepo.test.js index 604b34b4..e976dd72 100644 --- a/backend/tests/fetchRepo.test.js +++ b/backend/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/backend/tests/fetchStats.test.js b/backend/tests/fetchStats.test.js index 6697e5c6..a644c69f 100644 --- a/backend/tests/fetchStats.test.js +++ b/backend/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/backend/tests/fetchTopLanguages.test.js b/backend/tests/fetchTopLanguages.test.js index 287c8ede..e9764a25 100644 --- a/backend/tests/fetchTopLanguages.test.js +++ b/backend/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/backend/tests/fetchWakatime.test.js b/backend/tests/fetchWakatime.test.js index 0cfbe4df..a0f8b12a 100644 --- a/backend/tests/fetchWakatime.test.js +++ b/backend/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/backend/tests/flexLayout.test.js b/backend/tests/flexLayout.test.js index e07aae29..a2bb580d 100644 --- a/backend/tests/flexLayout.test.js +++ b/backend/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/backend/tests/gist.test.js b/backend/tests/gist.test.js index 541ee24d..3771a1f0 100644 --- a/backend/tests/gist.test.js +++ b/backend/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-renamed/gist.js"; import { renderGistCard } from "../src/cards/gist.js"; import { CONSTANTS, renderError } from "../src/common/utils.js"; -import gist from "../api-renamed/gist.js"; const gist_data = { data: { diff --git a/backend/tests/i18n.test.js b/backend/tests/i18n.test.js index 04666825..22580029 100644 --- a/backend/tests/i18n.test.js +++ b/backend/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/backend/tests/pat-info.test.js b/backend/tests/pat-info.test.js index 29b0d6ff..82a8ad71 100644 --- a/backend/tests/pat-info.test.js +++ b/backend/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-renamed/status/pat-info.js"; -import { - expect, - it, - describe, - afterEach, - beforeAll, - jest, -} from "@jest/globals"; const mock = new MockAdapter(axios); diff --git a/backend/tests/pin.test.js b/backend/tests/pin.test.js index c7037808..64566af1 100644 --- a/backend/tests/pin.test.js +++ b/backend/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-renamed/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/backend/tests/renderGistCard.test.js b/backend/tests/renderGistCard.test.js index 9d360052..c397281a 100644 --- a/backend/tests/renderGistCard.test.js +++ b/backend/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/backend/tests/renderRepoCard.test.js b/backend/tests/renderRepoCard.test.js index 04c1090d..9fb5ab36 100644 --- a/backend/tests/renderRepoCard.test.js +++ b/backend/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/backend/tests/renderStatsCard.test.js b/backend/tests/renderStatsCard.test.js index ee42e0a5..4d0434a3 100644 --- a/backend/tests/renderStatsCard.test.js +++ b/backend/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/backend/tests/renderTopLanguagesCard.test.js b/backend/tests/renderTopLanguagesCard.test.js index 0a7aba61..58532fa5 100644 --- a/backend/tests/renderTopLanguagesCard.test.js +++ b/backend/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/backend/tests/renderWakatimeCard.test.js b/backend/tests/renderWakatimeCard.test.js index ca238148..24743f8d 100644 --- a/backend/tests/renderWakatimeCard.test.js +++ b/backend/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/backend/tests/retryer.test.js b/backend/tests/retryer.test.js index e231a366..967441e3 100644 --- a/backend/tests/retryer.test.js +++ b/backend/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/backend/tests/status.up.test.js b/backend/tests/status.up.test.js index 1fd6c368..f3011e0d 100644 --- a/backend/tests/status.up.test.js +++ b/backend/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-renamed/status/up.js"; -import { expect, it, describe, afterEach, jest } from "@jest/globals"; const mock = new MockAdapter(axios); diff --git a/backend/tests/top-langs.test.js b/backend/tests/top-langs.test.js index e6828023..3105f8fa 100644 --- a/backend/tests/top-langs.test.js +++ b/backend/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-renamed/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/backend/tests/utils.test.js b/backend/tests/utils.test.js index ad72b8c5..21a78e47 100644 --- a/backend/tests/utils.test.js +++ b/backend/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/backend/tests/wakatime.test.js b/backend/tests/wakatime.test.js index 66eb0f3d..2a4bb53d 100644 --- a/backend/tests/wakatime.test.js +++ b/backend/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-renamed/wakatime.js"; import { renderWakatimeCard } from "../src/cards/wakatime.js"; -import { expect, it, describe, afterEach, jest } from "@jest/globals"; const wakaTimeData = { data: {