Skip to content

Commit 771f031

Browse files
chore(deps): bump the npm_and_yarn group across 1 directory with 2 updates (#177)
* chore(deps): bump the npm_and_yarn group across 1 directory with 2 updates Bumps the npm_and_yarn group with 2 updates in the / directory: [fast-uri](https://github.com/fastify/fast-uri) and [undici](https://github.com/nodejs/undici). Updates `fast-uri` from 3.1.4 to 3.1.5 - [Release notes](https://github.com/fastify/fast-uri/releases) - [Commits](fastify/fast-uri@v3.1.4...v3.1.5) Updates `undici` from 7.28.0 to 7.29.0 - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v7.28.0...v7.29.0) --- updated-dependencies: - dependency-name: fast-uri dependency-version: 3.1.5 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: undici dependency-version: 7.29.0 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> * test: stabilize checkout feedback counter assertion --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Valentyn Radchuk <zaknafeyn@gmail.com>
1 parent 8973bfb commit 771f031

3 files changed

Lines changed: 33 additions & 10 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@
760760
"@typescript-eslint/parser/**/brace-expansion": "^5.0.7",
761761
"ovsx/**/brace-expansion": "^5.0.7",
762762
"semantic-release/**/brace-expansion": "^5.0.7",
763-
"fast-uri": "^3.1.4",
763+
"fast-uri": "^3.1.5",
764764
"sigstore": "^4.1.1",
765765
"@sigstore/core": "^3.2.1"
766766
}

src/test/e2e/whatsNewToast.test.ts

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,29 @@ function pickBranch(branchName: string): (items: readonly QuickPickLikeItem[]) =
4242
return (items) => items.find((candidate) => candidate.ref?.name === branchName && !candidate.ref.remote && !candidate.ref.isTag);
4343
}
4444

45+
async function getSettledCheckoutSuccessCount(context: vscode.ExtensionContext): Promise<number> {
46+
let count = context.globalState.get<number>(CHECKOUT_SUCCESS_COUNT_KEY, 0);
47+
let stableSamples = 0;
48+
49+
// Other e2e tests exercise real contributed commands in the same extension host.
50+
// Let any success callback already in flight finish before taking a baseline.
51+
for (let attempt = 0; attempt < 10; attempt++) {
52+
await delay(50);
53+
const next = context.globalState.get<number>(CHECKOUT_SUCCESS_COUNT_KEY, 0);
54+
if (next === count) {
55+
stableSamples++;
56+
if (stableSamples === 3) {
57+
return next;
58+
}
59+
} else {
60+
count = next;
61+
stableSamples = 0;
62+
}
63+
}
64+
65+
return count;
66+
}
67+
4568
/** Drives the real `checkoutTo` command with a fixed auto-stash mode, resolving once it finishes. */
4669
async function executeCheckoutTo(branchName: string, stashMode: string): Promise<string[]> {
4770
const restoreQuickPick = stubCreateQuickPick(pickBranch(branchName));
@@ -164,7 +187,7 @@ describe('What\'s new / feedback notifications — activation-level e2e', () =>
164187
// whole e2e run (not reset between test files), so assert a *delta* here rather than an
165188
// absolute value — an absolute assertion would be flaky against any other test file's
166189
// real stash-carrying checkouts landing asynchronously around this one.
167-
const before = context.globalState.get<number>(CHECKOUT_SUCCESS_COUNT_KEY, 0);
190+
const before = await getSettledCheckoutSuccessCount(context);
168191

169192
await withRepoWorkspace(repo, async () => {
170193
repo.makeChange('file1.txt', 'dirty change, cancelled checkout\n');
@@ -181,7 +204,7 @@ describe('What\'s new / feedback notifications — activation-level e2e', () =>
181204
});
182205

183206
assert.strictEqual(
184-
context.globalState.get(CHECKOUT_SUCCESS_COUNT_KEY),
207+
await getSettledCheckoutSuccessCount(context),
185208
before,
186209
'a cancelled checkout must not increment the feedback counter'
187210
);

yarn.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4417,10 +4417,10 @@ fast-levenshtein@^2.0.6:
44174417
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
44184418
integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
44194419

4420-
fast-uri@^3.0.1, fast-uri@^3.1.4:
4421-
version "3.1.4"
4422-
resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.4.tgz#3b3daf9ce68f41f956df0b505132c0cfce9ec7af"
4423-
integrity sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==
4420+
fast-uri@^3.0.1, fast-uri@^3.1.5:
4421+
version "3.1.5"
4422+
resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.5.tgz#610f37419a030270430cecd68d74e3d4d96725d0"
4423+
integrity sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==
44244424

44254425
fastest-levenshtein@^1.0.12, fastest-levenshtein@^1.0.16:
44264426
version "1.0.16"
@@ -9426,9 +9426,9 @@ undici-types@^7.21.0:
94269426
integrity sha512-LJAfY+2w6HGeT8d8J1wNQsUGUEGio6NWWpwdwurQe4f6oojzCFuGLizl1KSve4irsTxyLly1QhEeE6iapdaIvQ==
94279427

94289428
undici@^7.19.0, undici@^7.25.0:
9429-
version "7.28.0"
9430-
resolved "https://registry.yarnpkg.com/undici/-/undici-7.28.0.tgz#97d64564198b285bc281f0e8e29597e3d11fe7ec"
9431-
integrity sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==
9429+
version "7.29.0"
9430+
resolved "https://registry.yarnpkg.com/undici/-/undici-7.29.0.tgz#ae0f6f62e06e057a9cbb7b2b5fde2bb74f791b8f"
9431+
integrity sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==
94329432

94339433
unicode-emoji-modifier-base@^1.0.0:
94349434
version "1.0.0"

0 commit comments

Comments
 (0)