Remove redundant stubs

gr-rest-api_mock is part of common-test-setup and is already
mocking these methods.

Change-Id: Iff44321bf8a8d96ca3b4e046b0ef1b133285ee0f
This commit is contained in:
Dhruv Srivastava
2021-03-10 13:40:34 +01:00
parent 5d30f4eb14
commit 6529d03da4
24 changed files with 1 additions and 35 deletions

View File

@@ -27,7 +27,6 @@ suite('gr-change-list-item tests', () => {
let element; let element;
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('getLoggedIn').returns(Promise.resolve(false));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
}); });

View File

@@ -87,7 +87,6 @@ suite('gr-change-metadata integration tests', () => {
} }
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('getLoggedIn').returns(Promise.resolve(false));
stubRestApi('deleteVote').returns(Promise.resolve({ok: true})); stubRestApi('deleteVote').returns(Promise.resolve({ok: true}));
}); });

View File

@@ -1983,7 +1983,6 @@ suite('gr-change-view tests', () => {
}); });
test('revert dialog opened with revert param', done => { test('revert dialog opened with revert param', done => {
stubRestApi('getLoggedIn').returns(Promise.resolve(true));
const awaitPluginsLoadedStub = sinon const awaitPluginsLoadedStub = sinon
.stub(getPluginLoader(), 'awaitPluginsLoaded') .stub(getPluginLoader(), 'awaitPluginsLoaded')
.callsFake(() => Promise.resolve()); .callsFake(() => Promise.resolve());

View File

@@ -80,7 +80,6 @@ suite('gr-file-list tests', () => {
suite('basic tests', () => { suite('basic tests', () => {
setup(done => { setup(done => {
stubRestApi('getLoggedIn').returns(Promise.resolve(true));
stubRestApi('getPreferences').returns(Promise.resolve({})); stubRestApi('getPreferences').returns(Promise.resolve({}));
stubRestApi('getDiffComments').returns(Promise.resolve({})); stubRestApi('getDiffComments').returns(Promise.resolve({}));
stubRestApi('getDiffRobotComments').returns(Promise.resolve({})); stubRestApi('getDiffRobotComments').returns(Promise.resolve({}));

View File

@@ -28,9 +28,7 @@ suite('gr-message tests', () => {
suite('when admin and logged in', () => { suite('when admin and logged in', () => {
setup(done => { setup(done => {
stubRestApi('getLoggedIn').returns(Promise.resolve(true));
stubRestApi('getPreferences').returns(Promise.resolve({})); stubRestApi('getPreferences').returns(Promise.resolve({}));
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getIsAdmin').returns(Promise.resolve(true)); stubRestApi('getIsAdmin').returns(Promise.resolve(true));
stubRestApi('deleteChangeCommitMessage').returns(Promise.resolve({})); stubRestApi('deleteChangeCommitMessage').returns(Promise.resolve({}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
@@ -424,7 +422,6 @@ suite('gr-message tests', () => {
setup(done => { setup(done => {
stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('getLoggedIn').returns(Promise.resolve(false));
stubRestApi('getPreferences').returns(Promise.resolve({})); stubRestApi('getPreferences').returns(Promise.resolve({}));
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getIsAdmin').returns(Promise.resolve(false)); stubRestApi('getIsAdmin').returns(Promise.resolve(false));
stubRestApi('deleteChangeCommitMessage').returns(Promise.resolve({})); stubRestApi('deleteChangeCommitMessage').returns(Promise.resolve({}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
@@ -516,8 +513,6 @@ suite('gr-message tests', () => {
suite('when logged in but not admin', () => { suite('when logged in but not admin', () => {
setup(async () => { setup(async () => {
stubRestApi('getLoggedIn').returns(Promise.resolve(true));
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getIsAdmin').returns(Promise.resolve(false)); stubRestApi('getIsAdmin').returns(Promise.resolve(false));
stubRestApi('deleteChangeCommitMessage').returns(Promise.resolve({})); stubRestApi('deleteChangeCommitMessage').returns(Promise.resolve({}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();

View File

@@ -133,7 +133,6 @@ suite('gr-messages-list tests', () => {
suite('basic tests', () => { suite('basic tests', () => {
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('getLoggedIn').returns(Promise.resolve(false));
stubRestApi('getDiffComments').returns(Promise.resolve(comments)); stubRestApi('getDiffComments').returns(Promise.resolve(comments));
stubRestApi('getDiffRobotComments').returns(Promise.resolve({})); stubRestApi('getDiffRobotComments').returns(Promise.resolve({}));
@@ -440,7 +439,6 @@ suite('gr-messages-list tests', () => {
let commentApiWrapper; let commentApiWrapper;
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('getLoggedIn').returns(Promise.resolve(false));
stubRestApi('getDiffComments').returns(Promise.resolve({})); stubRestApi('getDiffComments').returns(Promise.resolve({}));
stubRestApi('getDiffRobotComments').returns(Promise.resolve({})); stubRestApi('getDiffRobotComments').returns(Promise.resolve({}));

View File

@@ -75,7 +75,6 @@ suite('gr-reply-dialog-it tests', () => {
changeNum = 42; changeNum = 42;
patchNum = 1; patchNum = 1;
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getAccount').returns(Promise.resolve({_account_id: 42})); stubRestApi('getAccount').returns(Promise.resolve({_account_id: 42}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();

View File

@@ -65,7 +65,6 @@ suite('gr-reply-dialog tests', () => {
changeNum = 42; changeNum = 42;
patchNum = 1; patchNum = 1;
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getAccount').returns(Promise.resolve({})); stubRestApi('getAccount').returns(Promise.resolve({}));
stubRestApi('getChange').returns(Promise.resolve({})); stubRestApi('getChange').returns(Promise.resolve({}));
stubRestApi('getChangeSuggestedReviewers').returns(Promise.resolve([])); stubRestApi('getChangeSuggestedReviewers').returns(Promise.resolve([]));

View File

@@ -28,7 +28,6 @@ suite('gr-reviewer-list tests', () => {
element = basicFixture.instantiate(); element = basicFixture.instantiate();
element.serverConfig = {}; element.serverConfig = {};
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('removeChangeReviewer').returns(Promise.resolve({ok: true})); stubRestApi('removeChangeReviewer').returns(Promise.resolve({ok: true}));
}); });

View File

@@ -17,7 +17,6 @@
import '../../../test/common-test-setup-karma.js'; import '../../../test/common-test-setup-karma.js';
import './gr-account-dropdown.js'; import './gr-account-dropdown.js';
import {stubRestApi} from '../../../test/test-utils.js';
const basicFixture = fixtureFromElement('gr-account-dropdown'); const basicFixture = fixtureFromElement('gr-account-dropdown');
@@ -25,7 +24,6 @@ suite('gr-account-dropdown tests', () => {
let element; let element;
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
}); });

View File

@@ -804,7 +804,6 @@ suite('gr-router tests', () => {
}); });
test('redirects to dashboard if logged in', () => { test('redirects to dashboard if logged in', () => {
stubRestApi('getLoggedIn').returns(Promise.resolve(true));
const data = { const data = {
canonicalPath: '/', path: '/', querystring: '', hash: '', canonicalPath: '/', path: '/', querystring: '', hash: '',
}; };
@@ -934,7 +933,6 @@ suite('gr-router tests', () => {
}); });
test('dashboard while signed in sets params', () => { test('dashboard while signed in sets params', () => {
stubRestApi('getLoggedIn').returns(Promise.resolve(true));
const data = {canonicalPath: '/dashboard/', params: {0: 'foo'}}; const data = {canonicalPath: '/dashboard/', params: {0: 'foo'}};
return element._handleDashboardRoute(data, '').then(() => { return element._handleDashboardRoute(data, '').then(() => {
assert.isFalse(redirectToLoginStub.called); assert.isFalse(redirectToLoginStub.called);

View File

@@ -126,7 +126,6 @@ suite('gr-search-bar tests', () => {
suite('_getSearchSuggestions', () => { suite('_getSearchSuggestions', () => {
setup(() => { setup(() => {
// Ensure that config.change.mergeability_computation_behavior is not set. // Ensure that config.change.mergeability_computation_behavior is not set.
stubRestApi('getConfig').returns(Promise.resolve({}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
}); });

View File

@@ -60,7 +60,6 @@ suite('gr-comment-api tests', () => {
test('loads logged-in', () => { test('loads logged-in', () => {
const changeNum = 1234; const changeNum = 1234;
stubRestApi('getLoggedIn').returns(Promise.resolve(true));
const getCommentsStub = stubRestApi('getDiffComments').returns( const getCommentsStub = stubRestApi('getDiffComments').returns(
Promise.resolve({ Promise.resolve({
'foo.c': [{id: '123', message: 'foo bar', in_reply_to: '321'}], 'foo.c': [{id: '123', message: 'foo bar', in_reply_to: '321'}],

View File

@@ -1916,7 +1916,7 @@ suite('gr-diff-view tests', () => {
'a/b/test.c': {}, 'a/b/test.c': {},
}; };
stubRestApi('getConfig').returns(Promise.resolve({change: {}})); stubRestApi('getConfig').returns(Promise.resolve({change: {}}));
stubRestApi('getLoggedIn').returns(Promise.resolve(true));
stubRestApi('getProjectConfig').returns(Promise.resolve({})); stubRestApi('getProjectConfig').returns(Promise.resolve({}));
stubRestApi('getDiffChangeDetail').returns(Promise.resolve({})); stubRestApi('getDiffChangeDetail').returns(Promise.resolve({}));
stubRestApi('getChangeFiles').returns(Promise.resolve(changedFiles)); stubRestApi('getChangeFiles').returns(Promise.resolve(changedFiles));

View File

@@ -29,7 +29,6 @@ suite('gr-account-label tests', () => {
} }
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('getLoggedIn').returns(Promise.resolve(false));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
element._config = { element._config = {

View File

@@ -18,7 +18,6 @@
import '../../../test/common-test-setup-karma.js'; import '../../../test/common-test-setup-karma.js';
import './gr-account-link.js'; import './gr-account-link.js';
import {GerritNav} from '../../core/gr-navigation/gr-navigation.js'; import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
import {stubRestApi} from '../../../test/test-utils.js';
const basicFixture = fixtureFromElement('gr-account-link'); const basicFixture = fixtureFromElement('gr-account-link');
@@ -26,7 +25,6 @@ suite('gr-account-link tests', () => {
let element; let element;
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
}); });

View File

@@ -17,7 +17,6 @@
import '../../../test/common-test-setup-karma.js'; import '../../../test/common-test-setup-karma.js';
import './gr-account-list.js'; import './gr-account-list.js';
import {stubRestApi} from '../../../test/test-utils.js';
const basicFixture = fixtureFromElement('gr-account-list'); const basicFixture = fixtureFromElement('gr-account-list');
@@ -61,7 +60,6 @@ suite('gr-account-list tests', () => {
existingAccount1 = makeAccount(); existingAccount1 = makeAccount();
existingAccount2 = makeAccount(); existingAccount2 = makeAccount();
stubRestApi('getConfig').returns(Promise.resolve({}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
element.accounts = [existingAccount1, existingAccount2]; element.accounts = [existingAccount1, existingAccount2];
suggestionsProvider = new MockSuggestionsProvider(); suggestionsProvider = new MockSuggestionsProvider();

View File

@@ -442,7 +442,6 @@ suite('gr-comment tests', () => {
setup(() => { setup(() => {
stubRestApi('getAccount').returns(Promise.resolve(null)); stubRestApi('getAccount').returns(Promise.resolve(null));
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('saveDiffDraft').returns(Promise.resolve({ stubRestApi('saveDiffDraft').returns(Promise.resolve({
ok: true, ok: true,
text() { text() {

View File

@@ -17,7 +17,6 @@
import '../../../test/common-test-setup-karma.js'; import '../../../test/common-test-setup-karma.js';
import './gr-dropdown-list.js'; import './gr-dropdown-list.js';
import {stubRestApi} from '../../../test/test-utils.js';
const basicFixture = fixtureFromElement('gr-dropdown-list'); const basicFixture = fixtureFromElement('gr-dropdown-list');
@@ -25,7 +24,6 @@ suite('gr-dropdown-list tests', () => {
let element; let element;
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
}); });

View File

@@ -18,7 +18,6 @@
import '../../../test/common-test-setup-karma.js'; import '../../../test/common-test-setup-karma.js';
import './gr-dropdown.js'; import './gr-dropdown.js';
import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js'; import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
import {stubRestApi} from '../../../test/test-utils.js';
const basicFixture = fixtureFromElement('gr-dropdown'); const basicFixture = fixtureFromElement('gr-dropdown');
@@ -26,7 +25,6 @@ suite('gr-dropdown tests', () => {
let element; let element;
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
element = basicFixture.instantiate(); element = basicFixture.instantiate();
}); });

View File

@@ -31,7 +31,6 @@ suite('gr-change-reply-js-api tests', () => {
let plugin; let plugin;
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getAccount').returns(Promise.resolve(null)); stubRestApi('getAccount').returns(Promise.resolve(null));
}); });

View File

@@ -28,7 +28,6 @@ suite('gr-reporting-js-api tests', () => {
let plugin; let plugin;
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
stubRestApi('getAccount').returns(Promise.resolve(null)); stubRestApi('getAccount').returns(Promise.resolve(null));
}); });

View File

@@ -32,7 +32,6 @@ suite('GrEmailSuggestionsProvider tests', () => {
}; };
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
provider = new GrEmailSuggestionsProvider(appContext.restApiService); provider = new GrEmailSuggestionsProvider(appContext.restApiService);
}); });

View File

@@ -33,7 +33,6 @@ suite('GrGroupSuggestionsProvider tests', () => {
}; };
setup(() => { setup(() => {
stubRestApi('getConfig').returns(Promise.resolve({}));
provider = new GrGroupSuggestionsProvider(appContext.restApiService); provider = new GrGroupSuggestionsProvider(appContext.restApiService);
}); });