diff --git a/api/top-langs.js b/api/top-langs.js index d1815559f372f..c5bed634c1eab 100644 --- a/api/top-langs.js +++ b/api/top-langs.js @@ -1,7 +1,6 @@ import { renderTopLanguages } from "../src/cards/top-languages-card.js"; import { blacklist } from "../src/common/blacklist.js"; import { - clampValue, CONSTANTS, parseArray, parseBoolean, diff --git a/tests/api.test.js b/tests/api.test.js index eee9a1a0a61af..c155220ce5372 100644 --- a/tests/api.test.js +++ b/tests/api.test.js @@ -168,40 +168,6 @@ describe("Test /api/", () => { ); }); - it("should have proper cache", async () => { - const { req, res } = faker({}, data_stats); - - await api(req, res); - - expect(res.setHeader.mock.calls).toEqual([ - ["Content-Type", "image/svg+xml"], - [ - "Cache-Control", - `max-age=${CONSTANTS.SIX_HOURS / 2}, s-maxage=${ - CONSTANTS.SIX_HOURS - }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`, - ], - ]); - }); - - it("should set proper cache", async () => { - const cache_seconds = 35000; - const { req, res } = faker({ cache_seconds }, data_stats); - await api(req, res); - - expect(res.setHeader.mock.calls).toEqual([ - ["Content-Type", "image/svg+xml"], - [ - "Cache-Control", - `max-age=${ - cache_seconds / 2 - }, s-maxage=${cache_seconds}, stale-while-revalidate=${ - CONSTANTS.ONE_DAY - }`, - ], - ]); - }); - it("should set shorter cache when error", async () => { const { req, res } = faker({}, error); await api(req, res); @@ -217,54 +183,6 @@ describe("Test /api/", () => { ]); }); - it("should set proper cache with clamped values", async () => { - { - let { req, res } = faker({ cache_seconds: 200000 }, data_stats); - await api(req, res); - - expect(res.setHeader.mock.calls).toEqual([ - ["Content-Type", "image/svg+xml"], - [ - "Cache-Control", - `max-age=${CONSTANTS.ONE_DAY / 2}, s-maxage=${ - CONSTANTS.ONE_DAY - }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`, - ], - ]); - } - - // note i'm using block scoped vars - { - let { req, res } = faker({ cache_seconds: 0 }, data_stats); - await api(req, res); - - expect(res.setHeader.mock.calls).toEqual([ - ["Content-Type", "image/svg+xml"], - [ - "Cache-Control", - `max-age=${CONSTANTS.SIX_HOURS / 2}, s-maxage=${ - CONSTANTS.SIX_HOURS - }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`, - ], - ]); - } - - { - let { req, res } = faker({ cache_seconds: -10000 }, data_stats); - await api(req, res); - - expect(res.setHeader.mock.calls).toEqual([ - ["Content-Type", "image/svg+xml"], - [ - "Cache-Control", - `max-age=${CONSTANTS.SIX_HOURS / 2}, s-maxage=${ - CONSTANTS.SIX_HOURS - }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`, - ], - ]); - } - }); - it("should allow changing ring_color", async () => { const { req, res } = faker( { diff --git a/tests/gist.test.js b/tests/gist.test.js index 8654e3da37d0f..bdf95156d5f44 100644 --- a/tests/gist.test.js +++ b/tests/gist.test.js @@ -4,7 +4,7 @@ import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import { expect, it, describe, afterEach } from "@jest/globals"; import { renderGistCard } from "../src/cards/gist-card.js"; -import { renderError, CONSTANTS } from "../src/common/utils.js"; +import { renderError } from "../src/common/utils.js"; import gist from "../api/gist.js"; const gist_data = { @@ -170,27 +170,4 @@ describe("Test /api/gist", () => { renderError("Something went wrong", "Language not found"), ); }); - - it("should have proper cache", async () => { - const req = { - query: { - id: "bbfce31e0217a3689c8d961a356cb10d", - }, - }; - const res = { - setHeader: jest.fn(), - send: jest.fn(), - }; - mock.onPost("https://api.github.com/graphql").reply(200, gist_data); - - await gist(req, res); - - expect(res.setHeader).toBeCalledWith("Content-Type", "image/svg+xml"); - expect(res.setHeader).toBeCalledWith( - "Cache-Control", - `max-age=${CONSTANTS.SIX_HOURS / 2}, s-maxage=${ - CONSTANTS.SIX_HOURS - }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`, - ); - }); }); diff --git a/tests/pin.test.js b/tests/pin.test.js index 105e4450c3805..2583ddfe9e9af 100644 --- a/tests/pin.test.js +++ b/tests/pin.test.js @@ -4,7 +4,7 @@ import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import pin from "../api/pin.js"; import { renderRepoCard } from "../src/cards/repo-card.js"; -import { renderError, CONSTANTS } from "../src/common/utils.js"; +import { renderError } from "../src/common/utils.js"; import { expect, it, describe, afterEach } from "@jest/globals"; const data_repo = { @@ -201,28 +201,4 @@ describe("Test /api/pin", () => { ), ); }); - - it("should have proper cache", async () => { - const req = { - query: { - username: "anuraghazra", - repo: "convoychat", - }, - }; - const res = { - setHeader: jest.fn(), - send: jest.fn(), - }; - mock.onPost("https://api.github.com/graphql").reply(200, data_user); - - await pin(req, res); - - expect(res.setHeader).toBeCalledWith("Content-Type", "image/svg+xml"); - expect(res.setHeader).toBeCalledWith( - "Cache-Control", - `max-age=${CONSTANTS.SIX_HOURS / 2}, s-maxage=${ - CONSTANTS.SIX_HOURS - }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`, - ); - }); }); diff --git a/tests/top-langs.test.js b/tests/top-langs.test.js index 692681b294da6..1c8a45b7b9d48 100644 --- a/tests/top-langs.test.js +++ b/tests/top-langs.test.js @@ -4,7 +4,7 @@ import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import topLangs from "../api/top-langs.js"; import { renderTopLanguages } from "../src/cards/top-languages-card.js"; -import { renderError, CONSTANTS } from "../src/common/utils.js"; +import { renderError } from "../src/common/utils.js"; import { expect, it, describe, afterEach } from "@jest/globals"; const data_langs = { @@ -208,27 +208,4 @@ describe("Test /api/top-langs", () => { renderError("Something went wrong", "Locale not found"), ); }); - - it("should have proper cache", async () => { - const req = { - query: { - username: "anuraghazra", - }, - }; - const res = { - setHeader: jest.fn(), - send: jest.fn(), - }; - mock.onPost("https://api.github.com/graphql").reply(200, data_langs); - - await topLangs(req, res); - - expect(res.setHeader).toBeCalledWith("Content-Type", "image/svg+xml"); - expect(res.setHeader).toBeCalledWith( - "Cache-Control", - `max-age=${CONSTANTS.SIX_HOURS / 2}, s-maxage=${ - CONSTANTS.SIX_HOURS - }, stale-while-revalidate=${CONSTANTS.ONE_DAY}`, - ); - }); });