@theia/getting-started 1.76.0-next.14 → 1.76.0-next.18

package/lib/browser/walkthrough-service.spec.js

@@ -36,6 +36,7 @@ describe('WalkthroughService', () => {
     let mockOpenerOpenCalls;
     let reportedErrors;
     let mockDisabledByTrust;
+    let mockWalkthroughProviders;
     function createContribution(overrides) {
         return {
             id: 'test-walkthrough',
@@ -59,6 +60,10 @@ describe('WalkthroughService', () => {
             ...overrides
         };
     }
+    /** Registers a plugin contribution the way {@link WalkthroughService.collectPluginWalkthroughs} does. */
+    function registerContribution(contribution) {
+        service.registerWalkthrough(`${contribution.pluginId}.${contribution.id}`, contribution, contribution.pluginId, contribution.pluginIcon);
+    }
     beforeEach(() => {
         storedData = {};
         onDidChangePluginsEmitter = new event_1.Emitter();
@@ -72,6 +77,7 @@ describe('WalkthroughService', () => {
         mockOpenerOpenCalls = [];
         reportedErrors = [];
         mockDisabledByTrust = new Set();
+        mockWalkthroughProviders = [];
         const mockOpener = { open: (...args) => { mockOpenerOpenCalls.push(String(args[0])); } };
         mockOpenerGetOpener = () => Promise.resolve(mockOpener);
         onDidExpandViewEmitter = new event_1.Emitter();
@@ -130,6 +136,9 @@ describe('WalkthroughService', () => {
             get disabledByTrust() { return mockDisabledByTrust; },
             onDidChangePlugins: onDidChangePluginsEmitter.event
         };
+        service.walkthroughProviders = {
+            getContributions: () => mockWalkthroughProviders
+        };
     });
     afterEach(() => {
         service.dispose();
@@ -142,7 +151,7 @@ describe('WalkthroughService', () => {
     describe('registerWalkthrough', () => {
         it('should register a walkthrough and make it retrievable', () => {
             const contribution = createContribution();
-            service.registerWalkthrough(contribution);
+            registerContribution(contribution);
             const walkthroughs = service.getWalkthroughs();
             (0, chai_1.expect)(walkthroughs).to.have.lengthOf(1);
             (0, chai_1.expect)(walkthroughs[0].id).to.equal('test.publisher.test-plugin.test-walkthrough');
@@ -151,17 +160,17 @@ describe('WalkthroughService', () => {
         });
         it('should construct full ID from pluginId and walkthrough id', () => {
             const contribution = createContribution({ pluginId: 'my.plugin', id: 'my-wt' });
-            service.registerWalkthrough(contribution);
+            registerContribution(contribution);
             (0, chai_1.expect)(service.getWalkthrough('my.plugin.my-wt')).to.not.be.undefined;
         });
         it('should fire onDidChangeWalkthroughs event', () => {
             let fired = false;
             service.onDidChangeWalkthroughs(() => { fired = true; });
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             (0, chai_1.expect)(fired).to.be.true;
         });
         it('should initialize steps as not complete', () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             const walkthrough = service.getWalkthroughs()[0];
             for (const step of walkthrough.steps) {
                 (0, chai_1.expect)(step.isComplete).to.be.false;
@@ -170,7 +179,7 @@ describe('WalkthroughService', () => {
     });
     describe('markStepComplete', () => {
         beforeEach(() => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
         });
         it('should mark a step as complete', async () => {
             const wtId = 'test.publisher.test-plugin.test-walkthrough';
@@ -214,7 +223,7 @@ describe('WalkthroughService', () => {
     describe('markStepIncomplete', () => {
         const wtId = 'test.publisher.test-plugin.test-walkthrough';
         beforeEach(() => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
         });
         it('should take the completion mark off a step again', async () => {
             await service.markStepComplete(wtId, 'step1');
@@ -250,7 +259,7 @@ describe('WalkthroughService', () => {
     describe('markAllStepsComplete', () => {
         const wtId = 'test.publisher.test-plugin.test-walkthrough';
         beforeEach(() => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
         });
         it('should complete every step', async () => {
             await service.markAllStepsComplete(wtId);
@@ -280,7 +289,7 @@ describe('WalkthroughService', () => {
     });
     describe('resetProgress', () => {
         beforeEach(async () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             const wtId = 'test.publisher.test-plugin.test-walkthrough';
             await service.markStepComplete(wtId, 'step1');
             await service.markStepComplete(wtId, 'step2');
@@ -306,7 +315,7 @@ describe('WalkthroughService', () => {
     });
     describe('getStepProgress', () => {
         beforeEach(() => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
         });
         it('should return correct progress', () => {
             const wtId = 'test.publisher.test-plugin.test-walkthrough';
@@ -329,7 +338,7 @@ describe('WalkthroughService', () => {
     });
     describe('completion event handling', () => {
         beforeEach(() => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             // Wire up the event handlers that @postConstruct would normally set up
             service.toDispose.push(service.commandRegistry.onDidExecuteCommand((e) => {
                 service.handleCompletionEvent(`onCommand:${e.commandId}`);
@@ -373,7 +382,7 @@ describe('WalkthroughService', () => {
             };
             // Simulate what loadProgress does
             await service.loadProgress();
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             const wtId = 'test.publisher.test-plugin.test-walkthrough';
             const walkthrough = service.getWalkthrough(wtId);
             (0, chai_1.expect)(walkthrough.steps[0].isComplete).to.be.true;
@@ -404,7 +413,7 @@ describe('WalkthroughService', () => {
         });
         it('should handle missing storage data gracefully', async () => {
             await service.loadProgress();
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             const wtId = 'test.publisher.test-plugin.test-walkthrough';
             const walkthrough = service.getWalkthrough(wtId);
             for (const step of walkthrough.steps) {
@@ -414,12 +423,12 @@ describe('WalkthroughService', () => {
     });
     describe('extension icon', () => {
         it('should carry the icon of the contributing extension', () => {
-            service.registerWalkthrough(createContribution({ pluginIcon: 'hostedPlugin/pub_name/icon.png' }));
+            registerContribution(createContribution({ pluginIcon: 'hostedPlugin/pub_name/icon.png' }));
             const walkthrough = service.getWalkthrough('test.publisher.test-plugin.test-walkthrough');
             (0, chai_1.expect)(walkthrough.pluginIcon).to.equal('hostedPlugin/pub_name/icon.png');
         });
         it('should leave the icon undefined when the extension declares none', () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             const walkthrough = service.getWalkthrough('test.publisher.test-plugin.test-walkthrough');
             (0, chai_1.expect)(walkthrough.pluginIcon).to.be.undefined;
         });
@@ -431,7 +440,7 @@ describe('WalkthroughService', () => {
             (0, chai_1.expect)(service.selectedStep).to.be.undefined;
         });
         it('should retain the selected walkthrough and fire onDidChangeSelection', () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             let fired = 0;
             service.onDidChangeSelection(() => { fired++; });
             service.selectWalkthrough(wtId);
@@ -439,18 +448,18 @@ describe('WalkthroughService', () => {
             (0, chai_1.expect)(service.selectedWalkthrough?.id).to.equal(wtId);
         });
         it('should preselect the first pending step', () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             service.selectWalkthrough(wtId);
             (0, chai_1.expect)(service.selectedStep?.id).to.equal('step1');
         });
         it('should preselect the first step that is not yet complete', async () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             await service.markStepComplete(wtId, 'step1');
             service.selectWalkthrough(wtId);
             (0, chai_1.expect)(service.selectedStep?.id).to.equal('step2');
         });
         it('should accept the VS Code `publisher.name#walkthroughId` form', () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             service.selectWalkthrough('test.publisher.test-plugin#test-walkthrough');
             (0, chai_1.expect)(service.selectedWalkthrough?.id).to.equal(wtId);
         });
@@ -462,19 +471,19 @@ describe('WalkthroughService', () => {
             (0, chai_1.expect)(service.selectedWalkthrough).to.be.undefined;
         });
         it('should select another step of the selected walkthrough', () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             service.selectWalkthrough(wtId);
             service.selectStep('step2');
             (0, chai_1.expect)(service.selectedStep?.id).to.equal('step2');
         });
         it('should ignore a step that does not belong to the selected walkthrough', () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             service.selectWalkthrough(wtId);
             service.selectStep('nonexistent');
             (0, chai_1.expect)(service.selectedStep?.id).to.equal('step1');
         });
         it('should clear the selection', () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             service.selectWalkthrough(wtId);
             let fired = 0;
             service.onDidChangeSelection(() => { fired++; });
@@ -490,7 +499,7 @@ describe('WalkthroughService', () => {
             (0, chai_1.expect)(fired).to.be.false;
         });
         it('should reflect step completion in the selected step', async () => {
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             service.selectWalkthrough(wtId);
             await service.markStepComplete(wtId, 'step1');
             (0, chai_1.expect)(service.selectedStep?.id).to.equal('step1');
@@ -501,23 +510,23 @@ describe('WalkthroughService', () => {
         const wtId = 'test.publisher.test-plugin.test-walkthrough';
         it('should hide a walkthrough whose when clause does not hold', () => {
             mockContextKeyMatchResult = false;
-            service.registerWalkthrough(createContribution({ when: 'someKey' }));
+            registerContribution(createContribution({ when: 'someKey' }));
             (0, chai_1.expect)(service.getWalkthroughs()).to.be.empty;
             (0, chai_1.expect)(service.getWalkthrough(wtId)).to.be.undefined;
         });
         it('should list a walkthrough whose when clause holds', () => {
             mockContextKeyMatchResult = true;
-            service.registerWalkthrough(createContribution({ when: 'someKey' }));
+            registerContribution(createContribution({ when: 'someKey' }));
             (0, chai_1.expect)(service.getWalkthroughs()).to.have.lengthOf(1);
         });
         it('should always list a walkthrough without a when clause', () => {
             mockContextKeyMatchResult = false;
-            service.registerWalkthrough(createContribution());
+            registerContribution(createContribution());
             (0, chai_1.expect)(service.getWalkthroughs()).to.have.lengthOf(1);
         });
         it('should hide the steps whose when clause does not hold', () => {
             mockContextKeyMatchResult = false;
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 steps: [
                     { id: 'always', title: 'Always', description: 'd' },
                     { id: 'never', title: 'Never', description: 'd', when: 'someKey' }
@@ -529,7 +538,7 @@ describe('WalkthroughService', () => {
         });
         it('should exclude hidden steps from the progress', () => {
             mockContextKeyMatchResult = false;
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 steps: [
                     { id: 'always', title: 'Always', description: 'd' },
                     { id: 'never', title: 'Never', description: 'd', when: 'someKey' }
@@ -539,13 +548,13 @@ describe('WalkthroughService', () => {
         });
         it('should not select a hidden walkthrough', () => {
             mockContextKeyMatchResult = false;
-            service.registerWalkthrough(createContribution({ when: 'someKey' }));
+            registerContribution(createContribution({ when: 'someKey' }));
             service.selectWalkthrough(wtId);
             (0, chai_1.expect)(service.selectedWalkthrough).to.be.undefined;
         });
         it('should preselect the first pending visible step', () => {
             mockContextKeyMatchResult = false;
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 steps: [
                     { id: 'hidden', title: 'Hidden', description: 'd', when: 'someKey' },
                     { id: 'visible', title: 'Visible', description: 'd' }
@@ -556,13 +565,13 @@ describe('WalkthroughService', () => {
         });
         it('should re-evaluate visibility whenever it is queried', () => {
             mockContextKeyMatchResult = false;
-            service.registerWalkthrough(createContribution({ when: 'someKey' }));
+            registerContribution(createContribution({ when: 'someKey' }));
             (0, chai_1.expect)(service.getWalkthroughs()).to.be.empty;
             mockContextKeyMatchResult = true;
             (0, chai_1.expect)(service.getWalkthroughs()).to.have.lengthOf(1);
         });
         it('should collect the context keys of every when clause and onContext event', () => {
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 when: 'walkthroughKey',
                 steps: [{ id: 's1', title: 'S1', description: 'd', when: 'stepKey', completionEvents: ['onContext:eventKey'] }]
             }));
@@ -570,7 +579,7 @@ describe('WalkthroughService', () => {
             (0, chai_1.expect)(Array.from(keys).sort()).to.deep.equal(['eventKey', 'stepKey', 'walkthroughKey']);
         });
         it('should notify when visibility changed', () => {
-            service.registerWalkthrough(createContribution({ when: 'someKey' }));
+            registerContribution(createContribution({ when: 'someKey' }));
             let fired = false;
             service.onDidChangeWalkthroughs(() => { fired = true; });
             service.handleVisibilityChanged();
@@ -578,7 +587,7 @@ describe('WalkthroughService', () => {
         });
         it('should close a selected walkthrough that becomes hidden', () => {
             mockContextKeyMatchResult = true;
-            service.registerWalkthrough(createContribution({ when: 'someKey' }));
+            registerContribution(createContribution({ when: 'someKey' }));
             service.selectWalkthrough(wtId);
             (0, chai_1.expect)(service.selectedWalkthrough?.id).to.equal(wtId);
             mockContextKeyMatchResult = false;
@@ -587,7 +596,7 @@ describe('WalkthroughService', () => {
         });
         it('should mark only the visible steps done', async () => {
             mockContextKeyMatchResult = false;
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 steps: [
                     { id: 'always', title: 'Always', description: 'd' },
                     { id: 'never', title: 'Never', description: 'd', when: 'someKey' }
@@ -605,8 +614,8 @@ describe('WalkthroughService', () => {
             (0, chai_1.expect)(service.getWalkthroughs()).to.be.empty;
         });
         it('should return all registered walkthroughs', () => {
-            service.registerWalkthrough(createContribution({ id: 'wt1' }));
-            service.registerWalkthrough(createContribution({ id: 'wt2' }));
+            registerContribution(createContribution({ id: 'wt1' }));
+            registerContribution(createContribution({ id: 'wt2' }));
             const walkthroughs = service.getWalkthroughs();
             (0, chai_1.expect)(walkthroughs).to.have.lengthOf(2);
         });
@@ -617,7 +626,7 @@ describe('WalkthroughService', () => {
         beforeEach(() => {
             mockPlugins = [{ model: { id: pluginId, publisher: 'test.publisher', name: 'test-plugin' } }];
             mockDeployedPlugins.set(pluginId, { contributes: { walkthroughs: [createContribution()] } });
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
         });
         it('should offer the walkthrough of an installed plugin', () => {
             (0, chai_1.expect)(service.getWalkthrough(wtId)).to.not.be.undefined;
@@ -632,7 +641,7 @@ describe('WalkthroughService', () => {
                         })]
                 }
             });
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             const steps = service.getWalkthrough(wtId).steps;
             (0, chai_1.expect)(steps).to.have.lengthOf(1);
             (0, chai_1.expect)(steps[0].id).to.equal('only');
@@ -640,34 +649,34 @@ describe('WalkthroughService', () => {
         it('should keep a walkthrough whose definition is unchanged', () => {
             let fired = false;
             service.onDidChangeWalkthroughs(() => { fired = true; });
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             (0, chai_1.expect)(fired, 'an unchanged sync must not notify').to.be.false;
         });
         it('should not offer the walkthrough of a plugin restricted by workspace trust', () => {
             (0, chai_1.expect)(service.getWalkthrough(wtId), 'offered while the workspace is trusted').to.not.be.undefined;
             mockDisabledByTrust.add(pluginId);
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             (0, chai_1.expect)(service.getWalkthroughs()).to.be.empty;
         });
         it('should offer it again once the workspace is trusted', () => {
             mockDisabledByTrust.add(pluginId);
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             (0, chai_1.expect)(service.getWalkthroughs()).to.be.empty;
             mockDisabledByTrust.delete(pluginId);
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             (0, chai_1.expect)(service.getWalkthrough(wtId)).to.not.be.undefined;
         });
         it('should close a restricted walkthrough that was open', () => {
             service.selectWalkthrough(wtId);
             (0, chai_1.expect)(service.selectedWalkthrough?.id).to.equal(wtId);
             mockDisabledByTrust.add(pluginId);
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             (0, chai_1.expect)(service.selectedWalkthrough).to.be.undefined;
         });
         it('should drop the walkthrough once the plugin is out of sync', () => {
             // Theia keeps an uninstalled or disabled plugin loaded until the next reload, flagged as out of sync.
             mockPlugins[0].outOfSync = true;
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             (0, chai_1.expect)(service.getWalkthrough(wtId)).to.be.undefined;
             (0, chai_1.expect)(service.getWalkthroughs()).to.be.empty;
         });
@@ -675,17 +684,124 @@ describe('WalkthroughService', () => {
             let fired = false;
             service.onDidChangeWalkthroughs(() => { fired = true; });
             mockPlugins[0].outOfSync = true;
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             (0, chai_1.expect)(fired).to.be.true;
         });
         it('should close the walkthrough if it was open', () => {
             service.selectWalkthrough(wtId);
             (0, chai_1.expect)(service.selectedWalkthrough?.id).to.equal(wtId);
             mockPlugins[0].outOfSync = true;
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             (0, chai_1.expect)(service.selectedWalkthrough).to.be.undefined;
         });
     });
+    describe('contributed walkthroughs', () => {
+        const providedId = 'theia.test-walkthrough';
+        const pluginId = 'test.publisher.test-plugin';
+        const pluginWalkthroughId = 'test.publisher.test-plugin.test-walkthrough';
+        function createDefinition(overrides) {
+            return {
+                id: providedId,
+                title: 'Provided Walkthrough',
+                description: 'Contributed by a Theia extension',
+                icon: 'sparkle',
+                steps: [
+                    { id: 'first', title: 'First', description: 'First step' },
+                    { id: 'second', title: 'Second', description: 'Second step' }
+                ],
+                ...overrides
+            };
+        }
+        function provide(...definitions) {
+            mockWalkthroughProviders = [{ getWalkthroughs: () => definitions }];
+        }
+        it('should register the walkthroughs of a provider under their own id', () => {
+            provide(createDefinition());
+            service.syncWalkthroughs();
+            const walkthrough = service.getWalkthrough(providedId);
+            (0, chai_1.expect)(walkthrough).to.not.be.undefined;
+            (0, chai_1.expect)(walkthrough.title).to.equal('Provided Walkthrough');
+            (0, chai_1.expect)(walkthrough.icon).to.equal('sparkle');
+            (0, chai_1.expect)(walkthrough.pluginId).to.be.undefined;
+            (0, chai_1.expect)(walkthrough.steps.map(step => step.isComplete)).to.deep.equal([false, false]);
+        });
+        it('should keep plugin and provided walkthroughs alongside each other', () => {
+            mockPlugins = [{ model: { id: pluginId, publisher: 'test.publisher', name: 'test-plugin' } }];
+            mockDeployedPlugins.set(pluginId, { contributes: { walkthroughs: [createContribution()] } });
+            provide(createDefinition());
+            service.syncWalkthroughs();
+            (0, chai_1.expect)(service.getWalkthroughs().map(walkthrough => walkthrough.id)).to.have.members([pluginWalkthroughId, providedId]);
+        });
+        it('should not drop a provided walkthrough when plugins change', async () => {
+            provide(createDefinition());
+            service.syncWalkthroughs();
+            mockPlugins = [{ model: { id: pluginId, publisher: 'test.publisher', name: 'test-plugin' } }];
+            mockDeployedPlugins.set(pluginId, { contributes: { walkthroughs: [createContribution()] } });
+            await service.handlePluginsChanged();
+            (0, chai_1.expect)(service.getWalkthrough(providedId)).to.not.be.undefined;
+        });
+        it('should keep the progress of a re-synced, unchanged walkthrough', async () => {
+            provide(createDefinition());
+            service.syncWalkthroughs();
+            await service.markStepComplete(providedId, 'first');
+            service.syncWalkthroughs();
+            (0, chai_1.expect)(service.getWalkthrough(providedId).steps[0].isComplete).to.be.true;
+        });
+        it('should re-register a walkthrough whose definition changed', () => {
+            provide(createDefinition());
+            service.syncWalkthroughs();
+            (0, chai_1.expect)(service.getWalkthrough(providedId).steps).to.have.lengthOf(2);
+            provide(createDefinition({ steps: [{ id: 'only', title: 'Only', description: 'Only step' }] }));
+            service.syncWalkthroughs();
+            (0, chai_1.expect)(service.getWalkthrough(providedId).steps).to.have.lengthOf(1);
+        });
+        it('should drop a walkthrough that is no longer provided', () => {
+            provide(createDefinition());
+            service.syncWalkthroughs();
+            provide();
+            service.syncWalkthroughs();
+            (0, chai_1.expect)(service.getWalkthrough(providedId)).to.be.undefined;
+        });
+        it('should keep the other walkthroughs when a provider throws', () => {
+            mockWalkthroughProviders = [
+                { getWalkthroughs: () => { throw new Error('provider is broken'); } },
+                { getWalkthroughs: () => [createDefinition()] }
+            ];
+            service.syncWalkthroughs();
+            (0, chai_1.expect)(service.getWalkthrough(providedId)).to.not.be.undefined;
+        });
+        it('should not reject the sync when a provider throws', async () => {
+            mockWalkthroughProviders = [{ getWalkthroughs: () => { throw new Error('provider is broken'); } }];
+            service.init();
+            // A rejected `progressReady` would stop every later sync, so it has to survive a failing provider.
+            await service.progressReady;
+        });
+        it('should ignore a walkthrough whose id is already taken', () => {
+            mockWalkthroughProviders = [
+                { getWalkthroughs: () => [createDefinition({ title: 'First' })] },
+                { getWalkthroughs: () => [createDefinition({ title: 'Second' })] }
+            ];
+            service.syncWalkthroughs();
+            (0, chai_1.expect)(service.getWalkthroughs()).to.have.lengthOf(1);
+            (0, chai_1.expect)(service.getWalkthrough(providedId).title).to.equal('First');
+        });
+        it('should re-sync when a provider signals a change', async () => {
+            const onDidChangeEmitter = new event_1.Emitter();
+            let definitions = [];
+            mockWalkthroughProviders = [{
+                    getWalkthroughs: () => definitions,
+                    onDidChange: onDidChangeEmitter.event
+                }];
+            service.init();
+            await service.progressReady;
+            (0, chai_1.expect)(service.getWalkthroughs()).to.be.empty;
+            definitions = [createDefinition()];
+            onDidChangeEmitter.fire();
+            await service.progressReady;
+            (0, chai_1.expect)(service.getWalkthrough(providedId)).to.not.be.undefined;
+            onDidChangeEmitter.dispose();
+        });
+    });
     describe('extensionInstalled completion event', () => {
         const walkthroughContribution = createContribution({
             steps: [
@@ -705,13 +821,13 @@ describe('WalkthroughService', () => {
             });
         }
         beforeEach(() => {
-            // Set up the plugin so the walkthrough is discovered via syncWalkthroughsFromPlugins
+            // Set up the plugin so the walkthrough is discovered via syncWalkthroughs
             setupPluginWithWalkthrough();
-            service.syncWalkthroughsFromPlugins();
+            service.syncWalkthroughs();
             // Wire up the onDidChangePlugins handler manually (simulating @postConstruct)
             service.toDispose.push(service.pluginSupport.onDidChangePlugins(() => {
                 const previousIds = new Set(service.knownPluginIds);
-                service.syncWalkthroughsFromPlugins();
+                service.syncWalkthroughs();
                 const newIds = new Set(service.pluginSupport.plugins.map((p) => p.model.id));
                 for (const newId of newIds) {
                     if (!previousIds.has(newId)) {
@@ -764,7 +880,7 @@ describe('WalkthroughService', () => {
     });
     describe('onContext completion event', () => {
         beforeEach(() => {
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 steps: [
                     {
                         id: 'context-step',
@@ -827,14 +943,14 @@ describe('WalkthroughService', () => {
     describe('onContext expressions', () => {
         it('should complete a step whose context expression already holds at registration', () => {
             mockContextKeyMatchResult = true;
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 steps: [{ id: 'static', title: 'Static', description: 'd', completionEvents: ['onContext:isLinux'] }]
             }));
             const wtId = 'test.publisher.test-plugin.test-walkthrough';
             (0, chai_1.expect)(service.getWalkthrough(wtId).steps[0].isComplete).to.be.true;
         });
         it('should react to a context expression rather than treating it as a single key', () => {
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 steps: [{ id: 'expr', title: 'Expression', description: 'd', completionEvents: ['onContext:foo && bar'] }]
             }));
             // The keys of the expression have to be recognised, not the expression string itself.
@@ -848,7 +964,7 @@ describe('WalkthroughService', () => {
     });
     describe('onView completion event', () => {
         beforeEach(() => {
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 steps: [
                     {
                         id: 'view-step',
@@ -879,7 +995,7 @@ describe('WalkthroughService', () => {
         });
         it('should handle multiple onView completion events on different steps', async () => {
             // Register a second walkthrough with a different view event
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 id: 'multi-view-walkthrough',
                 steps: [
                     {
@@ -911,7 +1027,7 @@ describe('WalkthroughService', () => {
     });
     describe('onLink completion event', () => {
         beforeEach(() => {
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 steps: [
                     {
                         id: 'link-step',
@@ -939,7 +1055,7 @@ describe('WalkthroughService', () => {
             (0, chai_1.expect)(mockOpenerOpenCalls).to.have.lengthOf(1);
         });
         it('should complete step with command: URI', async () => {
-            service.registerWalkthrough(createContribution({
+            registerContribution(createContribution({
                 id: 'cmd-link-walkthrough',
                 steps: [
                     {
@@ -989,7 +1105,7 @@ describe('WalkthroughService', () => {
             // Wire up the onDidChangePlugins handler manually
             service.toDispose.push(service.pluginSupport.onDidChangePlugins(() => {
                 const previousIds = new Set(service.knownPluginIds);
-                service.syncWalkthroughsFromPlugins();
+                service.syncWalkthroughs();
                 const newIds = new Set(service.pluginSupport.plugins.map((p) => p.model.id));
                 for (const newId of newIds) {
                     if (!previousIds.has(newId)) {