mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-10-30 17:52:26 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 dependabot[bot]
|
57970c4519 |
Generated
+16
-34
@@ -6,15 +6,15 @@
|
||||
"": {
|
||||
"name": "odysseus",
|
||||
"devDependencies": {
|
||||
"@antithesishq/bombadil": "^0.7.0",
|
||||
"@playwright/test": "^1.62.1",
|
||||
"@antithesishq/bombadil": "^0.7.10",
|
||||
"@playwright/test": "^1.64.1",
|
||||
"acorn": "8.19.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@antithesishq/bombadil": {
|
||||
"version": "0.7.0",
|
||||
"resolved": "https://registry.npmjs.org/@antithesishq/bombadil/-/bombadil-0.7.0.tgz",
|
||||
"integrity": "sha512-alJmnphJ/iUoL5mCsnV3DwtajGy/sEQ3NJJCiMhgjqXshSq2BUtAs0vqdXEiiSkB8HbsOX5CLrAcaogYdwfAJg==",
|
||||
"version": "0.7.10",
|
||||
"resolved": "https://registry.npmjs.org/@antithesishq/bombadil/-/bombadil-0.7.10.tgz",
|
||||
"integrity": "sha512-71aLKQBB3GNDBQZXU6MCKbt99dl9I+/pjg0EfGD9eCKXDIqpKPXD2rFH6yCJude37RGtnKq6hZFfZhuTp+Tykg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
@@ -22,13 +22,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@playwright/test": {
|
||||
"version": "1.62.1",
|
||||
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.62.1.tgz",
|
||||
"integrity": "sha512-DTcUc8qii+cpHvtOwggMtBRMjKZHXYWdw8syRYu2vtzuq4Wxphqq4NfCs5Zt44L6mA8rfDfj+PHnxFc/FeK6mQ==",
|
||||
"version": "1.64.1",
|
||||
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.64.1.tgz",
|
||||
"integrity": "sha512-IaYGml/nSOiZWROfPtuIL7neuu9qDOZ3TNvNljUIrhDMxiGTgPjzj/g9p9RxpS2tSepPDRY+UwAaEeiKtUvIAg==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"playwright": "1.62.1"
|
||||
"playwright": "1.64.1"
|
||||
},
|
||||
"bin": {
|
||||
"playwright": "cli.js"
|
||||
@@ -50,44 +50,26 @@
|
||||
"node": ">=0.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/fsevents": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
||||
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright": {
|
||||
"version": "1.62.1",
|
||||
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.62.1.tgz",
|
||||
"integrity": "sha512-0M+L3LAD8/nm554LOla9Ayx0j0tmFZ0FBcoQ7F1VuVHpM/XpiC8RcDzBQB8W5+hA8L22THxELzeF+2WcUzvcLg==",
|
||||
"version": "1.64.1",
|
||||
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.64.1.tgz",
|
||||
"integrity": "sha512-HCrVhHr5QQuwYoswEUGTb7gGp522yflbv/ST8nF4sFWGuLjQCt17Q/EubpGGSNKYn1tsTCPZxqHhHCfVURu7UA==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"playwright-core": "1.62.1"
|
||||
"playwright-core": "1.64.1"
|
||||
},
|
||||
"bin": {
|
||||
"playwright": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"fsevents": "2.3.2"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright-core": {
|
||||
"version": "1.62.1",
|
||||
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.62.1.tgz",
|
||||
"integrity": "sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==",
|
||||
"version": "1.64.1",
|
||||
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.64.1.tgz",
|
||||
"integrity": "sha512-BC4s8y6SEVA6Q1rSxZTto8hI1KUI3xXlHGZgvGqP4IqPdI/a6FX9H29IDNz7vKo9l21b6LfYosScPL6M3xxyDQ==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
"test:ios-layout:install": "playwright install chromium webkit"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antithesishq/bombadil": "^0.7.0",
|
||||
"@playwright/test": "^1.62.1",
|
||||
"@antithesishq/bombadil": "^0.7.10",
|
||||
"@playwright/test": "^1.64.1",
|
||||
"acorn": "8.19.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5759,20 +5759,7 @@ function _updateBrushCursor(e) {
|
||||
state.cursorEl.style.height = diameterY + 'px';
|
||||
}
|
||||
state.cursorEl.classList.toggle('ge-brush-cursor--pixel', pixelBrush);
|
||||
// Updating an inline style on every move invalidates document-wide :has()
|
||||
// selectors. A paused animation keeps the same transform in the rendering
|
||||
// pipeline without mutating the cursor's style attribute on every frame.
|
||||
const cursorTransform = `translate3d(${clientX - diameterX / 2}px, ${clientY - diameterY / 2}px, 0)`;
|
||||
if (!state.cursorEl._positionAnimation || state.cursorEl._positionAnimation.playState === 'idle') {
|
||||
state.cursorEl._positionAnimation = state.cursorEl.animate(
|
||||
[{ transform: cursorTransform }, { transform: cursorTransform }],
|
||||
{ duration: 1, fill: 'both' },
|
||||
);
|
||||
state.cursorEl._positionAnimation.pause();
|
||||
state.cursorEl._positionAnimation.currentTime = 0;
|
||||
} else {
|
||||
state.cursorEl._positionAnimation.effect.setKeyframes([{ transform: cursorTransform }, { transform: cursorTransform }]);
|
||||
}
|
||||
state.cursorEl.style.transform = `translate3d(${clientX - diameterX / 2}px, ${clientY - diameterY / 2}px, 0)`;
|
||||
if (state.cursorEl.style.display !== 'block') {
|
||||
state.cursorEl.style.display = 'block';
|
||||
}
|
||||
@@ -14074,20 +14061,7 @@ export function closeEditor(options = {}) {
|
||||
const h = state.editorDocClickHandlers.pop();
|
||||
try { document.removeEventListener('click', h); } catch {}
|
||||
}
|
||||
if (_cursorRaf) { cancelAnimationFrame(_cursorRaf); _cursorRaf = null; }
|
||||
_pendingCursorEvent = null;
|
||||
_lastCursorRect = null;
|
||||
state._lastCursorDiameterX = null;
|
||||
state._lastCursorDiameterY = null;
|
||||
state._lastCursorBorderColor = null;
|
||||
if (state.cursorEl) {
|
||||
if (state.cursorEl._positionAnimation) {
|
||||
try { state.cursorEl._positionAnimation.cancel(); } catch {}
|
||||
state.cursorEl._positionAnimation = null;
|
||||
}
|
||||
state.cursorEl.remove();
|
||||
state.cursorEl = null;
|
||||
}
|
||||
if (state.cursorEl) { state.cursorEl.remove(); state.cursorEl = null; }
|
||||
try { document.getElementById('ge-cursor-layer')?.remove(); } catch {}
|
||||
// Tear down all floating popups + the dock so closing the editor
|
||||
// doesn't leave stale chips/panels behind on top of the gallery.
|
||||
|
||||
@@ -99,10 +99,8 @@ cleanup. Specifically:
|
||||
`os.environ[...] = ...` that outlives the test.
|
||||
- **Current working directory** - never `chdir` without restoring; never assert
|
||||
against cwd-relative paths like `./data`. Use a temp workspace helper instead.
|
||||
- **Database** - the root `conftest.py` defaults `DATABASE_URL` to a private,
|
||||
worker-owned SQLite file for collection safety and consistent schema across
|
||||
TestClient threads. This fallback is not a per-test data fixture. A test that
|
||||
writes or depends on particular rows must opt
|
||||
- **Database** - the root `conftest.py` defaults `DATABASE_URL` to an in-memory
|
||||
SQLite for collection safety. A test that needs a real file-backed DB must opt
|
||||
in explicitly via `tests.helpers.sqlite_db.make_temp_sqlite` and bind its
|
||||
`SessionLocal` onto the module under test. Do not rely on a persistent
|
||||
on-disk DB existing.
|
||||
|
||||
+1
-14
@@ -12,17 +12,9 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
# File-backed databases remain fixture-owned. Cleanup restores the caller.
|
||||
# Keep the existing generated environment-reference locations stable.
|
||||
_database_environment = pytest.MonkeyPatch()
|
||||
_database_environment.setenv("DATABASE_URL", "sqlite:///:memory:")
|
||||
from tests.helpers.worker_runtime import bootstrap_runtime, configure_runtime
|
||||
_runtime_environment = bootstrap_runtime()
|
||||
# A file keeps the collection schema consistent across TestClient threads;
|
||||
# SingletonThreadPool can evict the populated in-memory main-thread database.
|
||||
# One patcher owns this variable, including restoration of an inherited URL.
|
||||
_database_environment.setenv(
|
||||
"DATABASE_URL",
|
||||
f"sqlite:///{_runtime_environment.root / 'collection.db'}"
|
||||
if _runtime_environment is not None else "sqlite:///:memory:",
|
||||
)
|
||||
_collection_database_engine = None
|
||||
|
||||
# Pre-import real heavy modules BEFORE any test file's module-level stubs can
|
||||
# replace them with MagicMock. Some test files (e.g. test_llm_core_sanitize_*)
|
||||
@@ -34,7 +26,6 @@ try:
|
||||
import sqlalchemy.orm # noqa: F401
|
||||
import core.database # noqa: F401
|
||||
import src.database
|
||||
_collection_database_engine = core.database.engine
|
||||
except ImportError:
|
||||
pass # not installed - the stubs below will handle it
|
||||
|
||||
@@ -109,10 +100,6 @@ def pytest_configure(config):
|
||||
only registers marker names; it imports no production module.
|
||||
"""
|
||||
config.add_cleanup(_database_environment.undo)
|
||||
if _collection_database_engine is not None:
|
||||
# Registered after runtime cleanup, so connections close before the
|
||||
# owned file is removed (also required on Windows).
|
||||
config.add_cleanup(_collection_database_engine.dispose)
|
||||
|
||||
import pathlib
|
||||
from tests._taxonomy import discover_markers
|
||||
|
||||
@@ -46,475 +46,3 @@ test('brush cursor matches the rendered brush diameter and replaces the crosshai
|
||||
await expect.poll(async () => (await cursor.boundingBox()).width)
|
||||
.toBeCloseTo(measurements.expectedWidth * 2, 1);
|
||||
});
|
||||
|
||||
|
||||
test('brush cursor follows the pointer before, during, and after a stroke and cancels animations on close', async ({ page }) => {
|
||||
await openBlankEditor(page, { width: 400, height: 300 });
|
||||
await selectTool(page, 'brush');
|
||||
const canvas = await page.locator('.ge-main-canvas').boundingBox();
|
||||
const cursor = page.locator('.ge-brush-cursor');
|
||||
const checkCenter = async (x, y) => {
|
||||
await expect.poll(async () => {
|
||||
const box = await cursor.boundingBox();
|
||||
return box ? Math.max(Math.abs(box.x + box.width / 2 - x), Math.abs(box.y + box.height / 2 - y)) : Infinity;
|
||||
}).toBeLessThan(1);
|
||||
};
|
||||
const a = { x: canvas.x + canvas.width * 0.3, y: canvas.y + canvas.height * 0.4 };
|
||||
const b = { x: canvas.x + canvas.width * 0.7, y: canvas.y + canvas.height * 0.6 };
|
||||
await page.mouse.move(a.x, a.y);
|
||||
await checkCenter(a.x, a.y);
|
||||
await page.mouse.down();
|
||||
await page.mouse.move(b.x, b.y, { steps: 8 });
|
||||
await checkCenter(b.x, b.y);
|
||||
await page.mouse.up();
|
||||
await page.mouse.move(a.x, a.y);
|
||||
await checkCenter(a.x, a.y);
|
||||
|
||||
// 1. Ensure at least one animation exists before checking cancellation
|
||||
// 2. Verify the actual cursor-position animation is paused while active
|
||||
const activeAnimation = await page.evaluate(() => {
|
||||
const cursorEl = document.querySelector('.ge-brush-cursor');
|
||||
const anims = cursorEl ? cursorEl.getAnimations() : [];
|
||||
return {
|
||||
count: anims.length,
|
||||
hasPositionAnim: Boolean(cursorEl?._positionAnimation),
|
||||
positionAnimPaused: cursorEl?._positionAnimation?.playState === 'paused',
|
||||
positionAnimCurrentTime: cursorEl?._positionAnimation?.currentTime,
|
||||
allPaused: anims.length > 0 && anims.every(a => a.playState === 'paused'),
|
||||
};
|
||||
});
|
||||
expect(activeAnimation.count).toBeGreaterThanOrEqual(1);
|
||||
expect(activeAnimation.hasPositionAnim).toBe(true);
|
||||
expect(activeAnimation.positionAnimPaused).toBe(true);
|
||||
expect(activeAnimation.positionAnimCurrentTime).toBe(0);
|
||||
expect(activeAnimation.allPaused).toBe(true);
|
||||
|
||||
// 3. Verify it is canceled when the editor closes
|
||||
// 4. Ensure temporary test-only references are cleaned up
|
||||
const closeOutcome = await page.evaluate(async () => {
|
||||
const cursorEl = document.querySelector('.ge-brush-cursor');
|
||||
const anims = cursorEl ? cursorEl.getAnimations() : [];
|
||||
const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
|
||||
editor.closeEditor({ force: true });
|
||||
return {
|
||||
trackedCount: anims.length,
|
||||
allIdle: anims.length > 0 && anims.every(a => a.playState === 'idle'),
|
||||
states: anims.map(a => a.playState),
|
||||
};
|
||||
});
|
||||
await expect(cursor).toHaveCount(0);
|
||||
expect(closeOutcome.trackedCount).toBeGreaterThanOrEqual(1);
|
||||
expect(closeOutcome.allIdle).toBe(true);
|
||||
expect(closeOutcome.states.every(s => s === 'idle')).toBe(true);
|
||||
|
||||
// Verify no temporary references linger on window
|
||||
const windowClean = await page.evaluate(() => {
|
||||
return !('__cursorAnimationsForTest' in window) && !('__styleTransformMutations' in window);
|
||||
});
|
||||
expect(windowClean).toBe(true);
|
||||
});
|
||||
|
||||
|
||||
test('steady pointer movement does not perform repeated inline style-transform writes', async ({ page }) => {
|
||||
await openBlankEditor(page, { width: 400, height: 300 });
|
||||
await selectTool(page, 'brush');
|
||||
|
||||
const canvas = await page.locator('.ge-main-canvas').boundingBox();
|
||||
const cursor = page.locator('.ge-brush-cursor');
|
||||
|
||||
// Warm up the cursor first: move pointer onto canvas
|
||||
const startX = canvas.x + canvas.width * 0.25;
|
||||
const startY = canvas.y + canvas.height * 0.25;
|
||||
await page.mouse.move(startX, startY);
|
||||
await expect(cursor).toBeVisible();
|
||||
|
||||
// Observe style attribute mutations during steady pointer movement.
|
||||
// Brush size, color, and mode remain unchanged throughout.
|
||||
await page.evaluate(() => {
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
window.__styleMutationRecords = [];
|
||||
const observer = new MutationObserver((mutations) => {
|
||||
for (const m of mutations) {
|
||||
if (m.type === 'attributes' && m.attributeName === 'style') {
|
||||
const oldStyle = m.oldValue || '';
|
||||
const currentStyle = el.getAttribute('style') || '';
|
||||
// Track mutations where style-transform was written inline
|
||||
if (el.style.transform || currentStyle.includes('transform:') || oldStyle.includes('transform:')) {
|
||||
window.__styleMutationRecords.push({
|
||||
oldStyle,
|
||||
currentStyle,
|
||||
inlineTransform: el.style.transform,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
observer.observe(el, { attributes: true, attributeFilter: ['style'], attributeOldValue: true });
|
||||
window.__styleMutationObserver = observer;
|
||||
});
|
||||
|
||||
// Preserve actual mouse interactions: steady movement across 10 steps
|
||||
const endX = canvas.x + canvas.width * 0.75;
|
||||
const endY = canvas.y + canvas.height * 0.75;
|
||||
await page.mouse.move(endX, endY, { steps: 10 });
|
||||
|
||||
// Confirm the cursor accurately tracked the pointer
|
||||
await expect.poll(async () => {
|
||||
const box = await cursor.boundingBox();
|
||||
return box ? Math.max(Math.abs(box.x + box.width / 2 - endX), Math.abs(box.y + box.height / 2 - endY)) : Infinity;
|
||||
}).toBeLessThan(1);
|
||||
|
||||
// Collect observation results and clean up observer and globals
|
||||
const { mutationCount, inlineTransform, animCount } = await page.evaluate(() => {
|
||||
window.__styleMutationObserver?.disconnect();
|
||||
delete window.__styleMutationObserver;
|
||||
const records = window.__styleMutationRecords || [];
|
||||
delete window.__styleMutationRecords;
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
return {
|
||||
mutationCount: records.length,
|
||||
inlineTransform: el?.style.transform || '',
|
||||
animCount: el?.getAnimations?.().length || 0,
|
||||
};
|
||||
});
|
||||
|
||||
// The optimized implementation uses paused Web Animations keyframes, avoiding repeated
|
||||
// inline style-transform writes that trigger expensive :has() document invalidations.
|
||||
expect(mutationCount).toBe(0);
|
||||
expect(inlineTransform).toBe('');
|
||||
expect(animCount).toBeGreaterThanOrEqual(1);
|
||||
});
|
||||
|
||||
|
||||
test('cross-tool cursor positioning, sizing, and styling across brush, eraser, pixel, lasso, inpaint, liquify, and clone', async ({ page }) => {
|
||||
await openBlankEditor(page, { width: 400, height: 300 });
|
||||
const canvas = await page.locator('.ge-main-canvas').boundingBox();
|
||||
const cursor = page.locator('.ge-brush-cursor');
|
||||
|
||||
const checkCenter = async (x, y) => {
|
||||
await expect.poll(async () => {
|
||||
const box = await cursor.boundingBox();
|
||||
return box ? Math.max(Math.abs(box.x + box.width / 2 - x), Math.abs(box.y + box.height / 2 - y)) : Infinity;
|
||||
}).toBeLessThan(1);
|
||||
};
|
||||
|
||||
const midX = canvas.x + canvas.width / 2;
|
||||
const midY = canvas.y + canvas.height / 2;
|
||||
|
||||
// 1. Brush tool
|
||||
await selectTool(page, 'brush');
|
||||
await page.mouse.move(midX, midY);
|
||||
await expect(cursor).toBeVisible();
|
||||
await checkCenter(midX, midY);
|
||||
let props = await page.evaluate(() => {
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
return {
|
||||
isPixel: el.classList.contains('ge-brush-cursor--pixel'),
|
||||
display: el.style.display,
|
||||
borderStyle: el.style.borderStyle,
|
||||
};
|
||||
});
|
||||
expect(props.isPixel).toBe(false);
|
||||
expect(props.display).toBe('block');
|
||||
|
||||
// 2. Eraser tool
|
||||
await selectTool(page, 'eraser');
|
||||
await page.mouse.move(midX + 10, midY + 10);
|
||||
await checkCenter(midX + 10, midY + 10);
|
||||
props = await page.evaluate(() => {
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
return {
|
||||
borderColor: el.style.borderColor,
|
||||
isPixel: el.classList.contains('ge-brush-cursor--pixel'),
|
||||
};
|
||||
});
|
||||
expect(props.borderColor).toBe('rgba(255, 255, 255, 0.6)');
|
||||
expect(props.isPixel).toBe(false);
|
||||
|
||||
// 3. Pixel brush (via tool / preset)
|
||||
await page.evaluate(async () => {
|
||||
const { state } = await import('/static/js/editor/state.js');
|
||||
state.tool = 'pixel';
|
||||
state.brushPixel = true;
|
||||
state.brushSize = 16;
|
||||
});
|
||||
await page.mouse.move(midX - 10, midY - 10);
|
||||
await checkCenter(midX - 10, midY - 10);
|
||||
props = await page.evaluate(() => {
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
return {
|
||||
isPixel: el.classList.contains('ge-brush-cursor--pixel'),
|
||||
width: parseFloat(el.style.width),
|
||||
};
|
||||
});
|
||||
expect(props.isPixel).toBe(true);
|
||||
|
||||
// 4. Lasso tool
|
||||
await page.evaluate(async () => {
|
||||
const { state } = await import('/static/js/editor/state.js');
|
||||
state.tool = 'lasso';
|
||||
state.brushPixel = false;
|
||||
});
|
||||
await page.mouse.move(midX + 20, midY - 10);
|
||||
await checkCenter(midX + 20, midY - 10);
|
||||
props = await page.evaluate(() => {
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
return {
|
||||
borderColor: el.style.borderColor,
|
||||
background: el.style.background,
|
||||
};
|
||||
});
|
||||
expect(props.borderColor).toBe('rgba(255, 255, 255, 0.85)');
|
||||
expect(props.background).toBe('rgba(0, 0, 0, 0.15)');
|
||||
|
||||
// 5. Inpaint tool (paint mode and erase mode)
|
||||
await page.evaluate(async () => {
|
||||
const { state } = await import('/static/js/editor/state.js');
|
||||
state.tool = 'inpaint';
|
||||
state.inpaintEraseMode = false;
|
||||
});
|
||||
await page.mouse.move(midX, midY);
|
||||
await checkCenter(midX, midY);
|
||||
props = await page.evaluate(() => {
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
return {
|
||||
borderColor: el.style.borderColor,
|
||||
background: el.style.background,
|
||||
borderStyle: el.style.borderStyle,
|
||||
};
|
||||
});
|
||||
expect(props.borderColor).toBe('rgba(255, 80, 80, 0.8)');
|
||||
expect(props.borderStyle).toBe('solid');
|
||||
|
||||
// Inpaint erase mode
|
||||
await page.evaluate(async () => {
|
||||
const { state } = await import('/static/js/editor/state.js');
|
||||
state.inpaintEraseMode = true;
|
||||
});
|
||||
await page.mouse.move(midX + 5, midY + 5);
|
||||
props = await page.evaluate(() => {
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
return {
|
||||
borderColor: el.style.borderColor,
|
||||
borderStyle: el.style.borderStyle,
|
||||
};
|
||||
});
|
||||
expect(props.borderColor).toBe('rgba(255, 255, 255, 0.9)');
|
||||
expect(props.borderStyle).toBe('dashed');
|
||||
|
||||
// 6. Liquify tool
|
||||
await page.evaluate(async () => {
|
||||
const { state } = await import('/static/js/editor/state.js');
|
||||
state.tool = 'liquify';
|
||||
state.liquifySize = 100;
|
||||
});
|
||||
await page.mouse.move(midX - 15, midY + 15);
|
||||
await checkCenter(midX - 15, midY + 15);
|
||||
props = await page.evaluate(() => {
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
return {
|
||||
width: parseFloat(el.style.width),
|
||||
height: parseFloat(el.style.height),
|
||||
display: el.style.display,
|
||||
};
|
||||
});
|
||||
expect(props.display).toBe('block');
|
||||
expect(props.width).toBeGreaterThan(0);
|
||||
|
||||
// 7. Clone tool
|
||||
await page.evaluate(async () => {
|
||||
const { state } = await import('/static/js/editor/state.js');
|
||||
state.tool = 'clone';
|
||||
state.brushSize = 50;
|
||||
});
|
||||
await page.mouse.move(midX, midY);
|
||||
await checkCenter(midX, midY);
|
||||
await expect(cursor).toBeVisible();
|
||||
|
||||
// Clean close
|
||||
await page.evaluate(async () => {
|
||||
const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
|
||||
editor.closeEditor({ force: true });
|
||||
});
|
||||
await expect(cursor).toHaveCount(0);
|
||||
});
|
||||
|
||||
|
||||
test('canvas boundaries, pointer exit and re-entry, and viewport resize', async ({ page }) => {
|
||||
await openBlankEditor(page, { width: 400, height: 300 });
|
||||
await selectTool(page, 'brush');
|
||||
|
||||
const canvas = await page.locator('.ge-main-canvas').boundingBox();
|
||||
const cursor = page.locator('.ge-brush-cursor');
|
||||
|
||||
const checkCenter = async (x, y) => {
|
||||
await expect.poll(async () => {
|
||||
const box = await cursor.boundingBox();
|
||||
return box ? Math.max(Math.abs(box.x + box.width / 2 - x), Math.abs(box.y + box.height / 2 - y)) : Infinity;
|
||||
}).toBeLessThan(1);
|
||||
};
|
||||
|
||||
// 1. Enter canvas
|
||||
const insideX = canvas.x + canvas.width * 0.5;
|
||||
const insideY = canvas.y + canvas.height * 0.5;
|
||||
await page.mouse.move(insideX, insideY);
|
||||
await expect(cursor).toBeVisible();
|
||||
await checkCenter(insideX, insideY);
|
||||
|
||||
// 2. Exit canvas boundary: cursor should hide
|
||||
const outsideX = canvas.x - 50;
|
||||
const outsideY = canvas.y - 50;
|
||||
await page.mouse.move(outsideX, outsideY);
|
||||
await expect(cursor).toBeHidden();
|
||||
|
||||
// 3. Re-enter canvas: cursor should restore visibility and position
|
||||
await page.mouse.move(insideX, insideY);
|
||||
await expect(cursor).toBeVisible();
|
||||
await checkCenter(insideX, insideY);
|
||||
|
||||
// 4. Viewport resize
|
||||
await page.setViewportSize({ width: 1280, height: 800 });
|
||||
await page.waitForTimeout(100);
|
||||
const newCanvas = await page.locator('.ge-main-canvas').boundingBox();
|
||||
const newInsideX = newCanvas.x + newCanvas.width * 0.5;
|
||||
const newInsideY = newCanvas.y + newCanvas.height * 0.5;
|
||||
await page.mouse.move(newInsideX, newInsideY);
|
||||
await expect(cursor).toBeVisible();
|
||||
await checkCenter(newInsideX, newInsideY);
|
||||
|
||||
// Clean close
|
||||
await page.evaluate(async () => {
|
||||
const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
|
||||
editor.closeEditor({ force: true });
|
||||
});
|
||||
await expect(cursor).toHaveCount(0);
|
||||
});
|
||||
|
||||
|
||||
for (const view of ['2x zoom', 'fit-to-view']) {
|
||||
test(`zoom and fit-to-view cursor scaling and positioning: ${view}`, async ({ page }) => {
|
||||
const size = view === '2x zoom' ? { width: 400, height: 300 } : { width: 1600, height: 1200 };
|
||||
await openBlankEditor(page, size);
|
||||
await selectTool(page, 'brush');
|
||||
|
||||
await page.evaluate(async () => {
|
||||
const { state } = await import('/static/js/editor/state.js');
|
||||
state.brushSize = 50;
|
||||
// The zoom-in control applies 1.25x through the real zoom handler.
|
||||
state.zoom = 1.6;
|
||||
state.zoomViewMode = 'scale';
|
||||
});
|
||||
await page.locator('#ge-zoom-in').click();
|
||||
await expect.poll(() => page.evaluate(async () => {
|
||||
const { state } = await import('/static/js/editor/state.js');
|
||||
return { zoom: state.zoom, mode: state.zoomViewMode };
|
||||
})).toEqual({ zoom: 2, mode: 'scale' });
|
||||
|
||||
if (view === 'fit-to-view') {
|
||||
await page.locator('#ge-zoom-100').click();
|
||||
const fitted = await page.evaluate(async () => {
|
||||
const { state } = await import('/static/js/editor/state.js');
|
||||
const area = document.querySelector('.ge-canvas-area');
|
||||
const pad = state._footerDocked ? 0 : 20;
|
||||
const rulerPad = state.rulersVisible ? 18 : 0;
|
||||
return {
|
||||
zoom: state.zoom,
|
||||
mode: state.zoomViewMode,
|
||||
expectedZoom: Math.min(1,
|
||||
(area.clientWidth - 2 * pad - rulerPad) / state.imgWidth,
|
||||
(area.clientHeight - 2 * pad - rulerPad) / state.imgHeight),
|
||||
};
|
||||
});
|
||||
expect(fitted.mode).toBe('fit');
|
||||
expect(fitted.zoom).toBeGreaterThan(0);
|
||||
expect(fitted.zoom).toBeLessThan(1);
|
||||
expect(fitted.zoom).toBeCloseTo(fitted.expectedZoom, 6);
|
||||
}
|
||||
|
||||
const canvas = page.locator('.ge-main-canvas');
|
||||
const canvasBox = await canvas.boundingBox();
|
||||
const cursor = page.locator('.ge-brush-cursor');
|
||||
if (view === '2x zoom') {
|
||||
expect(canvasBox.width).toBeCloseTo(size.width * 2, 1);
|
||||
expect(canvasBox.height).toBeCloseTo(size.height * 2, 1);
|
||||
}
|
||||
const targetX = canvasBox.x + canvasBox.width * 0.4;
|
||||
const targetY = canvasBox.y + canvasBox.height * 0.4;
|
||||
await page.mouse.move(targetX, targetY);
|
||||
await expect(cursor).toBeVisible();
|
||||
|
||||
// Pointer coordinates can be rounded to device pixels; keep the existing
|
||||
// subpixel alignment tolerance separate from the stricter diameter check.
|
||||
await expect.poll(async () => {
|
||||
const box = await cursor.boundingBox();
|
||||
return box ? Math.max(
|
||||
Math.abs(box.x + box.width / 2 - targetX),
|
||||
Math.abs(box.y + box.height / 2 - targetY),
|
||||
) : Infinity;
|
||||
}).toBeLessThan(1);
|
||||
await expect.poll(() => page.evaluate(() => {
|
||||
const canvasEl = document.querySelector('.ge-main-canvas');
|
||||
const canvasRect = canvasEl.getBoundingClientRect();
|
||||
const cursorRect = document.querySelector('.ge-brush-cursor').getBoundingClientRect();
|
||||
return Math.max(
|
||||
Math.abs(cursorRect.width - 50 * canvasRect.width / canvasEl.width),
|
||||
Math.abs(cursorRect.height - 50 * canvasRect.height / canvasEl.height),
|
||||
);
|
||||
})).toBeLessThan(0.1);
|
||||
|
||||
await page.evaluate(async () => {
|
||||
const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
|
||||
editor.closeEditor({ force: true });
|
||||
});
|
||||
await expect(cursor).toHaveCount(0);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
test('memory and lifecycle: repeated editor open/close cycles retain no detached cursors or active animations', async ({ page }) => {
|
||||
for (let cycle = 0; cycle < 5; cycle++) {
|
||||
await openBlankEditor(page, { width: 400, height: 300 });
|
||||
await selectTool(page, 'brush');
|
||||
|
||||
const canvas = await page.locator('.ge-main-canvas').boundingBox();
|
||||
await page.mouse.move(canvas.x + canvas.width * 0.5, canvas.y + canvas.height * 0.5);
|
||||
const cursor = page.locator('.ge-brush-cursor');
|
||||
await expect(cursor).toBeVisible();
|
||||
|
||||
// Verify cursor layer and animation are active
|
||||
const cycleState = await page.evaluate(() => {
|
||||
const el = document.querySelector('.ge-brush-cursor');
|
||||
return {
|
||||
cursorCount: document.querySelectorAll('.ge-brush-cursor').length,
|
||||
layerCount: document.querySelectorAll('#ge-cursor-layer').length,
|
||||
hasAnim: Boolean(el?._positionAnimation),
|
||||
animPaused: el?._positionAnimation?.playState === 'paused',
|
||||
};
|
||||
});
|
||||
expect(cycleState.cursorCount).toBe(1);
|
||||
expect(cycleState.layerCount).toBe(1);
|
||||
expect(cycleState.animPaused).toBe(true);
|
||||
|
||||
// Close editor
|
||||
await page.evaluate(async () => {
|
||||
const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
|
||||
editor.closeEditor({ force: true });
|
||||
});
|
||||
|
||||
// Verify complete cleanup after close
|
||||
await expect(cursor).toHaveCount(0);
|
||||
const postClose = await page.evaluate(() => {
|
||||
return {
|
||||
cursorCount: document.querySelectorAll('.ge-brush-cursor').length,
|
||||
layerCount: document.querySelectorAll('#ge-cursor-layer').length,
|
||||
activeAnims: document.getAnimations().filter(a => {
|
||||
const target = a.effect?.target;
|
||||
return target && (target.classList?.contains('ge-brush-cursor') || target.id === 'ge-cursor-layer');
|
||||
}).length,
|
||||
};
|
||||
});
|
||||
expect(postClose.cursorCount).toBe(0);
|
||||
expect(postClose.layerCount).toBe(0);
|
||||
expect(postClose.activeAnims).toBe(0);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -85,9 +85,6 @@ def test_actual_tests_restore_process_state_and_ignore_inherited_database(tmp_pa
|
||||
import os
|
||||
import sys
|
||||
import pytest
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
from sqlalchemy.engine import make_url
|
||||
|
||||
def snapshot():
|
||||
import core
|
||||
@@ -110,11 +107,7 @@ def test_actual_tests_restore_process_state_and_ignore_inherited_database(tmp_pa
|
||||
class StateGuard:
|
||||
def pytest_sessionstart(self):
|
||||
self.initial = snapshot()
|
||||
assert self.initial[0] != inherited_url
|
||||
self.default_path = Path(make_url(self.initial[0]).database)
|
||||
assert self.default_path.is_file()
|
||||
assert self.default_path.name == "collection.db"
|
||||
assert self.default_path.parent == Path(tempfile.gettempdir()).parent
|
||||
assert self.initial[0] == "sqlite:///:memory:"
|
||||
|
||||
def pytest_collection_finish(self):
|
||||
assert snapshot() == self.initial, "collection changed database bindings"
|
||||
@@ -125,11 +118,9 @@ def test_actual_tests_restore_process_state_and_ignore_inherited_database(tmp_pa
|
||||
assert snapshot() == self.initial, "test leaked database or module state"
|
||||
|
||||
inherited_url = os.environ["DATABASE_URL"]
|
||||
guard = StateGuard()
|
||||
result = pytest.main(["-q", "-p", "no:cacheprovider", *sys.argv[1:]],
|
||||
plugins=[guard])
|
||||
plugins=[StateGuard()])
|
||||
assert os.environ["DATABASE_URL"] == inherited_url
|
||||
assert not guard.default_path.exists(), "collection database outlived its runtime"
|
||||
raise SystemExit(result)
|
||||
''')
|
||||
result = subprocess.run(
|
||||
|
||||
@@ -79,32 +79,3 @@ def test_tmp_path_under_private_runtime_fits_unix_socket(tmp_path):
|
||||
# witness. A nested pytest-of-<user> basetemp made it 110 bytes under xdist.
|
||||
with socket.socket(socket.AF_UNIX) as sock:
|
||||
sock.bind(str(tmp_path / "tmux.sock"))
|
||||
|
||||
|
||||
def test_collection_database_survives_thread_connection_churn():
|
||||
"""TestClient threads must not lose the collection database or its schema.
|
||||
|
||||
SingletonThreadPool's default five-connection limit used to close the main
|
||||
thread's in-memory database after repeated route clients. Each new thread
|
||||
also saw an empty database. Exercise more threads than that limit and then
|
||||
verify both compatibility factories still see all registered tables.
|
||||
"""
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
from sqlalchemy import inspect
|
||||
import core.database as database
|
||||
import src.database as compatibility
|
||||
|
||||
expected = set(database.Base.metadata.tables)
|
||||
|
||||
def table_names(factory):
|
||||
with factory() as session:
|
||||
return set(inspect(session.connection()).get_table_names())
|
||||
|
||||
assert {"documents", "model_endpoints", "mcp_servers", "calendars"} <= expected
|
||||
assert expected <= table_names(database.SessionLocal)
|
||||
for _ in range(8):
|
||||
# A fresh executor creates a fresh thread rather than reusing one.
|
||||
with ThreadPoolExecutor(max_workers=1) as executor:
|
||||
assert expected <= executor.submit(table_names, database.SessionLocal).result()
|
||||
assert expected <= table_names(database.SessionLocal)
|
||||
assert expected <= table_names(compatibility.SessionLocal)
|
||||
|
||||
Reference in New Issue
Block a user