diff --git a/app/tests/spec/lib/translator.js b/app/tests/spec/lib/translator.js index 366322227..315020f93 100644 --- a/app/tests/spec/lib/translator.js +++ b/app/tests/spec/lib/translator.js @@ -52,7 +52,7 @@ define(function (require, exports, module) { }); it('is not called on startup if translations are already set', () => { - xhr.getJSON.reset(); + xhr.getJSON.resetHistory(); translator = new Translator({ xhr }); translator.set(TRANSLATIONS); return translator.fetch() diff --git a/app/tests/spec/models/account.js b/app/tests/spec/models/account.js index fa3618c89..7fed206d5 100644 --- a/app/tests/spec/models/account.js +++ b/app/tests/spec/models/account.js @@ -285,7 +285,7 @@ describe('models/account', function () { describe('signIn', () => { beforeEach(() => { - notifier.trigger.reset(); + notifier.trigger.resetHistory(); }); describe('with a password and no sessionToken', () => { @@ -1006,7 +1006,7 @@ describe('models/account', function () { describe('verifySignUp', function () { beforeEach(() => { - notifier.trigger.reset(); + notifier.trigger.resetHistory(); }); describe('with custom server verification value', function () { @@ -1127,7 +1127,7 @@ describe('models/account', function () { describe('signOut', () => { beforeEach(() => { - notifier.trigger.reset(); + notifier.trigger.resetHistory(); sinon.stub(fxaClient, 'sessionDestroy').callsFake(() => Promise.resolve()); account.set('sessionToken', SESSION_TOKEN); @@ -1150,7 +1150,7 @@ describe('models/account', function () { describe('destroy', function () { beforeEach(function () { - notifier.trigger.reset(); + notifier.trigger.resetHistory(); sinon.stub(fxaClient, 'deleteAccount').callsFake(function () { return Promise.resolve(); }); diff --git a/app/tests/spec/views/complete_sign_up.js b/app/tests/spec/views/complete_sign_up.js index b83f9ad8d..a4ec5cd86 100644 --- a/app/tests/spec/views/complete_sign_up.js +++ b/app/tests/spec/views/complete_sign_up.js @@ -567,7 +567,7 @@ define(function (require, exports, module) { describe('_notifyBrokerAndComplete', () => { beforeEach(() => { - notifier.trigger.reset(); + notifier.trigger.resetHistory(); }); it('logs and notifies the broker', () => { diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 05b81e9d5..42bb56789 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "fxa-content-server", - "version": "1.124.0", + "version": "1.125.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/tests/server/geo-locate.js b/tests/server/geo-locate.js index dedb8c963..426649d13 100644 --- a/tests/server/geo-locate.js +++ b/tests/server/geo-locate.js @@ -47,8 +47,8 @@ registerSuite('geo-locate, geodb succeeds', { }, afterEach () { - logger.error.reset(); - remoteAddress.reset(); + logger.error.resetHistory(); + remoteAddress.resetHistory(); }, tests: { diff --git a/tests/server/routes/get-metrics-flow.js b/tests/server/routes/get-metrics-flow.js index 538a8a139..d20a98f9d 100644 --- a/tests/server/routes/get-metrics-flow.js +++ b/tests/server/routes/get-metrics-flow.js @@ -41,7 +41,7 @@ registerSuite('routes/get-metrics-flow', { }, afterEach: function () { - sandbox.reset(); + sandbox.resetHistory(); }, tests: { diff --git a/tests/server/routes/post-metrics.js b/tests/server/routes/post-metrics.js index d67f31607..250ddeced 100644 --- a/tests/server/routes/post-metrics.js +++ b/tests/server/routes/post-metrics.js @@ -105,7 +105,7 @@ registerSuite('routes/post-metrics', { after() { Date.now.restore(); - sandbox.reset(); + sandbox.resetHistory(); }, tests: { 'request.body was converted to an object': function () { @@ -147,7 +147,7 @@ registerSuite('routes/post-metrics', { after: function () { Date.now.restore(); - sandbox.reset(); + sandbox.resetHistory(); }, tests: { @@ -232,7 +232,7 @@ registerSuite('routes/post-metrics', { after() { Date.now.restore(); - sandbox.reset(); + sandbox.resetHistory(); }, tests: { 'response.json was called': function () {