Update sinon version The WCT tests used deprecated version on sinon. This change adds the newest version of sinon to polygerrit and update tests. Change-Id: Ic746c4afc97779974da643362e17c9c1bb1cbf48
diff --git a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_test.js b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_test.js index 2128e29..2d7096f 100644 --- a/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_test.js +++ b/polygerrit-ui/app/elements/admin/gr-access-section/gr-access-section_test.js
@@ -22,17 +22,11 @@ suite('gr-access-section tests', () => { let element; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); element = fixture.instantiate(); }); - teardown(() => { - sandbox.restore(); - }); - suite('unit tests', () => { setup(() => { element.section = { @@ -123,7 +117,7 @@ }); test('_computePermissions', () => { - sandbox.stub(element, 'toSortedArray').returns( + sinon.stub(element, 'toSortedArray').returns( [{ id: 'push', value: { @@ -463,7 +457,7 @@ test('_handleValueChange', () => { // For an existing section. - const modifiedHandler = sandbox.stub(); + const modifiedHandler = sinon.stub(); element.section = {id: 'refs/for/bar', value: {permissions: {}}}; assert.notOk(element.section.value.updatedId); element.section.id = 'refs/for/baz'; @@ -528,7 +522,7 @@ }); test('remove an added section', () => { - const removeStub = sandbox.stub(); + const removeStub = sinon.stub(); element.addEventListener('added-section-removed', removeStub); element.editing = true; element.section.value.added = true;
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list_test.js b/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list_test.js index 973f3df..546b8a8 100644 --- a/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list_test.js +++ b/polygerrit-ui/app/elements/admin/gr-admin-group-list/gr-admin-group-list_test.js
@@ -40,20 +40,15 @@ suite('gr-admin-group-list tests', () => { let element; let groups; - let sandbox; + let value; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); }); - teardown(() => { - sandbox.restore(); - }); - test('_computeGroupUrl', () => { - let urlStub = sandbox.stub(GerritNav, 'getUrlForGroup', + let urlStub = sinon.stub(GerritNav, 'getUrlForGroup').callsFake( () => '/admin/groups/e2cd66f88a2db4d391ac068a92d987effbe872f5'); let group = { @@ -64,7 +59,7 @@ urlStub.restore(); - urlStub = sandbox.stub(GerritNav, 'getUrlForGroup', + urlStub = sinon.stub(GerritNav, 'getUrlForGroup').callsFake( () => '/admin/groups/user/test'); group = { @@ -102,7 +97,7 @@ }); test('_maybeOpenCreateOverlay', () => { - const overlayOpen = sandbox.stub(element.$.createOverlay, 'open'); + const overlayOpen = sinon.stub(element.$.createOverlay, 'open'); element._maybeOpenCreateOverlay(); assert.isFalse(overlayOpen.called); const params = {}; @@ -134,10 +129,10 @@ suite('filter', () => { test('_paramsChanged', done => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getGroups', - () => Promise.resolve(groups)); + 'getGroups') + .callsFake(() => Promise.resolve(groups)); const value = { filter: 'test', offset: 25, @@ -167,7 +162,7 @@ suite('create new', () => { test('_handleCreateClicked called when create-click fired', () => { - sandbox.stub(element, '_handleCreateClicked'); + sinon.stub(element, '_handleCreateClicked'); element.shadowRoot .querySelector('gr-list-view').dispatchEvent( new CustomEvent('create-clicked', { @@ -177,13 +172,13 @@ }); test('_handleCreateClicked opens modal', () => { - const openStub = sandbox.stub(element.$.createOverlay, 'open'); + const openStub = sinon.stub(element.$.createOverlay, 'open'); element._handleCreateClicked(); assert.isTrue(openStub.called); }); test('_handleCreateGroup called when confirm fired', () => { - sandbox.stub(element, '_handleCreateGroup'); + sinon.stub(element, '_handleCreateGroup'); element.$.createDialog.dispatchEvent( new CustomEvent('confirm', { composed: true, bubbles: true, @@ -192,7 +187,7 @@ }); test('_handleCloseCreate called when cancel fired', () => { - sandbox.stub(element, '_handleCloseCreate'); + sinon.stub(element, '_handleCloseCreate'); element.$.createDialog.dispatchEvent( new CustomEvent('cancel', { composed: true, bubbles: true,
diff --git a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.js b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.js index 6d47c5e..25b14e2 100644 --- a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.js +++ b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view_test.js
@@ -25,10 +25,8 @@ suite('gr-admin-view tests', () => { let element; - let sandbox; setup(done => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); stub('gr-rest-api-interface', { getProjectConfig() { @@ -36,14 +34,10 @@ }, }); const pluginsLoaded = Promise.resolve(); - sandbox.stub(pluginLoader, 'awaitPluginsLoaded').returns(pluginsLoaded); + sinon.stub(pluginLoader, 'awaitPluginsLoaded').returns(pluginsLoaded); pluginsLoaded.then(() => flush(done)); }); - teardown(() => { - sandbox.restore(); - }); - test('_computeURLHelper', () => { const path = '/test'; const host = 'http://www.testsite.com'; @@ -56,7 +50,7 @@ element._computeLinkURL({url: '/test', noBaseUrl: true}), '//' + window.location.host + '/test'); - sandbox.stub(element, 'getBaseUrl').returns('/foo'); + sinon.stub(element, 'getBaseUrl').returns('/foo'); assert.equal( element._computeLinkURL({url: '/test', noBaseUrl: true}), '//' + window.location.host + '/foo/test'); @@ -88,18 +82,18 @@ }); test('_filteredLinks admin', done => { - sandbox.stub(element.$.restAPI, 'getAccount').returns(Promise.resolve({ + sinon.stub(element.$.restAPI, 'getAccount').returns(Promise.resolve({ name: 'test-user', })); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccountCapabilities', - () => Promise.resolve({ + 'getAccountCapabilities') + .callsFake(() => Promise.resolve({ createGroup: true, createProject: true, viewPlugins: true, }) - ); + ); element.reload().then(() => { assert.equal(element._filteredLinks.length, 3); @@ -116,14 +110,14 @@ }); test('_filteredLinks non admin authenticated', done => { - sandbox.stub(element.$.restAPI, 'getAccount').returns(Promise.resolve({ + sinon.stub(element.$.restAPI, 'getAccount').returns(Promise.resolve({ name: 'test-user', })); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccountCapabilities', - () => Promise.resolve({}) - ); + 'getAccountCapabilities') + .callsFake(() => Promise.resolve({}) + ); element.reload().then(() => { assert.equal(element._filteredLinks.length, 2); @@ -147,7 +141,7 @@ }); test('_filteredLinks from plugin', () => { - sandbox.stub(element.$.jsAPI, 'getAdminMenuLinks').returns([ + sinon.stub(element.$.jsAPI, 'getAdminMenuLinks').returns([ {text: 'internal link text', url: '/internal/link/url'}, {text: 'external link text', url: 'http://external/link/url'}, ]); @@ -176,13 +170,13 @@ test('Repo shows up in nav', done => { element._repoName = 'Test Repo'; - sandbox.stub(element.$.restAPI, 'getAccount').returns(Promise.resolve({ + sinon.stub(element.$.restAPI, 'getAccount').returns(Promise.resolve({ name: 'test-user', })); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccountCapabilities', - () => Promise.resolve({ + 'getAccountCapabilities') + .callsFake(() => Promise.resolve({ createGroup: true, createProject: true, viewPlugins: true, @@ -207,13 +201,13 @@ element._groupIsInternal = true; element._isAdmin = true; element._groupOwner = false; - sandbox.stub(element.$.restAPI, 'getAccount').returns(Promise.resolve({ + sinon.stub(element.$.restAPI, 'getAccount').returns(Promise.resolve({ name: 'test-user', })); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccountCapabilities', - () => Promise.resolve({ + 'getAccountCapabilities') + .callsFake(() => Promise.resolve({ createGroup: true, createProject: true, viewPlugins: true, @@ -236,19 +230,19 @@ }); test('Nav is reloaded when repo changes', () => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccountCapabilities', - () => Promise.resolve({ + 'getAccountCapabilities') + .callsFake(() => Promise.resolve({ createGroup: true, createProject: true, viewPlugins: true, })); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccount', - () => Promise.resolve({_id: 1})); - sandbox.stub(element, 'reload'); + 'getAccount') + .callsFake(() => Promise.resolve({_id: 1})); + sinon.stub(element, 'reload'); element.params = {repo: 'Test Repo', adminView: 'gr-repo'}; assert.equal(element.reload.callCount, 1); element.params = {repo: 'Test Repo 2', @@ -257,28 +251,28 @@ }); test('Nav is reloaded when group changes', () => { - sandbox.stub(element, '_computeGroupName'); - sandbox.stub( + sinon.stub(element, '_computeGroupName'); + sinon.stub( element.$.restAPI, - 'getAccountCapabilities', - () => Promise.resolve({ + 'getAccountCapabilities') + .callsFake(() => Promise.resolve({ createGroup: true, createProject: true, viewPlugins: true, })); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccount', - () => Promise.resolve({_id: 1})); - sandbox.stub(element, 'reload'); + 'getAccount') + .callsFake(() => Promise.resolve({_id: 1})); + sinon.stub(element, 'reload'); element.params = {groupId: '1', adminView: 'gr-group'}; assert.equal(element.reload.callCount, 1); }); test('Nav is reloaded when group name changes', done => { const newName = 'newName'; - sandbox.stub(element, '_computeGroupName'); - sandbox.stub(element, 'reload', () => { + sinon.stub(element, '_computeGroupName'); + sinon.stub(element, 'reload').callsFake(() => { assert.equal(element._groupName, newName); assert.isTrue(element.reload.called); done(); @@ -325,18 +319,18 @@ view: GerritNav.View.REPO, detail: GerritNav.RepoDetailView.ACCESS, }; - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccountCapabilities', - () => Promise.resolve({ + 'getAccountCapabilities') + .callsFake(() => Promise.resolve({ createGroup: true, createProject: true, viewPlugins: true, })); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccount', - () => Promise.resolve({_id: 1})); + 'getAccount') + .callsFake(() => Promise.resolve({_id: 1})); flushAsynchronousOperations(); const expectedFilteredLinks = [ { @@ -449,9 +443,9 @@ parent: 'my-repo', }, ]; - sandbox.stub(GerritNav, 'navigateToRelativeUrl'); - sandbox.spy(element, '_selectedIsCurrentPage'); - sandbox.spy(element, '_handleSubsectionChange'); + sinon.stub(GerritNav, 'navigateToRelativeUrl'); + sinon.spy(element, '_selectedIsCurrentPage'); + sinon.spy(element, '_handleSubsectionChange'); element.reload().then(() => { assert.deepEqual(element._filteredLinks, expectedFilteredLinks); assert.deepEqual(element._subsectionLinks, expectedSubsectionLinks); @@ -488,18 +482,18 @@ suite('_computeSelectedClass', () => { setup(() => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccountCapabilities', - () => Promise.resolve({ + 'getAccountCapabilities') + .callsFake(() => Promise.resolve({ createGroup: true, createProject: true, viewPlugins: true, })); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getAccount', - () => Promise.resolve({_id: 1})); + 'getAccount') + .callsFake(() => Promise.resolve({_id: 1})); return element.reload(); }); @@ -581,12 +575,12 @@ _loadGroupDetails: () => {}, }); - sandbox.stub(element.$.restAPI, 'getGroupConfig') + sinon.stub(element.$.restAPI, 'getGroupConfig') .returns(Promise.resolve({ name: 'foo', id: 'c0f83e941ce90caea30e6ad88f0d4ea0e841a7a9', })); - sandbox.stub(element.$.restAPI, 'getIsGroupOwner') + sinon.stub(element.$.restAPI, 'getIsGroupOwner') .returns(Promise.resolve(true)); return element.reload(); }); @@ -625,7 +619,7 @@ test('external group', () => { element.$.restAPI.getGroupConfig.restore(); - sandbox.stub(element.$.restAPI, 'getGroupConfig') + sinon.stub(element.$.restAPI, 'getGroupConfig') .returns(Promise.resolve({ name: 'foo', id: 'external-id',
diff --git a/polygerrit-ui/app/elements/admin/gr-confirm-delete-item-dialog/gr-confirm-delete-item-dialog_test.js b/polygerrit-ui/app/elements/admin/gr-confirm-delete-item-dialog/gr-confirm-delete-item-dialog_test.js index e00c23d..485a48b 100644 --- a/polygerrit-ui/app/elements/admin/gr-confirm-delete-item-dialog/gr-confirm-delete-item-dialog_test.js +++ b/polygerrit-ui/app/elements/admin/gr-confirm-delete-item-dialog/gr-confirm-delete-item-dialog_test.js
@@ -22,21 +22,15 @@ suite('gr-confirm-delete-item-dialog tests', () => { let element; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); }); - teardown(() => { - sandbox.restore(); - }); - test('_handleConfirmTap', () => { - const confirmHandler = sandbox.stub(); + const confirmHandler = sinon.stub(); element.addEventListener('confirm', confirmHandler); - sandbox.spy(element, '_handleConfirmTap'); + sinon.spy(element, '_handleConfirmTap'); element.shadowRoot .querySelector('gr-dialog').dispatchEvent( new CustomEvent('confirm', { @@ -49,9 +43,9 @@ }); test('_handleCancelTap', () => { - const cancelHandler = sandbox.stub(); + const cancelHandler = sinon.stub(); element.addEventListener('cancel', cancelHandler); - sandbox.spy(element, '_handleCancelTap'); + sinon.spy(element, '_handleCancelTap'); element.shadowRoot .querySelector('gr-dialog').dispatchEvent( new CustomEvent('cancel', {
diff --git a/polygerrit-ui/app/elements/admin/gr-create-change-dialog/gr-create-change-dialog_test.js b/polygerrit-ui/app/elements/admin/gr-create-change-dialog/gr-create-change-dialog_test.js index b87783e..07eee42 100644 --- a/polygerrit-ui/app/elements/admin/gr-create-change-dialog/gr-create-change-dialog_test.js +++ b/polygerrit-ui/app/elements/admin/gr-create-change-dialog/gr-create-change-dialog_test.js
@@ -22,10 +22,8 @@ suite('gr-create-change-dialog tests', () => { let element; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); stub('gr-rest-api-interface', { getLoggedIn() { return Promise.resolve(true); }, getRepoBranches(input) { @@ -52,10 +50,6 @@ }; }); - teardown(() => { - sandbox.restore(); - }); - test('new change created with default', done => { const configInputObj = { branch: 'test-branch', @@ -65,8 +59,8 @@ work_in_progress: true, }; - const saveStub = sandbox.stub(element.$.restAPI, - 'createChange', () => Promise.resolve({})); + const saveStub = sinon.stub(element.$.restAPI, + 'createChange').callsFake(() => Promise.resolve({})); element.branch = 'test-branch'; element.topic = 'test-topic'; @@ -92,7 +86,8 @@ configured_value: 'TRUE', inherited_value: false, }; - sandbox.stub(element, '_formatBooleanString', () => Promise.resolve(true)); + sinon.stub(element, '_formatBooleanString') + .callsFake(() => Promise.resolve(true)); flushAsynchronousOperations(); const configInputObj = { @@ -103,8 +98,8 @@ work_in_progress: true, }; - const saveStub = sandbox.stub(element.$.restAPI, - 'createChange', () => Promise.resolve({})); + const saveStub = sinon.stub(element.$.restAPI, + 'createChange').callsFake(() => Promise.resolve({})); element.branch = 'test-branch'; element.topic = 'test-topic';
diff --git a/polygerrit-ui/app/elements/admin/gr-create-group-dialog/gr-create-group-dialog_test.js b/polygerrit-ui/app/elements/admin/gr-create-group-dialog/gr-create-group-dialog_test.js index cf17f24..d9bc500 100644 --- a/polygerrit-ui/app/elements/admin/gr-create-group-dialog/gr-create-group-dialog_test.js +++ b/polygerrit-ui/app/elements/admin/gr-create-group-dialog/gr-create-group-dialog_test.js
@@ -23,21 +23,16 @@ suite('gr-create-group-dialog tests', () => { let element; - let sandbox; + const GROUP_NAME = 'test-group'; setup(() => { - sandbox = sinon.sandbox.create(); stub('gr-rest-api-interface', { getLoggedIn() { return Promise.resolve(true); }, }); element = basicFixture.instantiate(); }); - teardown(() => { - sandbox.restore(); - }); - test('name is updated correctly', done => { assert.isFalse(element.hasNewGroupName); @@ -52,13 +47,13 @@ }); test('test for redirecting to group on successful creation', done => { - sandbox.stub(element.$.restAPI, 'createGroup') + sinon.stub(element.$.restAPI, 'createGroup') .returns(Promise.resolve({status: 201})); - sandbox.stub(element.$.restAPI, 'getGroupConfig') + sinon.stub(element.$.restAPI, 'getGroupConfig') .returns(Promise.resolve({group_id: 551})); - const showStub = sandbox.stub(page, 'show'); + const showStub = sinon.stub(page, 'show'); element.handleCreateGroup() .then(() => { assert.isTrue(showStub.calledWith('/admin/groups/551')); @@ -67,13 +62,13 @@ }); test('test for unsuccessful group creation', done => { - sandbox.stub(element.$.restAPI, 'createGroup') + sinon.stub(element.$.restAPI, 'createGroup') .returns(Promise.resolve({status: 409})); - sandbox.stub(element.$.restAPI, 'getGroupConfig') + sinon.stub(element.$.restAPI, 'getGroupConfig') .returns(Promise.resolve({group_id: 551})); - const showStub = sandbox.stub(page, 'show'); + const showStub = sinon.stub(page, 'show'); element.handleCreateGroup() .then(() => { assert.isFalse(showStub.called);
diff --git a/polygerrit-ui/app/elements/admin/gr-create-pointer-dialog/gr-create-pointer-dialog_test.js b/polygerrit-ui/app/elements/admin/gr-create-pointer-dialog/gr-create-pointer-dialog_test.js index 93d60ae..22f19a6 100644 --- a/polygerrit-ui/app/elements/admin/gr-create-pointer-dialog/gr-create-pointer-dialog_test.js +++ b/polygerrit-ui/app/elements/admin/gr-create-pointer-dialog/gr-create-pointer-dialog_test.js
@@ -23,29 +23,23 @@ suite('gr-create-pointer-dialog tests', () => { let element; - let sandbox; const ironInput = function(element) { return dom(element).querySelector('iron-input'); }; setup(() => { - sandbox = sinon.sandbox.create(); stub('gr-rest-api-interface', { getLoggedIn() { return Promise.resolve(true); }, }); element = basicFixture.instantiate(); }); - teardown(() => { - sandbox.restore(); - }); - test('branch created', done => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'createRepoBranch', - () => Promise.resolve({})); + 'createRepoBranch') + .callsFake(() => Promise.resolve({})); assert.isFalse(element.hasNewItemName); @@ -64,10 +58,10 @@ }); test('tag created', done => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'createRepoTag', - () => Promise.resolve({})); + 'createRepoTag') + .callsFake(() => Promise.resolve({})); assert.isFalse(element.hasNewItemName); @@ -86,10 +80,10 @@ }); test('tag created with annotations', done => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'createRepoTag', - () => Promise.resolve({})); + 'createRepoTag') + .callsFake(() => Promise.resolve({})); assert.isFalse(element.hasNewItemName);
diff --git a/polygerrit-ui/app/elements/admin/gr-create-repo-dialog/gr-create-repo-dialog_test.js b/polygerrit-ui/app/elements/admin/gr-create-repo-dialog/gr-create-repo-dialog_test.js index b57bf25..1e1fb0e 100644 --- a/polygerrit-ui/app/elements/admin/gr-create-repo-dialog/gr-create-repo-dialog_test.js +++ b/polygerrit-ui/app/elements/admin/gr-create-repo-dialog/gr-create-repo-dialog_test.js
@@ -22,20 +22,14 @@ suite('gr-create-repo-dialog tests', () => { let element; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); stub('gr-rest-api-interface', { getLoggedIn() { return Promise.resolve(true); }, }); element = basicFixture.instantiate(); }); - teardown(() => { - sandbox.restore(); - }); - test('default values are populated', () => { assert.isTrue(element.$.initialCommit.bindValue); assert.isFalse(element.$.parentRepo.bindValue); @@ -50,8 +44,8 @@ owners: ['testId'], }; - const saveStub = sandbox.stub(element.$.restAPI, - 'createRepo', () => Promise.resolve({})); + const saveStub = sinon.stub(element.$.restAPI, + 'createRepo').callsFake(() => Promise.resolve({})); assert.isFalse(element.hasNewRepoName);
diff --git a/polygerrit-ui/app/elements/admin/gr-group-audit-log/gr-group-audit-log_test.js b/polygerrit-ui/app/elements/admin/gr-group-audit-log/gr-group-audit-log_test.js index fdf073e..1bbfcae 100644 --- a/polygerrit-ui/app/elements/admin/gr-group-audit-log/gr-group-audit-log_test.js +++ b/polygerrit-ui/app/elements/admin/gr-group-audit-log/gr-group-audit-log_test.js
@@ -22,17 +22,11 @@ suite('gr-group-audit-log tests', () => { let element; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); }); - teardown(() => { - sandbox.restore(); - }); - suite('members', () => { test('test _getNameForGroup', () => { let group = { @@ -85,8 +79,9 @@ element.groupId = 1; const response = {status: 404}; - sandbox.stub( - element.$.restAPI, 'getGroupAuditLog', (group, errFn) => { + sinon.stub( + element.$.restAPI, 'getGroupAuditLog') + .callsFake((group, errFn) => { errFn(response); });
diff --git a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members_test.js b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members_test.js index 90228cc..f047cfe 100644 --- a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members_test.js +++ b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members_test.js
@@ -23,15 +23,13 @@ suite('gr-group-members tests', () => { let element; - let sandbox; + let groups; let groupMembers; let includedGroups; let groupStub; setup(() => { - sandbox = sinon.sandbox.create(); - groups = { name: 'Administrators', owner: 'Administrators', @@ -137,19 +135,15 @@ }, }); element = basicFixture.instantiate(); - sandbox.stub(element, 'getBaseUrl').returns('https://test/site'); + sinon.stub(element, 'getBaseUrl').returns('https://test/site'); element.groupId = 1; - groupStub = sandbox.stub( + groupStub = sinon.stub( element.$.restAPI, - 'getGroupConfig', - () => Promise.resolve(groups)); + 'getGroupConfig') + .callsFake(() => Promise.resolve(groups)); return element._loadGroupDetails(); }); - teardown(() => { - sandbox.restore(); - }); - test('_includedGroups', () => { assert.equal(element._includedGroups.length, 3); assert.equal(dom(element.root) @@ -167,8 +161,8 @@ const memberName = 'test-admin'; - const saveStub = sandbox.stub(element.$.restAPI, 'saveGroupMembers', - () => Promise.resolve({})); + const saveStub = sinon.stub(element.$.restAPI, 'saveGroupMembers') + .callsFake(() => Promise.resolve({})); const button = element.$.saveGroupMember; @@ -192,8 +186,9 @@ const includedGroupName = 'testName'; - const saveIncludedGroupStub = sandbox.stub( - element.$.restAPI, 'saveIncludedGroup', () => Promise.resolve({})); + const saveIncludedGroupStub = sinon.stub( + element.$.restAPI, 'saveIncludedGroup') + .callsFake(() => Promise.resolve({})); const button = element.$.saveIncludedGroups; @@ -216,11 +211,11 @@ element._groupOwner = true; const memberName = 'bad-name'; - const alertStub = sandbox.stub(); + const alertStub = sinon.stub(); element.addEventListener('show-alert', alertStub); const error = new Error('error'); error.status = 404; - sandbox.stub(element.$.restAPI, 'saveGroupMembers', + sinon.stub(element.$.restAPI, 'saveGroupMembers').callsFake( () => Promise.reject(error)); element.$.groupMemberSearchInput.text = memberName; @@ -345,8 +340,9 @@ element.groupId = 1; const response = {status: 404}; - sandbox.stub( - element.$.restAPI, 'getGroupConfig', (group, errFn) => { + sinon.stub( + element.$.restAPI, 'getGroupConfig') + .callsFake((group, errFn) => { errFn(response); }); element.addEventListener('page-error', e => {
diff --git a/polygerrit-ui/app/elements/admin/gr-group/gr-group_test.js b/polygerrit-ui/app/elements/admin/gr-group/gr-group_test.js index 0cb5dfe..c6054b2 100644 --- a/polygerrit-ui/app/elements/admin/gr-group/gr-group_test.js +++ b/polygerrit-ui/app/elements/admin/gr-group/gr-group_test.js
@@ -22,7 +22,7 @@ suite('gr-group tests', () => { let element; - let sandbox; + let groupStub; const group = { id: '6a1e70e1a88782771a91808c8af9bbb7a9871389', @@ -36,20 +36,14 @@ }; setup(() => { - sandbox = sinon.sandbox.create(); stub('gr-rest-api-interface', { getLoggedIn() { return Promise.resolve(true); }, }); element = basicFixture.instantiate(); - groupStub = sandbox.stub( + groupStub = sinon.stub( element.$.restAPI, - 'getGroupConfig', - () => Promise.resolve(group) - ); - }); - - teardown(() => { - sandbox.restore(); + 'getGroupConfig') + .callsFake(() => Promise.resolve(group)); }); test('loading displays before group config is loaded', () => { @@ -61,10 +55,10 @@ }); test('default values are populated with internal group', done => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getIsGroupOwner', - () => Promise.resolve(true)); + 'getIsGroupOwner') + .callsFake(() => Promise.resolve(true)); element.groupId = 1; element._loadGroup().then(() => { assert.isTrue(element._groupIsInternal); @@ -77,14 +71,14 @@ const groupExternal = Object.assign({}, group); groupExternal.id = 'external-group-id'; groupStub.restore(); - groupStub = sandbox.stub( + groupStub = sinon.stub( element.$.restAPI, - 'getGroupConfig', - () => Promise.resolve(groupExternal)); - sandbox.stub( + 'getGroupConfig') + .callsFake(() => Promise.resolve(groupExternal)); + sinon.stub( element.$.restAPI, - 'getIsGroupOwner', - () => Promise.resolve(true)); + 'getIsGroupOwner') + .callsFake(() => Promise.resolve(true)); element.groupId = 1; element._loadGroup().then(() => { assert.isFalse(element._groupIsInternal); @@ -102,15 +96,15 @@ }; element._groupName = groupName; - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getIsGroupOwner', - () => Promise.resolve(true)); + 'getIsGroupOwner') + .callsFake(() => Promise.resolve(true)); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'saveGroupName', - () => Promise.resolve({status: 200})); + 'saveGroupName') + .callsFake(() => Promise.resolve({status: 200})); const button = element.$.inputUpdateNameBtn; @@ -141,10 +135,10 @@ element._groupConfigOwner = 'testId'; element._groupOwner = true; - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getIsGroupOwner', - () => Promise.resolve({status: 200})); + 'getIsGroupOwner') + .callsFake(() => Promise.resolve({status: 200})); const button = element.$.inputUpdateOwnerBtn; @@ -168,10 +162,10 @@ test('test for undefined group name', done => { groupStub.restore(); - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getGroupConfig', - () => Promise.resolve({})); + 'getGroupConfig') + .callsFake(() => Promise.resolve({})); assert.isUndefined(element.groupId); @@ -195,10 +189,10 @@ name: 'test-group', }; - sandbox.stub(element.$.restAPI, 'saveGroupName') + sinon.stub(element.$.restAPI, 'saveGroupName') .returns(Promise.resolve({status: 200})); - const showStub = sandbox.stub(element, 'dispatchEvent'); + const showStub = sinon.stub(element, 'dispatchEvent'); element._handleSaveName() .then(() => { assert.isTrue(showStub.called); @@ -245,10 +239,10 @@ element.groupId = 1; const response = {status: 404}; - sandbox.stub( - element.$.restAPI, 'getGroupConfig', (group, errFn) => { - errFn(response); - }); + sinon.stub( + element.$.restAPI, 'getGroupConfig').callsFake((group, errFn) => { + errFn(response); + }); element.addEventListener('page-error', e => { assert.deepEqual(e.detail.response, response);
diff --git a/polygerrit-ui/app/elements/admin/gr-permission/gr-permission_test.js b/polygerrit-ui/app/elements/admin/gr-permission/gr-permission_test.js index 1d9dacc..835c90a 100644 --- a/polygerrit-ui/app/elements/admin/gr-permission/gr-permission_test.js +++ b/polygerrit-ui/app/elements/admin/gr-permission/gr-permission_test.js
@@ -22,12 +22,10 @@ suite('gr-permission tests', () => { let element; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); - sandbox.stub(element.$.restAPI, 'getSuggestedGroups').returns( + sinon.stub(element.$.restAPI, 'getSuggestedGroups').returns( Promise.resolve({ 'Administrators': { id: '4c97682e6ce61b7247f3381b6f1789356666de7f', @@ -38,10 +36,6 @@ })); }); - teardown(() => { - sandbox.restore(); - }); - suite('unit tests', () => { test('_sortPermission', () => { const permission = { @@ -253,7 +247,7 @@ suite('interactions', () => { setup(() => { - sandbox.spy(element, '_computeLabel'); + sinon.spy(element, '_computeLabel'); element.name = 'Priority'; element.section = 'refs/*'; element.labels = { @@ -337,7 +331,7 @@ }); test('removing an added permission', () => { - const removeStub = sandbox.stub(); + const removeStub = sinon.stub(); element.addEventListener('added-permission-removed', removeStub); element.editing = true; element.name = 'Priority'; @@ -352,7 +346,7 @@ element.name = 'Priority'; element.section = 'refs/*'; - const removeStub = sandbox.stub(); + const removeStub = sinon.stub(); element.addEventListener('added-permission-removed', removeStub); assert.isFalse(element.$.permission.classList.contains('deleted')); @@ -384,7 +378,7 @@ }); test('_handleValueChange', () => { - const modifiedHandler = sandbox.stub(); + const modifiedHandler = sinon.stub(); element.permission = {value: {rules: {}}}; element.addEventListener('access-modified', modifiedHandler); assert.isNotOk(element.permission.value.modified);
diff --git a/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor_test.js b/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor_test.js index 5791260..9e9eb1c 100644 --- a/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor_test.js +++ b/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor_test.js
@@ -23,13 +23,12 @@ suite('gr-plugin-config-array-editor tests', () => { let element; - let sandbox; + let dispatchStub; const getAll = str => dom(element.root).querySelectorAll(str); setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); element.pluginOption = { _key: 'test-key', @@ -39,8 +38,6 @@ }; }); - teardown(() => sandbox.restore()); - test('_computeShowInputRow', () => { assert.equal(element._computeShowInputRow(true), 'hide'); assert.equal(element._computeShowInputRow(false), ''); @@ -58,7 +55,7 @@ suite('adding', () => { setup(() => { - dispatchStub = sandbox.stub(element, '_dispatchChanged'); + dispatchStub = sinon.stub(element, '_dispatchChanged'); }); test('with enter', () => { @@ -93,7 +90,7 @@ }); test('deleting', () => { - dispatchStub = sandbox.stub(element, '_dispatchChanged'); + dispatchStub = sinon.stub(element, '_dispatchChanged'); element.pluginOption = {info: {values: ['test', 'test2']}}; flushAsynchronousOperations(); @@ -117,7 +114,7 @@ }); test('_dispatchChanged', () => { - const eventStub = sandbox.stub(element, 'dispatchEvent'); + const eventStub = sinon.stub(element, 'dispatchEvent'); element._dispatchChanged(['new-test-value']); assert.isTrue(eventStub.called);
diff --git a/polygerrit-ui/app/elements/admin/gr-plugin-list/gr-plugin-list_test.js b/polygerrit-ui/app/elements/admin/gr-plugin-list/gr-plugin-list_test.js index c1b32da..a73c7cf 100644 --- a/polygerrit-ui/app/elements/admin/gr-plugin-list/gr-plugin-list_test.js +++ b/polygerrit-ui/app/elements/admin/gr-plugin-list/gr-plugin-list_test.js
@@ -38,19 +38,14 @@ suite('gr-plugin-list tests', () => { let element; let plugins; - let sandbox; + let value; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); counter = 0; }); - teardown(() => { - sandbox.restore(); - }); - suite('list with plugins', () => { setup(done => { plugins = _.times(26, pluginGenerator); @@ -110,10 +105,10 @@ suite('filter', () => { test('_paramsChanged', done => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getPlugins', - () => Promise.resolve(plugins)); + 'getPlugins') + .callsFake(() => Promise.resolve(plugins)); const value = { filter: 'test', offset: 25, @@ -148,7 +143,7 @@ suite('404', () => { test('fires page-error', done => { const response = {status: 404}; - sandbox.stub(element.$.restAPI, 'getPlugins', + sinon.stub(element.$.restAPI, 'getPlugins').callsFake( (filter, pluginsPerPage, opt_offset, errFn) => { errFn(response); });
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_test.js b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_test.js index 6919940..0248dfc 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_test.js +++ b/polygerrit-ui/app/elements/admin/gr-repo-access/gr-repo-access_test.js
@@ -24,7 +24,7 @@ suite('gr-repo-access tests', () => { let element; - let sandbox; + let repoStub; const accessRes = { @@ -99,37 +99,32 @@ }, }; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); stub('gr-rest-api-interface', { getAccount() { return Promise.resolve(null); }, }); - repoStub = sandbox.stub(element.$.restAPI, 'getRepo').returns( + repoStub = sinon.stub(element.$.restAPI, 'getRepo').returns( Promise.resolve(repoRes)); element._loading = false; element._ownerOf = []; element._canUpload = false; }); - teardown(() => { - sandbox.restore(); - }); - test('_repoChanged called when repo name changes', () => { - sandbox.stub(element, '_repoChanged'); + sinon.stub(element, '_repoChanged'); element.repo = 'New Repo'; assert.isTrue(element._repoChanged.called); }); test('_repoChanged', done => { - const accessStub = sandbox.stub(element.$.restAPI, + const accessStub = sinon.stub(element.$.restAPI, 'getRepoAccessRights'); accessStub.withArgs('New Repo').returns( Promise.resolve(JSON.parse(JSON.stringify(accessRes)))); accessStub.withArgs('Another New Repo') .returns(Promise.resolve(JSON.parse(JSON.stringify(accessRes2)))); - const capabilitiesStub = sandbox.stub(element.$.restAPI, + const capabilitiesStub = sinon.stub(element.$.restAPI, 'getCapabilities'); capabilitiesStub.returns(Promise.resolve(capabilitiesRes)); @@ -164,9 +159,9 @@ name: 'Access Database', }, }; - const accessStub = sandbox.stub(element.$.restAPI, 'getRepoAccessRights') + const accessStub = sinon.stub(element.$.restAPI, 'getRepoAccessRights') .returns(Promise.resolve(JSON.parse(JSON.stringify(accessRes2)))); - const capabilitiesStub = sandbox.stub(element.$.restAPI, + const capabilitiesStub = sinon.stub(element.$.restAPI, 'getCapabilities').returns(Promise.resolve(capabilitiesRes)); element._repoChanged().then(() => { @@ -199,7 +194,7 @@ test('inherit section', () => { element._local = {}; element._ownerOf = []; - sandbox.stub(element, '_computeParentHref'); + sinon.stub(element, '_computeParentHref'); // Nothing should appear when no inherit from and not in edit mode. assert.equal(getComputedStyle(element.$.inheritsFrom).display, 'none'); // The autocomplete should be hidden, and the link should be displayed. @@ -244,8 +239,9 @@ test('fires page-error', done => { const response = {status: 404}; - sandbox.stub( - element.$.restAPI, 'getRepoAccessRights', (repoName, errFn) => { + sinon.stub( + element.$.restAPI, 'getRepoAccessRights') + .callsFake((repoName, errFn) => { errFn(response); }); @@ -352,7 +348,7 @@ }); test('_handleAccessModified called with event fired', () => { - sandbox.spy(element, '_handleAccessModified'); + sinon.spy(element, '_handleAccessModified'); element.dispatchEvent( new CustomEvent('access-modified', { composed: true, bubbles: true, @@ -370,7 +366,7 @@ detail: {}, composed: true, bubbles: true, })); - sandbox.spy(element, '_handleAccessModified'); + sinon.spy(element, '_handleAccessModified'); element.dispatchEvent( new CustomEvent('access-modified', { detail: {}, @@ -381,8 +377,8 @@ test('_handleSaveForReview', () => { const saveStub = - sandbox.stub(element.$.restAPI, 'setRepoAccessRightsForReview'); - sandbox.stub(element, '_computeAddAndRemove').returns({ + sinon.stub(element.$.restAPI, 'setRepoAccessRightsForReview'); + sinon.stub(element, '_computeAddAndRemove').returns({ add: {}, remove: {}, }); @@ -1164,16 +1160,16 @@ }, }, }; - sandbox.stub(element.$.restAPI, 'getRepoAccessRights').returns( + sinon.stub(element.$.restAPI, 'getRepoAccessRights').returns( Promise.resolve(JSON.parse(JSON.stringify(accessRes)))); - sandbox.stub(GerritNav, 'navigateToChange'); + sinon.stub(GerritNav, 'navigateToChange'); let resolver; - const saveStub = sandbox.stub(element.$.restAPI, + const saveStub = sinon.stub(element.$.restAPI, 'setRepoAccessRights') .returns(new Promise(r => resolver = r)); element.repo = 'test-repo'; - sandbox.stub(element, '_computeAddAndRemove').returns(repoAccessInput); + sinon.stub(element, '_computeAddAndRemove').returns(repoAccessInput); element._modified = true; MockInteractions.tap(element.$.saveBtn); @@ -1211,16 +1207,16 @@ }, }, }; - sandbox.stub(element.$.restAPI, 'getRepoAccessRights').returns( + sinon.stub(element.$.restAPI, 'getRepoAccessRights').returns( Promise.resolve(JSON.parse(JSON.stringify(accessRes)))); - sandbox.stub(GerritNav, 'navigateToChange'); + sinon.stub(GerritNav, 'navigateToChange'); let resolver; - const saveForReviewStub = sandbox.stub(element.$.restAPI, + const saveForReviewStub = sinon.stub(element.$.restAPI, 'setRepoAccessRightsForReview') .returns(new Promise(r => resolver = r)); element.repo = 'test-repo'; - sandbox.stub(element, '_computeAddAndRemove').returns(repoAccessInput); + sinon.stub(element, '_computeAddAndRemove').returns(repoAccessInput); element._modified = true; MockInteractions.tap(element.$.saveReviewBtn);
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-commands/gr-repo-commands_test.js b/polygerrit-ui/app/elements/admin/gr-repo-commands/gr-repo-commands_test.js index b3fd560..0bb0c55 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo-commands/gr-repo-commands_test.js +++ b/polygerrit-ui/app/elements/admin/gr-repo-commands/gr-repo-commands_test.js
@@ -23,31 +23,26 @@ suite('gr-repo-commands tests', () => { let element; - let sandbox; + let repoStub; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); - repoStub = sandbox.stub( + repoStub = sinon.stub( element.$.restAPI, - 'getProjectConfig', - () => Promise.resolve({})); - }); - - teardown(() => { - sandbox.restore(); + 'getProjectConfig') + .callsFake(() => Promise.resolve({})); }); suite('create new change dialog', () => { test('_createNewChange opens modal', () => { - const openStub = sandbox.stub(element.$.createChangeOverlay, 'open'); + const openStub = sinon.stub(element.$.createChangeOverlay, 'open'); element._createNewChange(); assert.isTrue(openStub.called); }); test('_handleCreateChange called when confirm fired', () => { - sandbox.stub(element, '_handleCreateChange'); + sinon.stub(element, '_handleCreateChange'); element.$.createChangeDialog.dispatchEvent( new CustomEvent('confirm', { composed: true, bubbles: true, @@ -56,7 +51,7 @@ }); test('_handleCloseCreateChange called when cancel fired', () => { - sandbox.stub(element, '_handleCloseCreateChange'); + sinon.stub(element, '_handleCloseCreateChange'); element.$.createChangeDialog.dispatchEvent( new CustomEvent('cancel', { composed: true, bubbles: true, @@ -72,11 +67,11 @@ let alertStub; setup(() => { - createChangeStub = sandbox.stub(element.$.restAPI, 'createChange'); - urlStub = sandbox.stub(GerritNav, 'getEditUrlForDiff'); - sandbox.stub(GerritNav, 'navigateToRelativeUrl'); - handleSpy = sandbox.spy(element, '_handleEditRepoConfig'); - alertStub = sandbox.stub(); + createChangeStub = sinon.stub(element.$.restAPI, 'createChange'); + urlStub = sinon.stub(GerritNav, 'getEditUrlForDiff'); + sinon.stub(GerritNav, 'navigateToRelativeUrl'); + handleSpy = sinon.spy(element, '_handleEditRepoConfig'); + alertStub = sinon.stub(); element.addEventListener('show-alert', alertStub); }); @@ -121,8 +116,9 @@ element.repo = 'test'; const response = {status: 404}; - sandbox.stub( - element.$.restAPI, 'getProjectConfig', (repo, errFn) => { + sinon.stub( + element.$.restAPI, 'getProjectConfig') + .callsFake((repo, errFn) => { errFn(response); }); element.addEventListener('page-error', e => {
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards_test.js b/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards_test.js index 0e058be..b4d3575 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards_test.js +++ b/polygerrit-ui/app/elements/admin/gr-repo-dashboards/gr-repo-dashboards_test.js
@@ -23,20 +23,14 @@ suite('gr-repo-dashboards tests', () => { let element; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); }); - teardown(() => { - sandbox.restore(); - }); - suite('dashboard table', () => { setup(() => { - sandbox.stub(element.$.restAPI, 'getRepoDashboards').returns( + sinon.stub(element.$.restAPI, 'getRepoDashboards').returns( Promise.resolve([ { id: 'default:contributor', @@ -117,7 +111,7 @@ suite('test url', () => { test('_getUrl', () => { - sandbox.stub(GerritNav, 'getUrlForRepoDashboard', + sinon.stub(GerritNav, 'getUrlForRepoDashboard').callsFake( () => '/r/dashboard/test'); assert.equal(element._getUrl('/dashboard/test', {}), '/r/dashboard/test'); @@ -129,8 +123,9 @@ suite('404', () => { test('fires page-error', done => { const response = {status: 404}; - sandbox.stub( - element.$.restAPI, 'getRepoDashboards', (repo, errFn) => { + sinon.stub( + element.$.restAPI, 'getRepoDashboards') + .callsFake((repo, errFn) => { errFn(response); });
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.js b/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.js index fd3c4ae..7190218 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.js +++ b/polygerrit-ui/app/elements/admin/gr-repo-detail-list/gr-repo-detail-list_test.js
@@ -59,18 +59,12 @@ suite('Branches', () => { let element; let branches; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); element.detailType = 'branches'; counter = 0; - sandbox.stub(page, 'show'); - }); - - teardown(() => { - sandbox.restore(); + sinon.stub(page, 'show'); }); suite('list of repo branches', () => { @@ -122,8 +116,8 @@ }); test('Edit HEAD button not admin', done => { - sandbox.stub(element, '_getLoggedIn').returns(Promise.resolve(true)); - sandbox.stub(element.$.restAPI, 'getRepoAccess').returns( + sinon.stub(element, '_getLoggedIn').returns(Promise.resolve(true)); + sinon.stub(element.$.restAPI, 'getRepoAccess').returns( Promise.resolve({ test: {is_owner: false}, })); @@ -146,12 +140,12 @@ const revisionWithEditing = dom(element.root) .querySelector('.revisionWithEditing'); - sandbox.stub(element, '_getLoggedIn').returns(Promise.resolve(true)); - sandbox.stub(element.$.restAPI, 'getRepoAccess').returns( + sinon.stub(element, '_getLoggedIn').returns(Promise.resolve(true)); + sinon.stub(element.$.restAPI, 'getRepoAccess').returns( Promise.resolve({ test: {is_owner: true}, })); - sandbox.stub(element, '_handleSaveRevision'); + sinon.stub(element, '_handleSaveRevision'); element._determineIfOwner('test').then(() => { assert.equal(element._isOwner, true); // The revision container for non-editing enabled row is not visible. @@ -222,9 +216,9 @@ }); test('_handleSaveRevision with invalid rev', done => { - const event = {model: {set: sandbox.stub()}}; + const event = {model: {set: sinon.stub()}}; element._isEditing = true; - sandbox.stub(element.$.restAPI, 'setRepoHead').returns( + sinon.stub(element.$.restAPI, 'setRepoHead').returns( Promise.resolve({ status: 400, }) @@ -238,9 +232,9 @@ }); test('_handleSaveRevision with valid rev', done => { - const event = {model: {set: sandbox.stub()}}; + const event = {model: {set: sinon.stub()}}; element._isEditing = true; - sandbox.stub(element.$.restAPI, 'setRepoHead').returns( + sinon.stub(element.$.restAPI, 'setRepoHead').returns( Promise.resolve({ status: 200, }) @@ -284,10 +278,10 @@ suite('filter', () => { test('_paramsChanged', done => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getRepoBranches', - () => Promise.resolve(branches)); + 'getRepoBranches') + .callsFake(() => Promise.resolve(branches)); const params = { detail: 'branches', repo: 'test', @@ -311,7 +305,7 @@ suite('404', () => { test('fires page-error', done => { const response = {status: 404}; - sandbox.stub(element.$.restAPI, 'getRepoBranches', + sinon.stub(element.$.restAPI, 'getRepoBranches').callsFake( (filter, repo, reposBranchesPerPage, opt_offset, errFn) => { errFn(response); }); @@ -335,18 +329,12 @@ suite('Tags', () => { let element; let tags; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); element.detailType = 'tags'; counter = 0; - sandbox.stub(page, 'show'); - }); - - teardown(() => { - sandbox.restore(); + sinon.stub(page, 'show'); }); test('_computeMessage', () => { @@ -468,10 +456,10 @@ suite('filter', () => { test('_paramsChanged', done => { - sandbox.stub( + sinon.stub( element.$.restAPI, - 'getRepoTags', - () => Promise.resolve(tags)); + 'getRepoTags') + .callsFake(() => Promise.resolve(tags)); const params = { repo: 'test', detail: 'tags', @@ -494,7 +482,7 @@ suite('create new', () => { test('_handleCreateClicked called when create-click fired', () => { - sandbox.stub(element, '_handleCreateClicked'); + sinon.stub(element, '_handleCreateClicked'); element.shadowRoot .querySelector('gr-list-view').dispatchEvent( new CustomEvent('create-clicked', { @@ -504,13 +492,13 @@ }); test('_handleCreateClicked opens modal', () => { - const openStub = sandbox.stub(element.$.createOverlay, 'open'); + const openStub = sinon.stub(element.$.createOverlay, 'open'); element._handleCreateClicked(); assert.isTrue(openStub.called); }); test('_handleCreateItem called when confirm fired', () => { - sandbox.stub(element, '_handleCreateItem'); + sinon.stub(element, '_handleCreateItem'); element.$.createDialog.dispatchEvent( new CustomEvent('confirm', { composed: true, bubbles: true, @@ -519,7 +507,7 @@ }); test('_handleCloseCreate called when cancel fired', () => { - sandbox.stub(element, '_handleCloseCreate'); + sinon.stub(element, '_handleCloseCreate'); element.$.createDialog.dispatchEvent( new CustomEvent('cancel', { composed: true, bubbles: true, @@ -531,7 +519,7 @@ suite('404', () => { test('fires page-error', done => { const response = {status: 404}; - sandbox.stub(element.$.restAPI, 'getRepoTags', + sinon.stub(element.$.restAPI, 'getRepoTags').callsFake( (filter, repo, reposTagsPerPage, opt_offset, errFn) => { errFn(response); });
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.js b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.js index e35f8e4..b629cf4 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.js +++ b/polygerrit-ui/app/elements/admin/gr-repo-list/gr-repo-list_test.js
@@ -38,20 +38,15 @@ suite('gr-repo-list tests', () => { let element; let repos; - let sandbox; + let value; setup(() => { - sandbox = sinon.sandbox.create(); - sandbox.stub(page, 'show'); + sinon.stub(page, 'show'); element = basicFixture.instantiate(); counter = 0; }); - teardown(() => { - sandbox.restore(); - }); - suite('list with repos', () => { setup(done => { repos = _.times(26, repoGenerator); @@ -75,7 +70,7 @@ }); test('_maybeOpenCreateOverlay', () => { - const overlayOpen = sandbox.stub(element.$.createOverlay, 'open'); + const overlayOpen = sinon.stub(element.$.createOverlay, 'open'); element._maybeOpenCreateOverlay(); assert.isFalse(overlayOpen.called); const params = {}; @@ -113,7 +108,8 @@ }); test('_paramsChanged', done => { - sandbox.stub(element.$.restAPI, 'getRepos', () => Promise.resolve(repos)); + sinon.stub(element.$.restAPI, 'getRepos') + .callsFake( () => Promise.resolve(repos)); const value = { filter: 'test', offset: 25, @@ -126,7 +122,7 @@ }); test('latest repos requested are always set', done => { - const repoStub = sandbox.stub(element.$.restAPI, 'getRepos'); + const repoStub = sinon.stub(element.$.restAPI, 'getRepos'); repoStub.withArgs('test').returns(Promise.resolve(repos)); repoStub.withArgs('filter').returns(Promise.resolve(reposFiltered)); element._filter = 'test'; @@ -156,7 +152,7 @@ suite('create new', () => { test('_handleCreateClicked called when create-click fired', () => { - sandbox.stub(element, '_handleCreateClicked'); + sinon.stub(element, '_handleCreateClicked'); element.shadowRoot .querySelector('gr-list-view').dispatchEvent( new CustomEvent('create-clicked', { @@ -166,13 +162,13 @@ }); test('_handleCreateClicked opens modal', () => { - const openStub = sandbox.stub(element.$.createOverlay, 'open'); + const openStub = sinon.stub(element.$.createOverlay, 'open'); element._handleCreateClicked(); assert.isTrue(openStub.called); }); test('_handleCreateRepo called when confirm fired', () => { - sandbox.stub(element, '_handleCreateRepo'); + sinon.stub(element, '_handleCreateRepo'); element.$.createDialog.dispatchEvent( new CustomEvent('confirm', { composed: true, bubbles: true, @@ -181,7 +177,7 @@ }); test('_handleCloseCreate called when cancel fired', () => { - sandbox.stub(element, '_handleCloseCreate'); + sinon.stub(element, '_handleCloseCreate'); element.$.createDialog.dispatchEvent( new CustomEvent('cancel', { composed: true, bubbles: true,
diff --git a/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config_test.js b/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config_test.js index eea88de..1730839 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config_test.js +++ b/polygerrit-ui/app/elements/admin/gr-repo-plugin-config/gr-repo-plugin-config_test.js
@@ -22,15 +22,11 @@ suite('gr-repo-plugin-config tests', () => { let element; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); }); - teardown(() => sandbox.restore()); - test('_computePluginConfigOptions', () => { assert.deepEqual(element._computePluginConfigOptions(), []); assert.deepEqual(element._computePluginConfigOptions({}), []); @@ -48,7 +44,7 @@ }); test('_handleChange', () => { - const eventStub = sandbox.stub(element, 'dispatchEvent'); + const eventStub = sinon.stub(element, 'dispatchEvent'); element.pluginData = { name: 'testName', config: {plugin: {value: 'test'}}, @@ -72,8 +68,8 @@ let buildStub; setup(() => { - changeStub = sandbox.stub(element, '_handleChange'); - buildStub = sandbox.stub(element, '_buildConfigChangeInfo'); + changeStub = sinon.stub(element, '_handleChange'); + buildStub = sinon.stub(element, '_buildConfigChangeInfo'); }); test('ARRAY type option', () => {
diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.js b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.js index 345a034..3b42e3b 100644 --- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.js +++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.js
@@ -24,7 +24,7 @@ suite('gr-repo tests', () => { let element; - let sandbox; + let repoStub; const repoConf = { description: 'Access inherited by all other projects.', @@ -99,7 +99,6 @@ } setup(() => { - sandbox = sinon.sandbox.create(); stub('gr-rest-api-interface', { getLoggedIn() { return Promise.resolve(false); }, getConfig() { @@ -107,14 +106,10 @@ }, }); element = basicFixture.instantiate(); - repoStub = sandbox.stub( + repoStub = sinon.stub( element.$.restAPI, - 'getProjectConfig', - () => Promise.resolve(repoConf)); - }); - - teardown(() => { - sandbox.restore(); + 'getProjectConfig') + .callsFake(() => Promise.resolve(repoConf)); }); test('_computePluginData', () => { @@ -126,7 +121,7 @@ }); test('_handlePluginConfigChanged', () => { - const notifyStub = sandbox.stub(element, 'notifyPath'); + const notifyStub = sinon.stub(element, 'notifyPath'); element._repoConfig = {plugin_config: {}}; element._handlePluginConfigChanged({detail: { name: 'test', @@ -175,11 +170,11 @@ test('form defaults to read only when logged in and not admin', done => { element.repo = REPO; - sandbox.stub(element, '_getLoggedIn', () => Promise.resolve(true)); - sandbox.stub( + sinon.stub(element, '_getLoggedIn').callsFake(() => Promise.resolve(true)); + sinon.stub( element.$.restAPI, - 'getRepoAccess', - () => Promise.resolve({'test-repo': {}})); + 'getRepoAccess') + .callsFake(() => Promise.resolve({'test-repo': {}})); element._loadRepo().then(() => { assert.isTrue(element._readOnly); done(); @@ -252,10 +247,10 @@ element.repo = 'test'; const response = {status: 404}; - sandbox.stub( - element.$.restAPI, 'getProjectConfig', (repo, errFn) => { - errFn(response); - }); + sinon.stub( + element.$.restAPI, 'getProjectConfig').callsFake((repo, errFn) => { + errFn(response); + }); element.addEventListener('page-error', e => { assert.deepEqual(e.detail.response, response); done(); @@ -267,11 +262,12 @@ suite('admin', () => { setup(() => { element.repo = REPO; - sandbox.stub(element, '_getLoggedIn', () => Promise.resolve(true)); - sandbox.stub( + sinon.stub(element, '_getLoggedIn') + .callsFake(() => Promise.resolve(true)); + sinon.stub( element.$.restAPI, - 'getRepoAccess', - () => Promise.resolve({'test-repo': {is_owner: true}})); + 'getRepoAccess') + .callsFake(() => Promise.resolve({'test-repo': {is_owner: true}})); }); test('all form elements are enabled', done => { @@ -327,8 +323,8 @@ enable_reviewer_by_email: 'TRUE', }; - const saveStub = sandbox.stub(element.$.restAPI, 'saveRepoConfig' - , () => Promise.resolve({})); + const saveStub = sinon.stub(element.$.restAPI, 'saveRepoConfig') + .callsFake(() => Promise.resolve({})); const button = dom(element.root).querySelector('gr-button');
diff --git a/polygerrit-ui/app/elements/admin/gr-rule-editor/gr-rule-editor_test.js b/polygerrit-ui/app/elements/admin/gr-rule-editor/gr-rule-editor_test.js index 40cee04..9364a50 100644 --- a/polygerrit-ui/app/elements/admin/gr-rule-editor/gr-rule-editor_test.js +++ b/polygerrit-ui/app/elements/admin/gr-rule-editor/gr-rule-editor_test.js
@@ -23,17 +23,11 @@ suite('gr-rule-editor tests', () => { let element; - let sandbox; setup(() => { - sandbox = sinon.sandbox.create(); element = basicFixture.instantiate(); }); - teardown(() => { - sandbox.restore(); - }); - suite('unit tests', () => { test('_computeForce, _computeForceClass, and _computeForceOptions', () => { @@ -133,7 +127,7 @@ test('_setDefaultRuleValues', () => { element.rule = {id: 123}; const defaultValue = {action: 'ALLOW'}; - sandbox.stub(element, '_getDefaultRuleValues').returns(defaultValue); + sinon.stub(element, '_getDefaultRuleValues').returns(defaultValue); element._setDefaultRuleValues(); assert.isTrue(element._getDefaultRuleValues.called); assert.equal(element.rule.value, defaultValue); @@ -156,7 +150,7 @@ }); test('_handleValueChange', () => { - const modifiedHandler = sandbox.stub(); + const modifiedHandler = sinon.stub(); element.rule = {value: {}}; element.addEventListener('access-modified', modifiedHandler); element._handleValueChange(); @@ -346,7 +340,7 @@ test('remove value', () => { element.editing = true; - const removeStub = sandbox.stub(); + const removeStub = sinon.stub(); element.addEventListener('added-rule-removed', removeStub); MockInteractions.tap(element.$.removeBtn); flushAsynchronousOperations(); @@ -399,7 +393,7 @@ }); test('modify value', () => { - const removeStub = sandbox.stub(); + const removeStub = sinon.stub(); element.addEventListener('added-rule-removed', removeStub); assert.isNotOk(element.rule.value.modified); dom(element.root).querySelector('#labelMin').bindValue = 1; @@ -414,7 +408,7 @@ suite('new rule with labels', () => { setup(done => { - sandbox.spy(element, '_setDefaultRuleValues'); + sinon.spy(element, '_setDefaultRuleValues'); element.label = {values: [ {value: -2, text: 'This shall not be merged'}, {value: -1, text: 'I would prefer this is not merged as is'},