mirror of
https://github.com/appwrite/console.git
synced 2026-11-18 20:47:21 +00:00
test(auth): assert users limit button state against shipped code
The button-state cases reimplemented the card's `btnDisabled` expression inside the test file, so they asserted against a copy of the logic. The guard could be dropped from the component and every test naming the reported bug would still pass. Fold the derivation into `usersLimitState()`, render the card from it, and drive the tests through it. Verified by mutation: dropping the error guard, dropping the limited-mode guard, and ignoring mode in the changed-check now fail 1, 1 and 2 cases; against the old tests all three passed clean.
This commit is contained in:
1 parent
be6f014f44
commit
6ad4663563
3 files changed
+76
-72
No files matched your search
+6
-8
@@ -11,8 +11,7 @@
|
||||
import {
|
||||
USERS_LIMIT_MAX,
|
||||
USERS_LIMIT_MIN,
|
||||
usersLimitChanged,
|
||||
usersLimitError,
|
||||
usersLimitState,
|
||||
type UsersLimitMode
|
||||
} from './usersLimit';
|
||||
|
||||
@@ -28,8 +27,7 @@
|
||||
let newLimit = $state(policy.total !== 0 ? policy.total : 100);
|
||||
|
||||
const isLimited = $derived(value === 'limited');
|
||||
const limitError = $derived(isLimited ? usersLimitError(newLimit) : null);
|
||||
const btnDisabled = $derived(!!limitError || !usersLimitChanged(value, newLimit, policy.total));
|
||||
const limitState = $derived(usersLimitState(value, newLimit, policy.total));
|
||||
|
||||
async function updateLimit() {
|
||||
try {
|
||||
@@ -81,19 +79,19 @@
|
||||
min={USERS_LIMIT_MIN}
|
||||
max={USERS_LIMIT_MAX}
|
||||
step={1}
|
||||
state={limitError ? 'error' : 'default'}
|
||||
state={limitState.error ? 'error' : 'default'}
|
||||
disabled={!isLimited}
|
||||
bind:value={newLimit} />
|
||||
</Layout.Stack>
|
||||
{#if limitError}
|
||||
<Input.Helper state="error">{limitError}</Input.Helper>
|
||||
{#if limitState.error}
|
||||
<Input.Helper state="error">{limitState.error}</Input.Helper>
|
||||
{/if}
|
||||
</Layout.Stack>
|
||||
</svelte:fragment>
|
||||
|
||||
<svelte:fragment slot="actions">
|
||||
<Button
|
||||
disabled={btnDisabled}
|
||||
disabled={limitState.disabled}
|
||||
on:click={() => {
|
||||
updateLimit();
|
||||
}}>Update</Button>
|
||||
|
||||
@@ -1,70 +1,58 @@
|
||||
import { describe, expect, it } from 'vitest';
|
||||
import {
|
||||
USERS_LIMIT_MAX,
|
||||
USERS_LIMIT_MIN,
|
||||
usersLimitChanged,
|
||||
usersLimitError,
|
||||
type UsersLimitMode
|
||||
} from './usersLimit';
|
||||
import { USERS_LIMIT_MAX, USERS_LIMIT_MIN, usersLimitState } from './usersLimit';
|
||||
|
||||
describe('usersLimitError', () => {
|
||||
it('accepts whole numbers within range', () => {
|
||||
expect(usersLimitError(USERS_LIMIT_MIN)).toBeNull();
|
||||
expect(usersLimitError(100)).toBeNull();
|
||||
expect(usersLimitError(USERS_LIMIT_MAX)).toBeNull();
|
||||
describe('usersLimitState', () => {
|
||||
describe('limited', () => {
|
||||
it('accepts whole numbers within range', () => {
|
||||
expect(usersLimitState('limited', USERS_LIMIT_MIN, 100).error).toBeNull();
|
||||
expect(usersLimitState('limited', 250, 100).error).toBeNull();
|
||||
expect(usersLimitState('limited', USERS_LIMIT_MAX, 100).error).toBeNull();
|
||||
});
|
||||
|
||||
it('explains a limit of 0 instead of leaving Update dead', () => {
|
||||
const state = usersLimitState('limited', 0, 0);
|
||||
|
||||
expect(state.error).toContain('Unlimited');
|
||||
expect(state.disabled).toBe(true);
|
||||
});
|
||||
|
||||
it('refuses to save 0, which the API would read as no limit', () => {
|
||||
expect(usersLimitState('limited', 0, 100).disabled).toBe(true);
|
||||
});
|
||||
|
||||
it('rejects a cleared field', () => {
|
||||
expect(usersLimitState('limited', undefined, 100).error).not.toBeNull();
|
||||
expect(usersLimitState('limited', NaN, 100).error).not.toBeNull();
|
||||
});
|
||||
|
||||
it('rejects values outside the accepted range', () => {
|
||||
expect(usersLimitState('limited', -1, 100).error).not.toBeNull();
|
||||
expect(usersLimitState('limited', USERS_LIMIT_MAX + 1, 100).error).not.toBeNull();
|
||||
expect(usersLimitState('limited', 1.5, 100).error).not.toBeNull();
|
||||
});
|
||||
|
||||
it('enables Update for a valid new limit', () => {
|
||||
expect(usersLimitState('limited', 100, 0).disabled).toBe(false);
|
||||
expect(usersLimitState('limited', 1, 100).disabled).toBe(false);
|
||||
});
|
||||
|
||||
it('disables Update when the limit is unchanged', () => {
|
||||
expect(usersLimitState('limited', 100, 100).disabled).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
it('rejects zero, which the API reads as no limit', () => {
|
||||
expect(usersLimitError(0)).not.toBeNull();
|
||||
});
|
||||
describe('unlimited', () => {
|
||||
it('ignores whatever the disabled limit field holds', () => {
|
||||
expect(usersLimitState('unlimited', 0, 100).error).toBeNull();
|
||||
expect(usersLimitState('unlimited', undefined, 100).error).toBeNull();
|
||||
});
|
||||
|
||||
it('rejects a cleared input', () => {
|
||||
expect(usersLimitError(undefined)).not.toBeNull();
|
||||
expect(usersLimitError(NaN)).not.toBeNull();
|
||||
});
|
||||
it('enables Update when a limit is being removed', () => {
|
||||
expect(usersLimitState('unlimited', 100, 100).disabled).toBe(false);
|
||||
});
|
||||
|
||||
it('rejects values outside the accepted range', () => {
|
||||
expect(usersLimitError(-1)).not.toBeNull();
|
||||
expect(usersLimitError(USERS_LIMIT_MAX + 1)).not.toBeNull();
|
||||
expect(usersLimitError(1.5)).not.toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe('usersLimitChanged', () => {
|
||||
it('detects a new limit on a limited project', () => {
|
||||
expect(usersLimitChanged('limited', 200, 100)).toBe(true);
|
||||
expect(usersLimitChanged('limited', 100, 100)).toBe(false);
|
||||
});
|
||||
|
||||
it('detects switching between limited and unlimited', () => {
|
||||
expect(usersLimitChanged('limited', 100, 0)).toBe(true);
|
||||
expect(usersLimitChanged('unlimited', 100, 100)).toBe(true);
|
||||
expect(usersLimitChanged('unlimited', 100, 0)).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe('update button state', () => {
|
||||
const isDisabled = (mode: UsersLimitMode, limit: number, total: number) =>
|
||||
(mode === 'limited' && usersLimitError(limit) !== null) ||
|
||||
!usersLimitChanged(mode, limit, total);
|
||||
|
||||
it('explains a limit of 0 instead of silently blocking the update', () => {
|
||||
expect(isDisabled('limited', 0, 0)).toBe(true);
|
||||
expect(usersLimitError(0)).toContain('Unlimited');
|
||||
});
|
||||
|
||||
it('never submits a limit of 0 as a limit', () => {
|
||||
expect(isDisabled('limited', 0, 100)).toBe(true);
|
||||
});
|
||||
|
||||
it('enables the update for a valid change', () => {
|
||||
expect(isDisabled('limited', 100, 0)).toBe(false);
|
||||
expect(isDisabled('limited', 1, 100)).toBe(false);
|
||||
expect(isDisabled('unlimited', 100, 100)).toBe(false);
|
||||
});
|
||||
|
||||
it('ignores the limit field while unlimited is selected', () => {
|
||||
expect(isDisabled('unlimited', 0, 100)).toBe(false);
|
||||
expect(isDisabled('unlimited', 0, 0)).toBe(true);
|
||||
it('disables Update when there is no limit to remove', () => {
|
||||
expect(usersLimitState('unlimited', 100, 0).disabled).toBe(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -3,8 +3,13 @@ export const USERS_LIMIT_MAX = 10000;
|
||||
|
||||
export type UsersLimitMode = 'limited' | 'unlimited';
|
||||
|
||||
export type UsersLimitState = {
|
||||
error: string | null;
|
||||
disabled: boolean;
|
||||
};
|
||||
|
||||
// The API reserves `total: 0` for "no limit", so `limited` cannot represent zero.
|
||||
export function usersLimitError(limit: number): string | null {
|
||||
function limitError(limit: number): string | null {
|
||||
if (!Number.isInteger(limit) || limit < USERS_LIMIT_MIN || limit > USERS_LIMIT_MAX) {
|
||||
return `Enter a whole number between ${USERS_LIMIT_MIN} and ${USERS_LIMIT_MAX}, or select "Unlimited" to allow any number of users.`;
|
||||
}
|
||||
@@ -12,6 +17,19 @@ export function usersLimitError(limit: number): string | null {
|
||||
return null;
|
||||
}
|
||||
|
||||
export function usersLimitChanged(mode: UsersLimitMode, limit: number, total: number): boolean {
|
||||
function limitChanged(mode: UsersLimitMode, limit: number, total: number): boolean {
|
||||
return mode === 'limited' ? limit !== total : total !== 0;
|
||||
}
|
||||
|
||||
export function usersLimitState(
|
||||
mode: UsersLimitMode,
|
||||
limit: number,
|
||||
total: number
|
||||
): UsersLimitState {
|
||||
const error = mode === 'limited' ? limitError(limit) : null;
|
||||
|
||||
return {
|
||||
error,
|
||||
disabled: error !== null || !limitChanged(mode, limit, total)
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user