Make layout tests more concise
This commit is contained in:
Robin
@@ -5,198 +5,105 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
|||||||
Please see LICENSE in the repository root for full details.
|
Please see LICENSE in the repository root for full details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { afterEach, beforeEach, describe, expect, test } from "vitest";
|
import { describe, test } from "vitest";
|
||||||
import { firstValueFrom, of } from "rxjs";
|
|
||||||
|
|
||||||
import { createLayoutModeSwitch } from "./LayoutSwitch";
|
import { createLayoutModeSwitch } from "./LayoutSwitch";
|
||||||
import { ObservableScope } from "../ObservableScope";
|
import { testScope, withTestScheduler } from "../../utils/test";
|
||||||
import { constant } from "../Behavior";
|
|
||||||
import { withTestScheduler } from "../../utils/test";
|
|
||||||
|
|
||||||
let scope: ObservableScope;
|
function testLayoutSwitch({
|
||||||
beforeEach(() => {
|
windowMode = "n",
|
||||||
scope = new ObservableScope();
|
hasScreenShares = "n",
|
||||||
});
|
userSelection = "",
|
||||||
afterEach(() => {
|
expectedGridMode,
|
||||||
scope.end();
|
}: {
|
||||||
});
|
windowMode?: string;
|
||||||
|
hasScreenShares?: string;
|
||||||
describe("Default mode", () => {
|
userSelection?: string;
|
||||||
test("Should be in grid layout by default", async () => {
|
expectedGridMode: string;
|
||||||
const { gridMode$ } = createLayoutModeSwitch(
|
}): void {
|
||||||
scope,
|
withTestScheduler(({ behavior, schedule, expectObservable }) => {
|
||||||
constant("normal"),
|
|
||||||
of(false),
|
|
||||||
);
|
|
||||||
|
|
||||||
const mode = await firstValueFrom(gridMode$);
|
|
||||||
expect(mode).toBe("grid");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("Should switch to spotlight mode when window mode is flat", async () => {
|
|
||||||
const { gridMode$ } = createLayoutModeSwitch(
|
|
||||||
scope,
|
|
||||||
constant("flat"),
|
|
||||||
of(false),
|
|
||||||
);
|
|
||||||
|
|
||||||
const mode = await firstValueFrom(gridMode$);
|
|
||||||
expect(mode).toBe("spotlight");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("Should allow switching modes manually", () => {
|
|
||||||
withTestScheduler(({ cold, behavior, expectObservable, schedule }): void => {
|
|
||||||
const { gridMode$, setGridMode } = createLayoutModeSwitch(
|
const { gridMode$, setGridMode } = createLayoutModeSwitch(
|
||||||
scope,
|
testScope(),
|
||||||
behavior("n", { n: "normal" }),
|
behavior(windowMode, { n: "normal", N: "narrow", f: "flat" }),
|
||||||
cold("f", { f: false, t: true }),
|
behavior(hasScreenShares, { y: true, n: false }),
|
||||||
);
|
);
|
||||||
|
schedule(userSelection, {
|
||||||
schedule("--sgs", {
|
|
||||||
s: () => setGridMode("spotlight"),
|
|
||||||
g: () => setGridMode("grid"),
|
|
||||||
});
|
|
||||||
|
|
||||||
expectObservable(gridMode$).toBe("g-sgs", {
|
|
||||||
g: "grid",
|
|
||||||
s: "spotlight",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("Should switch to spotlight mode when there is a remote screen share", () => {
|
|
||||||
withTestScheduler(({ cold, behavior, expectObservable }): void => {
|
|
||||||
const shareMarble = "f--t";
|
|
||||||
const gridsMarble = "g--s";
|
|
||||||
const { gridMode$ } = createLayoutModeSwitch(
|
|
||||||
scope,
|
|
||||||
behavior("n", { n: "normal" }),
|
|
||||||
cold(shareMarble, { f: false, t: true }),
|
|
||||||
);
|
|
||||||
|
|
||||||
expectObservable(gridMode$).toBe(gridsMarble, {
|
|
||||||
g: "grid",
|
|
||||||
s: "spotlight",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("Can manually force grid when there is a screenshare", () => {
|
|
||||||
withTestScheduler(({ cold, behavior, expectObservable, schedule }): void => {
|
|
||||||
const { gridMode$, setGridMode } = createLayoutModeSwitch(
|
|
||||||
scope,
|
|
||||||
behavior("n", { n: "normal" }),
|
|
||||||
cold("-ft", { f: false, t: true }),
|
|
||||||
);
|
|
||||||
|
|
||||||
schedule("---g", {
|
|
||||||
g: () => setGridMode("grid"),
|
|
||||||
});
|
|
||||||
|
|
||||||
expectObservable(gridMode$).toBe("ggsg", {
|
|
||||||
g: "grid",
|
|
||||||
s: "spotlight",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("Should auto-switch after manually selected grid", () => {
|
|
||||||
withTestScheduler(({ cold, behavior, expectObservable, schedule }): void => {
|
|
||||||
const { gridMode$, setGridMode } = createLayoutModeSwitch(
|
|
||||||
scope,
|
|
||||||
behavior("n", { n: "normal" }),
|
|
||||||
// Two screenshares will happen in sequence
|
|
||||||
cold("-ft-ft", { f: false, t: true }),
|
|
||||||
);
|
|
||||||
|
|
||||||
// There was a screen-share that forced spotlight, then
|
|
||||||
// the user manually switch back to grid
|
|
||||||
schedule("---g", {
|
|
||||||
g: () => setGridMode("grid"),
|
|
||||||
});
|
|
||||||
|
|
||||||
// If we did want to respect manual selection, the expectation would be:
|
|
||||||
// const expectation = "ggsg";
|
|
||||||
const expectation = "ggsg-s";
|
|
||||||
|
|
||||||
expectObservable(gridMode$).toBe(expectation, {
|
|
||||||
g: "grid",
|
|
||||||
s: "spotlight",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("Should switch back to grid mode when the remote screen share ends", () => {
|
|
||||||
withTestScheduler(({ cold, behavior, expectObservable }): void => {
|
|
||||||
const shareMarble = "f--t--f-";
|
|
||||||
const gridsMarble = "g--s--g-";
|
|
||||||
const { gridMode$ } = createLayoutModeSwitch(
|
|
||||||
scope,
|
|
||||||
behavior("n", { n: "normal" }),
|
|
||||||
cold(shareMarble, { f: false, t: true }),
|
|
||||||
);
|
|
||||||
|
|
||||||
expectObservable(gridMode$).toBe(gridsMarble, {
|
|
||||||
g: "grid",
|
|
||||||
s: "spotlight",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("can auto-switch to spotlight again after first screen share ends", () => {
|
|
||||||
withTestScheduler(({ cold, behavior, expectObservable }): void => {
|
|
||||||
const shareMarble = "ftft";
|
|
||||||
const gridsMarble = "gsgs";
|
|
||||||
const { gridMode$ } = createLayoutModeSwitch(
|
|
||||||
scope,
|
|
||||||
behavior("n", { n: "normal" }),
|
|
||||||
cold(shareMarble, { f: false, t: true }),
|
|
||||||
);
|
|
||||||
|
|
||||||
expectObservable(gridMode$).toBe(gridsMarble, {
|
|
||||||
g: "grid",
|
|
||||||
s: "spotlight",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("can switch manually to grid after screen share while manually in spotlight", () => {
|
|
||||||
withTestScheduler(({ cold, behavior, schedule, expectObservable }): void => {
|
|
||||||
// Initially, no one is sharing. Then the user manually switches to
|
|
||||||
// spotlight. After a screen share starts, the user manually switches to
|
|
||||||
// grid.
|
|
||||||
const shareMarbles = " f-t-";
|
|
||||||
const setModeMarbles = "-s-g";
|
|
||||||
const expectation = " gs-g";
|
|
||||||
const { gridMode$, setGridMode } = createLayoutModeSwitch(
|
|
||||||
scope,
|
|
||||||
behavior("n", { n: "normal" }),
|
|
||||||
cold(shareMarbles, { f: false, t: true }),
|
|
||||||
);
|
|
||||||
schedule(setModeMarbles, {
|
|
||||||
g: () => setGridMode("grid"),
|
g: () => setGridMode("grid"),
|
||||||
s: () => setGridMode("spotlight"),
|
s: () => setGridMode("spotlight"),
|
||||||
});
|
});
|
||||||
|
expectObservable(gridMode$).toBe(expectedGridMode, {
|
||||||
expectObservable(gridMode$).toBe(expectation, {
|
|
||||||
g: "grid",
|
g: "grid",
|
||||||
s: "spotlight",
|
s: "spotlight",
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("default mode", () => {
|
||||||
|
test("uses grid layout by default", () =>
|
||||||
|
testLayoutSwitch({
|
||||||
|
expectedGridMode: "g",
|
||||||
|
}));
|
||||||
|
|
||||||
|
test("uses spotlight mode when window mode is flat", () =>
|
||||||
|
testLayoutSwitch({
|
||||||
|
windowMode: " f",
|
||||||
|
expectedGridMode: "s",
|
||||||
|
}));
|
||||||
});
|
});
|
||||||
|
|
||||||
test("Should auto-switch to spotlight when in flat window mode", () => {
|
test("allows switching modes manually", () =>
|
||||||
withTestScheduler(({ cold, behavior, expectObservable }): void => {
|
testLayoutSwitch({
|
||||||
const { gridMode$ } = createLayoutModeSwitch(
|
userSelection: " --sgs",
|
||||||
scope,
|
expectedGridMode: "g-sgs",
|
||||||
behavior("naf", { n: "normal", a: "narrow", f: "flat" }),
|
}));
|
||||||
cold("f", { f: false, t: true }),
|
|
||||||
);
|
|
||||||
|
|
||||||
expectObservable(gridMode$).toBe("g-s-", {
|
test("switches to spotlight mode when there is a remote screen share", () =>
|
||||||
g: "grid",
|
testLayoutSwitch({
|
||||||
s: "spotlight",
|
hasScreenShares: " n--y",
|
||||||
});
|
expectedGridMode: "g--s",
|
||||||
});
|
}));
|
||||||
});
|
|
||||||
|
test("can manually switch to grid when there is a screenshare", () =>
|
||||||
|
testLayoutSwitch({
|
||||||
|
hasScreenShares: " n-y",
|
||||||
|
userSelection: " ---g",
|
||||||
|
expectedGridMode: "g-sg",
|
||||||
|
}));
|
||||||
|
|
||||||
|
test("auto-switches after manually selecting grid", () =>
|
||||||
|
testLayoutSwitch({
|
||||||
|
// Two screenshares will happen in sequence. There is a screen share that
|
||||||
|
// forces spotlight, then the user manually switches back to grid.
|
||||||
|
hasScreenShares: " n-y-ny",
|
||||||
|
userSelection: " ---g",
|
||||||
|
expectedGridMode: "g-sg-s",
|
||||||
|
// If we did want to respect manual selection, the expectation would be: g-sg
|
||||||
|
}));
|
||||||
|
|
||||||
|
test("switches back to grid mode when the remote screen share ends", () =>
|
||||||
|
testLayoutSwitch({
|
||||||
|
hasScreenShares: " n--y--n",
|
||||||
|
expectedGridMode: "g--s--g",
|
||||||
|
}));
|
||||||
|
|
||||||
|
test("auto-switches to spotlight again after first screen share ends", () =>
|
||||||
|
testLayoutSwitch({
|
||||||
|
hasScreenShares: " nyny",
|
||||||
|
expectedGridMode: "gsgs",
|
||||||
|
}));
|
||||||
|
|
||||||
|
test("switches manually to grid after screen share while manually in spotlight", () =>
|
||||||
|
testLayoutSwitch({
|
||||||
|
// Initially, no one is sharing. Then the user manually switches to spotlight.
|
||||||
|
// After a screen share starts, the user manually switches to grid.
|
||||||
|
hasScreenShares: " n-y",
|
||||||
|
userSelection: " -s-g",
|
||||||
|
expectedGridMode: "gs-g",
|
||||||
|
}));
|
||||||
|
|
||||||
|
test("auto-switches to spotlight when in flat window mode", () =>
|
||||||
|
testLayoutSwitch({
|
||||||
|
// First normal, then narrow, then flat.
|
||||||
|
windowMode: " nNf",
|
||||||
|
expectedGridMode: "g-s",
|
||||||
|
}));
|
||||||
|
|||||||
Reference in New Issue
Block a user