be41c48c27
Fixes #1358 - Adds `extraExecMinutes` and `giftedExecMinutes` org quotas, which are not reset monthly but are updateable amounts that carry across months - Adds `quotaUpdate` field to `Organization` to track when quotas were updated with timestamp - Adds `extraExecMinutesAvailable` and `giftedExecMinutesAvailable` fields to `Organization` to help with tracking available time left (includes tested migration to initialize these to 0) - Modifies org backend to track time across multiple categories, using monthlyExecSeconds, then giftedExecSeconds, then extraExecSeconds. All time is also written into crawlExecSeconds, which is now the monthly total and also contains any overage time above the quotas - Updates Dashboard crawling meter to include all types of execution time if `extraExecMinutes` and/or `giftedExecMinutes` are set above 0 - Updates Dashboard Usage History table to include all types of execution time (only displaying columns that have data) - Adds backend nightly test to check handling of quotas and execution time - Includes migration to add new fields and copy crawlExecSeconds to monthlyExecSeconds for previous months Co-authored-by: emma <hi@emma.cafe>
89 lines
3.4 KiB
TypeScript
89 lines
3.4 KiB
TypeScript
import {
|
|
humanizeSeconds,
|
|
humanizeExecutionSeconds,
|
|
} from "./executionTimeFormatter";
|
|
import { expect, fixture } from "@open-wc/testing";
|
|
|
|
describe("formatHours", () => {
|
|
it("returns a time in hours and minutes when given a time over an hour", () => {
|
|
expect(humanizeSeconds(12_345, "en-US")).to.equal("3h 26m");
|
|
});
|
|
it("returns 1m when given a time under a minute", () => {
|
|
expect(humanizeSeconds(24, "en-US")).to.equal("1m");
|
|
});
|
|
it("returns 0m and seconds when given a time under a minute with seconds on", () => {
|
|
expect(humanizeSeconds(24, "en-US", true)).to.equal("0m 24s");
|
|
});
|
|
it("returns minutes when given a time under an hour", () => {
|
|
expect(humanizeSeconds(1_234, "en-US")).to.equal("21m");
|
|
});
|
|
it("returns just hours when given a time exactly in hours", () => {
|
|
expect(humanizeSeconds(3_600, "en-US")).to.equal("1h");
|
|
expect(humanizeSeconds(44_442_000, "en-US")).to.equal("12,345h");
|
|
});
|
|
it("handles different locales correctly", () => {
|
|
expect(humanizeSeconds(44_442_000_000, "en-IN")).to.equal("1,23,45,000h");
|
|
expect(humanizeSeconds(44_442_000_000, "pt-BR")).to.equal("12.345.000 h");
|
|
expect(humanizeSeconds(44_442_000_000, "de-DE")).to.equal(
|
|
"12.345.000 Std."
|
|
);
|
|
expect(humanizeSeconds(44_442_000_000, "ar-EG")).to.equal("١٢٬٣٤٥٬٠٠٠ س");
|
|
});
|
|
it("formats zero time as expected", () => {
|
|
expect(humanizeSeconds(0, "en-US")).to.equal("0m");
|
|
});
|
|
it("formats zero time as expected", () => {
|
|
expect(humanizeSeconds(0, "en-US", true)).to.equal("0s");
|
|
});
|
|
it("formats negative time as expected", () => {
|
|
expect(() => humanizeSeconds(-100, "en-US")).to.throw(
|
|
"humanizeSeconds in unimplemented for negative times"
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("humanizeExecutionSeconds", () => {
|
|
it("formats a given time in billable minutes", async () => {
|
|
const parentNode = document.createElement("div");
|
|
const el = await fixture(humanizeExecutionSeconds(1_234_567_890), {
|
|
parentNode,
|
|
});
|
|
expect(el.getAttribute("title")).to.equal("20,576,132 minutes");
|
|
expect(el.textContent?.trim()).to.equal("21M minutes");
|
|
expect(parentNode.innerText).to.equal("21M minutes\u00a0(342,935h 32m)");
|
|
});
|
|
|
|
it("shows a short version when set", async () => {
|
|
const parentNode = document.createElement("div");
|
|
const el = await fixture(
|
|
humanizeExecutionSeconds(1_234_567_890, { style: "short" }),
|
|
{
|
|
parentNode,
|
|
}
|
|
);
|
|
expect(el.getAttribute("title")).to.equal(
|
|
"20,576,132 minutes\u00a0(342,935h 32m)"
|
|
);
|
|
expect(el.textContent?.trim()).to.equal("21M min");
|
|
expect(parentNode.innerText).to.equal("21M min");
|
|
});
|
|
it("skips the details when given a time less than an hour that is exactly in minutes", async () => {
|
|
const parentNode = document.createElement("div");
|
|
const el = await fixture(humanizeExecutionSeconds(3_540), {
|
|
parentNode,
|
|
});
|
|
expect(el.getAttribute("title")).to.equal("59 minutes");
|
|
expect(el.textContent?.trim()).to.equal("59 minutes");
|
|
expect(parentNode.innerText).to.equal("59 minutes");
|
|
});
|
|
it("rounds minutes down when set", async () => {
|
|
const parentNode = document.createElement("div");
|
|
const el = await fixture(humanizeExecutionSeconds(90, { round: "down" }), {
|
|
parentNode,
|
|
});
|
|
expect(el.getAttribute("title")).to.equal("1 minute");
|
|
expect(el.textContent?.trim()).to.equal("1 minute");
|
|
expect(parentNode.innerText).to.equal("1 minute");
|
|
});
|
|
});
|