Skip to content

馃悰 Keep Swift preview names stable across schemes #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Robdel12 merged 1 commit into from
Oct 2, 2026
Merged

馃悰 Keep Swift preview names stable across schemes #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions clients/swift/src/upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ export function buildCloudRunOptions(vizzlyConfig = {}, gitInfo = {}) {
}

function previewNames(manifest) {
let baseNames = manifest.previews.map(
preview => `${manifest.scheme} - ${preview.name}`
);
let baseNames = manifest.previews.map(preview => preview.name);
let baseCounts = new Map();
for (let name of baseNames) {
baseCounts.set(name, (baseCounts.get(name) ?? 0) + 1);
Expand Down
20 changes: 16 additions & 4 deletions clients/swift/tests-js/upload.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ describe('Swift preview uploads', () => {

assert.deepEqual(
records.map(record => record.name),
['Example - Card - Example.Card', 'Example - Card - Example.CompactCard']
['Card - Example.Card', 'Card - Example.CompactCard']
);
assert.deepEqual(records[0].properties, {
browser: 'SwiftUI Preview',
Expand All @@ -92,13 +92,25 @@ describe('Swift preview uploads', () => {
});
});

it('keeps screenshot names stable across Xcode schemes', () => {
let manifest = previewManifest('/tmp/previews');
let names = buildPreviewUploadRecords(manifest).map(record => record.name);

manifest.scheme = 'Example Staging';

assert.deepEqual(
buildPreviewUploadRecords(manifest).map(record => record.name),
names
);
});

it('normalizes Xcode preview names for the Vizzly screenshot contract', () => {
let manifest = previewManifest('/tmp/previews');
manifest.previews[0].name = 'Card / Dark';

let [record] = buildPreviewUploadRecords(manifest);

assert.equal(record.name, 'Example - Card - Dark');
assert.equal(record.name, 'Card - Dark');
});

it('keeps names unique when different Xcode names normalize alike', () => {
Expand All @@ -110,7 +122,7 @@ describe('Swift preview uploads', () => {

assert.deepEqual(
records.map(record => record.name),
['Example - Card - Dark - first-id', 'Example - Card - Dark - second-id']
['Card - Dark - first-id', 'Card - Dark - second-id']
);
});

Expand Down Expand Up @@ -211,7 +223,7 @@ describe('Swift preview uploads', () => {
['/screenshot', '/screenshot', '/flush']
);
assert.equal(requests[0].body.buildId, 'build-123');
assert.equal(requests[0].body.name, 'Example - Card - Example.Card');
assert.equal(requests[0].body.name, 'Card - Example.Card');
assert.equal(requests[0].body.type, 'file-path');
assert.equal(requests[0].body.threshold, 2.5);
assert.equal(requests[0].body.minClusterSize, 3);
Expand Down
Loading