diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.js b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.js index acf71c3b0c..5570d26f20 100644 --- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.js +++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_test.js @@ -27,7 +27,6 @@ suite('gr-change-list-item tests', () => { let element; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getLoggedIn').returns(Promise.resolve(false)); element = basicFixture.instantiate(); }); diff --git a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata-it_test.js b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata-it_test.js index e71c086e36..d00f64df73 100644 --- a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata-it_test.js +++ b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata-it_test.js @@ -87,7 +87,6 @@ suite('gr-change-metadata integration tests', () => { } setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('deleteVote').returns(Promise.resolve({ok: true})); }); diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts index 0099327b1c..5dfe6022da 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts @@ -1983,7 +1983,6 @@ suite('gr-change-view tests', () => { }); test('revert dialog opened with revert param', done => { - stubRestApi('getLoggedIn').returns(Promise.resolve(true)); const awaitPluginsLoadedStub = sinon .stub(getPluginLoader(), 'awaitPluginsLoaded') .callsFake(() => Promise.resolve()); diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js index 80d8729fd6..32b303513f 100644 --- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js +++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_test.js @@ -80,7 +80,6 @@ suite('gr-file-list tests', () => { suite('basic tests', () => { setup(done => { - stubRestApi('getLoggedIn').returns(Promise.resolve(true)); stubRestApi('getPreferences').returns(Promise.resolve({})); stubRestApi('getDiffComments').returns(Promise.resolve({})); stubRestApi('getDiffRobotComments').returns(Promise.resolve({})); diff --git a/polygerrit-ui/app/elements/change/gr-message/gr-message_test.js b/polygerrit-ui/app/elements/change/gr-message/gr-message_test.js index 3f4e13a0e4..d8f9aa559b 100644 --- a/polygerrit-ui/app/elements/change/gr-message/gr-message_test.js +++ b/polygerrit-ui/app/elements/change/gr-message/gr-message_test.js @@ -28,9 +28,7 @@ suite('gr-message tests', () => { suite('when admin and logged in', () => { setup(done => { - stubRestApi('getLoggedIn').returns(Promise.resolve(true)); stubRestApi('getPreferences').returns(Promise.resolve({})); - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getIsAdmin').returns(Promise.resolve(true)); stubRestApi('deleteChangeCommitMessage').returns(Promise.resolve({})); element = basicFixture.instantiate(); @@ -424,7 +422,6 @@ suite('gr-message tests', () => { setup(done => { stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('getPreferences').returns(Promise.resolve({})); - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getIsAdmin').returns(Promise.resolve(false)); stubRestApi('deleteChangeCommitMessage').returns(Promise.resolve({})); element = basicFixture.instantiate(); @@ -516,8 +513,6 @@ suite('gr-message tests', () => { suite('when logged in but not admin', () => { setup(async () => { - stubRestApi('getLoggedIn').returns(Promise.resolve(true)); - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getIsAdmin').returns(Promise.resolve(false)); stubRestApi('deleteChangeCommitMessage').returns(Promise.resolve({})); element = basicFixture.instantiate(); diff --git a/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list_test.js b/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list_test.js index d22c7d097b..fd45eec1e3 100644 --- a/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list_test.js +++ b/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list_test.js @@ -133,7 +133,6 @@ suite('gr-messages-list tests', () => { suite('basic tests', () => { setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('getDiffComments').returns(Promise.resolve(comments)); stubRestApi('getDiffRobotComments').returns(Promise.resolve({})); @@ -440,7 +439,6 @@ suite('gr-messages-list tests', () => { let commentApiWrapper; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getLoggedIn').returns(Promise.resolve(false)); stubRestApi('getDiffComments').returns(Promise.resolve({})); stubRestApi('getDiffRobotComments').returns(Promise.resolve({})); diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.js b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.js index b09510baf2..686714e023 100644 --- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.js +++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.js @@ -75,7 +75,6 @@ suite('gr-reply-dialog-it tests', () => { changeNum = 42; patchNum = 1; - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getAccount').returns(Promise.resolve({_account_id: 42})); element = basicFixture.instantiate(); diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js index 0575239eaa..466f7bd205 100644 --- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js +++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.js @@ -65,7 +65,6 @@ suite('gr-reply-dialog tests', () => { changeNum = 42; patchNum = 1; - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getAccount').returns(Promise.resolve({})); stubRestApi('getChange').returns(Promise.resolve({})); stubRestApi('getChangeSuggestedReviewers').returns(Promise.resolve([])); diff --git a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list_test.js b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list_test.js index f77f736aee..83b7794da5 100644 --- a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list_test.js +++ b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list_test.js @@ -28,7 +28,6 @@ suite('gr-reviewer-list tests', () => { element = basicFixture.instantiate(); element.serverConfig = {}; - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('removeChangeReviewer').returns(Promise.resolve({ok: true})); }); diff --git a/polygerrit-ui/app/elements/core/gr-account-dropdown/gr-account-dropdown_test.js b/polygerrit-ui/app/elements/core/gr-account-dropdown/gr-account-dropdown_test.js index dc5d1b4412..d2d27b775c 100644 --- a/polygerrit-ui/app/elements/core/gr-account-dropdown/gr-account-dropdown_test.js +++ b/polygerrit-ui/app/elements/core/gr-account-dropdown/gr-account-dropdown_test.js @@ -17,7 +17,6 @@ import '../../../test/common-test-setup-karma.js'; import './gr-account-dropdown.js'; -import {stubRestApi} from '../../../test/test-utils.js'; const basicFixture = fixtureFromElement('gr-account-dropdown'); @@ -25,7 +24,6 @@ suite('gr-account-dropdown tests', () => { let element; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); element = basicFixture.instantiate(); }); diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.js b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.js index f7fe091711..45311106a3 100644 --- a/polygerrit-ui/app/elements/core/gr-router/gr-router_test.js +++ b/polygerrit-ui/app/elements/core/gr-router/gr-router_test.js @@ -804,7 +804,6 @@ suite('gr-router tests', () => { }); test('redirects to dashboard if logged in', () => { - stubRestApi('getLoggedIn').returns(Promise.resolve(true)); const data = { canonicalPath: '/', path: '/', querystring: '', hash: '', }; @@ -934,7 +933,6 @@ suite('gr-router tests', () => { }); test('dashboard while signed in sets params', () => { - stubRestApi('getLoggedIn').returns(Promise.resolve(true)); const data = {canonicalPath: '/dashboard/', params: {0: 'foo'}}; return element._handleDashboardRoute(data, '').then(() => { assert.isFalse(redirectToLoginStub.called); diff --git a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.js b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.js index e553402da2..212bf8f99c 100644 --- a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.js +++ b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar_test.js @@ -126,7 +126,6 @@ suite('gr-search-bar tests', () => { suite('_getSearchSuggestions', () => { setup(() => { // Ensure that config.change.mergeability_computation_behavior is not set. - stubRestApi('getConfig').returns(Promise.resolve({})); element = basicFixture.instantiate(); }); diff --git a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api_test.js b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api_test.js index 94ec78fab3..fbbe1fb6a0 100644 --- a/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api_test.js +++ b/polygerrit-ui/app/elements/diff/gr-comment-api/gr-comment-api_test.js @@ -60,7 +60,6 @@ suite('gr-comment-api tests', () => { test('loads logged-in', () => { const changeNum = 1234; - stubRestApi('getLoggedIn').returns(Promise.resolve(true)); const getCommentsStub = stubRestApi('getDiffComments').returns( Promise.resolve({ 'foo.c': [{id: '123', message: 'foo bar', in_reply_to: '321'}], diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js index 6a15666422..ac91659107 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js @@ -1916,7 +1916,7 @@ suite('gr-diff-view tests', () => { 'a/b/test.c': {}, }; stubRestApi('getConfig').returns(Promise.resolve({change: {}})); - stubRestApi('getLoggedIn').returns(Promise.resolve(true)); + stubRestApi('getProjectConfig').returns(Promise.resolve({})); stubRestApi('getDiffChangeDetail').returns(Promise.resolve({})); stubRestApi('getChangeFiles').returns(Promise.resolve(changedFiles)); diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.js b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.js index e25bdea929..f37aa01a2d 100644 --- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.js +++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.js @@ -29,7 +29,6 @@ suite('gr-account-label tests', () => { } setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getLoggedIn').returns(Promise.resolve(false)); element = basicFixture.instantiate(); element._config = { diff --git a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link_test.js b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link_test.js index af485c6e3c..34fef2fc0f 100644 --- a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link_test.js +++ b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link_test.js @@ -18,7 +18,6 @@ import '../../../test/common-test-setup-karma.js'; import './gr-account-link.js'; import {GerritNav} from '../../core/gr-navigation/gr-navigation.js'; -import {stubRestApi} from '../../../test/test-utils.js'; const basicFixture = fixtureFromElement('gr-account-link'); @@ -26,7 +25,6 @@ suite('gr-account-link tests', () => { let element; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); element = basicFixture.instantiate(); }); diff --git a/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list_test.js b/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list_test.js index 6430290888..20e8672062 100644 --- a/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list_test.js +++ b/polygerrit-ui/app/elements/shared/gr-account-list/gr-account-list_test.js @@ -17,7 +17,6 @@ import '../../../test/common-test-setup-karma.js'; import './gr-account-list.js'; -import {stubRestApi} from '../../../test/test-utils.js'; const basicFixture = fixtureFromElement('gr-account-list'); @@ -61,7 +60,6 @@ suite('gr-account-list tests', () => { existingAccount1 = makeAccount(); existingAccount2 = makeAccount(); - stubRestApi('getConfig').returns(Promise.resolve({})); element = basicFixture.instantiate(); element.accounts = [existingAccount1, existingAccount2]; suggestionsProvider = new MockSuggestionsProvider(); diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.js b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.js index 6c925b083b..f28a7fe3a4 100644 --- a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.js +++ b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.js @@ -442,7 +442,6 @@ suite('gr-comment tests', () => { setup(() => { stubRestApi('getAccount').returns(Promise.resolve(null)); - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('saveDiffDraft').returns(Promise.resolve({ ok: true, text() { diff --git a/polygerrit-ui/app/elements/shared/gr-dropdown-list/gr-dropdown-list_test.js b/polygerrit-ui/app/elements/shared/gr-dropdown-list/gr-dropdown-list_test.js index c2c8d684a7..909a3bbf7a 100644 --- a/polygerrit-ui/app/elements/shared/gr-dropdown-list/gr-dropdown-list_test.js +++ b/polygerrit-ui/app/elements/shared/gr-dropdown-list/gr-dropdown-list_test.js @@ -17,7 +17,6 @@ import '../../../test/common-test-setup-karma.js'; import './gr-dropdown-list.js'; -import {stubRestApi} from '../../../test/test-utils.js'; const basicFixture = fixtureFromElement('gr-dropdown-list'); @@ -25,7 +24,6 @@ suite('gr-dropdown-list tests', () => { let element; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); element = basicFixture.instantiate(); }); diff --git a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown_test.js b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown_test.js index 02bffe46b9..fea4a0800a 100644 --- a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown_test.js +++ b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown_test.js @@ -18,7 +18,6 @@ import '../../../test/common-test-setup-karma.js'; import './gr-dropdown.js'; import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js'; -import {stubRestApi} from '../../../test/test-utils.js'; const basicFixture = fixtureFromElement('gr-dropdown'); @@ -26,7 +25,6 @@ suite('gr-dropdown tests', () => { let element; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); element = basicFixture.instantiate(); }); diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-reply-js-api_test.js b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-reply-js-api_test.js index 52efc56361..d6d4ce5c30 100644 --- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-reply-js-api_test.js +++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-reply-js-api_test.js @@ -31,7 +31,6 @@ suite('gr-change-reply-js-api tests', () => { let plugin; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getAccount').returns(Promise.resolve(null)); }); diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-reporting-js-api_test.js b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-reporting-js-api_test.js index 9e3876b3ab..07b31be240 100644 --- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-reporting-js-api_test.js +++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-reporting-js-api_test.js @@ -28,7 +28,6 @@ suite('gr-reporting-js-api tests', () => { let plugin; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); stubRestApi('getAccount').returns(Promise.resolve(null)); }); diff --git a/polygerrit-ui/app/scripts/gr-email-suggestions-provider/gr-email-suggestions-provider_test.js b/polygerrit-ui/app/scripts/gr-email-suggestions-provider/gr-email-suggestions-provider_test.js index 85c92d31cb..66681ee92b 100644 --- a/polygerrit-ui/app/scripts/gr-email-suggestions-provider/gr-email-suggestions-provider_test.js +++ b/polygerrit-ui/app/scripts/gr-email-suggestions-provider/gr-email-suggestions-provider_test.js @@ -32,7 +32,6 @@ suite('GrEmailSuggestionsProvider tests', () => { }; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); provider = new GrEmailSuggestionsProvider(appContext.restApiService); }); diff --git a/polygerrit-ui/app/scripts/gr-group-suggestions-provider/gr-group-suggestions-provider_test.js b/polygerrit-ui/app/scripts/gr-group-suggestions-provider/gr-group-suggestions-provider_test.js index 3ce9d9d520..1a14abf5f2 100644 --- a/polygerrit-ui/app/scripts/gr-group-suggestions-provider/gr-group-suggestions-provider_test.js +++ b/polygerrit-ui/app/scripts/gr-group-suggestions-provider/gr-group-suggestions-provider_test.js @@ -33,7 +33,6 @@ suite('GrGroupSuggestionsProvider tests', () => { }; setup(() => { - stubRestApi('getConfig').returns(Promise.resolve({})); provider = new GrGroupSuggestionsProvider(appContext.restApiService); });