chore: added some sinon assertions (#993)

mozilla · Jul 11, 2017 · 3d98456 · 3d98456
1 parent d1f9551
commit 3d98456
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/tests/unit/test-cmd/test.build.js b/tests/unit/test-cmd/test.build.js
@@ -66,11 +66,9 @@ describe('build', () => {
     };
     return build(params, {packageCreator, createFileFilter}).then(() => {
       // ensure sourceDir, artifactsDir, ignoreFiles is used
-      assert.ok(createFileFilter.called);
-      assert.deepEqual(createFileFilter.firstCall.args[0], params);
+      sinon.assert.calledWithMatch(createFileFilter, params);
       // ensure packageCreator received correct fileFilter
-      assert.ok(packageCreator.called);
-      assert.equal(packageCreator.firstCall.args[0].fileFilter, fileFilter);
+      sinon.assert.calledWithMatch(packageCreator, {fileFilter});
     });
   });
 

diff --git a/tests/unit/test-cmd/test.docs.js b/tests/unit/test-cmd/test.docs.js
@@ -10,8 +10,7 @@ describe('docs', () => {
   it('passes the correct url to docs', () => {
     const openUrl = sinon.spy((urlToOpen, callback) => callback(null));
     return defaultDocsCommand({}, {openUrl}).then(() => {
-      assert.ok(openUrl.called);
-      assert.equal(openUrl.firstCall.args[0], url);
+      sinon.assert.calledWith(openUrl, url);
     });
   });
 

diff --git a/tests/unit/test-cmd/test.run.js b/tests/unit/test-cmd/test.run.js
@@ -64,9 +64,9 @@ describe('run', () => {
     const cmd = prepareRun();
     const FirefoxDesktopExtensionRunner = sinon.spy(FakeExtensionRunner);
     await cmd.run({firefox}, {FirefoxDesktopExtensionRunner});
-    assert.equal(FirefoxDesktopExtensionRunner.called, true);
-    assert.equal(FirefoxDesktopExtensionRunner.firstCall.args[0].firefoxBinary,
-                 firefox);
+    sinon.assert.calledWithMatch(
+      FirefoxDesktopExtensionRunner, {firefoxBinary: firefox}
+    );
   });
 
   it('passes startUrl parameter to Firefox when specified', async () => {
@@ -76,10 +76,9 @@ describe('run', () => {
 
     await cmd.run({startUrl: expectedStartUrls},
                   {FirefoxDesktopExtensionRunner});
-
-    assert.ok(FirefoxDesktopExtensionRunner.called);
-    assert.deepEqual(FirefoxDesktopExtensionRunner.firstCall.args[0].startUrl,
-                     expectedStartUrls);
+    sinon.assert.calledWithMatch(
+      FirefoxDesktopExtensionRunner, {startUrl: expectedStartUrls}
+    );
   });
 
   it('passes the expected parameters to the extension runner', async () => {

diff --git a/tests/unit/test-extension-runners/test.firefox-desktop.js b/tests/unit/test-extension-runners/test.firefox-desktop.js
@@ -103,9 +103,9 @@ describe('util/extension-runners/firefox-desktop', () => {
     await runnerInstance.run();
 
     assert.ok(runnerInstance.getName(), 'Firefox Desktop');
-    assert.ok(remoteFirefox.installTemporaryAddon.calledOnce);
-    assert.equal(remoteFirefox.installTemporaryAddon.firstCall.args[0],
-                 params.extensions[0].sourceDir);
+    sinon.assert.calledOnce(remoteFirefox.installTemporaryAddon);
+    sinon.assert.calledWithMatch(remoteFirefox.installTemporaryAddon,
+                                 params.extensions[0].sourceDir);
 
     sinon.assert.calledOnce(params.firefoxApp.createProfile);
     sinon.assert.calledWith(params.firefoxApp.createProfile,

diff --git a/tests/unit/test.program.js b/tests/unit/test.program.js
@@ -73,8 +73,8 @@ describe('program.Program', () => {
       shouldExitProgram: true,
     })
       .then(() => {
-        assert.equal(fakeProcess.exit.called, true);
-        assert.equal(fakeProcess.exit.firstCall.args[0], 1);
+        sinon.assert.calledOnce(fakeProcess.exit);
+        sinon.assert.calledWith(fakeProcess.exit, 1);
       });
   });