Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 24 additions & 37 deletions src/tdd/tdd-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -1349,19 +1349,19 @@ export class TddService {
}

// Baseline exists - compare
try {
let effectiveThreshold =
typeof validatedProperties.threshold === 'number' &&
validatedProperties.threshold >= 0
? validatedProperties.threshold
: this.threshold;

let effectiveMinClusterSize =
Number.isInteger(validatedProperties.minClusterSize) &&
validatedProperties.minClusterSize >= 1
? validatedProperties.minClusterSize
: this.minClusterSize;
let effectiveThreshold =
typeof validatedProperties.threshold === 'number' &&
validatedProperties.threshold >= 0
? validatedProperties.threshold
: this.threshold;

let effectiveMinClusterSize =
Number.isInteger(validatedProperties.minClusterSize) &&
validatedProperties.minClusterSize >= 1
? validatedProperties.minClusterSize
: this.minClusterSize;

try {
let honeydiffResult = await compareImages(
baselineImagePath,
currentImagePath,
Expand Down Expand Up @@ -1420,39 +1420,26 @@ export class TddService {
if (isDimensionMismatchError(error)) {
output.debug(
'comparison',
`${sanitizedName}: dimension mismatch, creating new baseline`
`${sanitizedName}: dimension mismatch, marking comparison as failed`,
{ error: error.message }
);

saveBaseline(this.baselinePath, filename, imageBuffer);

if (!this.baselineData) {
this.baselineData = createEmptyBaselineMetadata({
threshold: this.threshold,
signatureProperties: this.signatureProperties,
});
}

let screenshotEntry = {
name: sanitizedName,
properties: validatedProperties,
path: baselineImagePath,
signature,
};

upsertScreenshotInMetadata(
this.baselineData,
screenshotEntry,
signature
);
saveBaselineMetadata(this.baselinePath, this.baselineData);

let result = buildNewComparison({
let result = buildFailedComparison({
name: sanitizedName,
signature,
baselinePath: baselineImagePath,
currentPath: currentImagePath,
diffPath: null,
properties: validatedProperties,
threshold: effectiveThreshold,
minClusterSize: effectiveMinClusterSize,
honeydiffResult: {
isDifferent: true,
diffClusters: [],
},
});
result.reason = 'dimension-mismatch';
result.error = error.message;

this._upsertComparison(result);
return result;
Expand Down
22 changes: 19 additions & 3 deletions tests/tdd/tdd-service.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -516,9 +516,21 @@ describe('tdd/tdd-service', () => {
assert.strictEqual(service.comparisons.length, 1);
});

it('handles dimension mismatch by creating new baseline', async () => {
it('handles dimension mismatch as a failed comparison', async () => {
let baselineSaved = false;
let metadataSaved = false;
let mockDeps = createMockDeps({
baseline: { baselineExists: () => true },
baseline: {
baselineExists: () => true,
saveBaseline: () => {
baselineSaved = true;
},
},
metadata: {
saveBaselineMetadata: () => {
metadataSaved = true;
},
},
comparison: {
compareImages: async () => {
throw new Error("Image dimensions don't match");
Expand All @@ -535,7 +547,11 @@ describe('tdd/tdd-service', () => {
{}
);

assert.strictEqual(result.status, 'new');
assert.strictEqual(result.status, 'failed');
assert.strictEqual(result.reason, 'dimension-mismatch');
assert.strictEqual(result.error, "Image dimensions don't match");
assert.strictEqual(baselineSaved, false);
assert.strictEqual(metadataSaved, false);
// Dimension mismatch now logs at debug level (shown with --verbose)
let debugCall = mockDeps.output.calls.find(
c => c.method === 'debug' && c.args[1]?.includes('dimension mismatch')
Expand Down