rework test to use TestAdapter

Author: mshima

package-lock.json

@@ -59,8 +59,8 @@
     "natives": "1.1.3"
   },
   "dependencies": {
-    "@yeoman/adapter": "^2.0.0",
-    "@yeoman/types": "^1.5.0",
+    "@yeoman/adapter": "^2.1.1",
+    "@yeoman/types": "^1.6.0",
     "chalk": "^5.4.1",
     "cli-list": "^1.0.0",
     "configstore": "^7.0.0",

package.json

@@ -88,15 +88,11 @@ describe('clear config route', () => {
   });
 
   it('shows generator with global config entry', async function () {
-    let choices = [];
-
-    this.sandbox.stub(adapter, 'prompt').callsFake(argument => {
-      ({choices} = argument[0]);
-      return Promise.resolve({whatNext: 'foo'});
-    });
+    adapter.addAnswers({whatNext: 'foo'});
 
     await this.router.navigate('clearConfig');
 
+    const {choices} = adapter.calls[0].question;
     // Clear all generators entry is present
     assert.ok(_.find(choices, {value: '*'}));
 

test/route-clear-config.js

@@ -12,7 +12,6 @@ describe('help route', () => {
   let adapter;
 
   beforeEach(async function () {
-    this.sandbox = sinon.createSandbox();
     this.homeRoute = sinon.stub().returns(Promise.resolve());
     adapter = new TestAdapter();
     this.router = new Router({adapter, env: sinon.stub()});
@@ -21,24 +20,25 @@ describe('help route', () => {
     this.router.registerRoute('help', helpRoute);
   });
 
-  afterEach(function () {
-    this.sandbox.restore();
+  afterEach(() => {
     esmocha.clearAllMocks();
   });
 
   it('allow returning home', async function () {
-    this.sandbox.stub(adapter, 'prompt').returns(Promise.resolve({whereTo: 'home'}));
-    await this.router.navigate('help').then(() => {
-      sinon.assert.calledOnce(this.homeRoute);
-    });
+    adapter.addAnswers({whereTo: 'home'});
+
+    await this.router.navigate('help');
+
+    sinon.assert.calledOnce(this.homeRoute);
   });
 
   it('open urls in browsers', async function () {
     const url = 'http://yeoman.io';
-    this.sandbox.stub(adapter, 'prompt').returns(Promise.resolve({whereTo: url}));
-    await this.router.navigate('help').then(() => {
-      expect(open).toHaveBeenCalledTimes(1);
-      expect(open).toHaveBeenCalledWith(url);
-    });
+    adapter.addAnswers({whereTo: url});
+
+    await this.router.navigate('help');
+
+    expect(open).toHaveBeenCalledTimes(1);
+    expect(open).toHaveBeenCalledWith(url);
   });
 });

test/route-help.js

@@ -11,7 +11,6 @@ describe('home route', () => {
   let adapter;
 
   beforeEach(async function () {
-    this.sandbox = sinon.createSandbox();
     this.env = await fakeEnv();
     adapter = new TestAdapter();
     this.router = new Router({adapter, env: this.env});
@@ -26,32 +25,29 @@ describe('home route', () => {
     this.router.registerRoute('update', this.updateRoute);
   });
 
-  afterEach(function () {
-    this.sandbox.restore();
-  });
-
   it('allow going to help', async function () {
-    this.sandbox.stub(adapter, 'prompt').returns(Promise.resolve({whatNext: 'help'}));
-    await this.router.navigate('home').then(() => {
-      sinon.assert.calledOnce(this.helpRoute);
-    });
+    adapter.addAnswers({whatNext: 'help'});
+
+    await this.router.navigate('home');
+
+    sinon.assert.calledOnce(this.helpRoute);
   });
 
   it('allow going to install', async function () {
-    this.sandbox.stub(adapter, 'prompt').returns(Promise.resolve({whatNext: 'install'}));
-    await this.router.navigate('home').then(() => {
-      sinon.assert.calledOnce(this.installRoute);
-    });
+    adapter.addAnswers({whatNext: 'install'});
+
+    await this.router.navigate('home');
+
+    sinon.assert.calledOnce(this.installRoute);
   });
 
   it('does not display update options if no generators is installed', async function () {
     this.router.generator = [];
-    this.sandbox.stub(adapter, 'prompt').callsFake(prompts => {
-      assert.strictEqual(_.map(prompts[0].choices, 'value').includes('update'), false);
-      return Promise.resolve({whatNext: 'exit'});
-    });
+    adapter.addAnswers({whatNext: 'exit'});
 
     await this.router.navigate('home');
+
+    assert.strictEqual(_.map(adapter.calls[0].question.choices, 'value').includes('update'), false);
   });
 
   it('show update menu option if there is installed generators', async function () {
@@ -62,14 +58,12 @@ describe('home route', () => {
       updateAvailable: false,
     }];
 
-    this.sandbox.stub(adapter, 'prompt').callsFake(prompts => {
-      assert(_.map(prompts[0].choices, 'value').includes('update'));
-      return Promise.resolve({whatNext: 'update'});
-    });
+    adapter.addAnswers({whatNext: 'update'});
 
-    await this.router.navigate('home').then(() => {
-      sinon.assert.calledOnce(this.updateRoute);
-    });
+    await this.router.navigate('home');
+
+    assert(_.map(adapter.calls[0].question.choices, 'value').includes('update'));
+    sinon.assert.calledOnce(this.updateRoute);
   });
 
   it('list runnable generators', async function () {
@@ -80,19 +74,17 @@ describe('home route', () => {
       updateAvailable: false,
     }];
 
-    this.sandbox.stub(adapter, 'prompt').callsFake(prompts => {
-      assert.strictEqual(prompts[0].choices[1].value.generator, 'unicorn:app');
-      return Promise.resolve({
-        whatNext: {
-          method: 'run',
-          generator: 'unicorn:app',
-        },
-      });
+    adapter.addAnswers({
+      whatNext: {
+        method: 'run',
+        generator: 'unicorn:app',
+      },
     });
 
-    await this.router.navigate('home').then(() => {
-      sinon.assert.calledWith(this.runRoute, this.router, 'unicorn:app');
-    });
+    await this.router.navigate('home');
+
+    assert.strictEqual(adapter.calls[0].question.choices[1].value.generator, 'unicorn:app');
+    sinon.assert.calledWith(this.runRoute, this.router, 'unicorn:app');
   });
 
   it('show update available message behind generator name', async function () {
@@ -103,11 +95,10 @@ describe('home route', () => {
       updateAvailable: true,
     }];
 
-    this.sandbox.stub(adapter, 'prompt').callsFake(prompts => {
-      assert(prompts[0].choices[1].name.includes('♥ Update Available!'));
-      return Promise.resolve({whatNext: 'exit'});
-    });
+    adapter.addAnswers({whatNext: 'exit'});
 
     await this.router.navigate('home');
+
+    assert(adapter.calls[0].question.choices[1].name.includes('♥ Update Available!'));
   });
 });