return getJSON('/api/system/info').catch(throwGlobalError);
}
-export function getSystemStatus(): Promise<any> {
+export function getSystemStatus(): Promise<{ id: string; version: string; status: string }> {
return getJSON('/api/system/status');
}
return getJSON('/api/system/upgrades');
}
-export function getMigrationStatus(): Promise<any> {
+export function getMigrationStatus(): Promise<{
+ message?: string;
+ startedAt?: string;
+ state: string;
+}> {
return getJSON('/api/system/db_migration_status');
}
-export function migrateDatabase() {
+export function migrateDatabase(): Promise<{
+ message?: string;
+ startedAt?: string;
+ state: string;
+}> {
return postJSON('/api/system/migrate_db');
}
import * as React from 'react';
import { shallow } from 'enzyme';
import App from '../App';
+import { waitAndUpdate } from '../../../../helpers/testUtils';
jest.mock('../../../../api/measures', () => ({
getCustomMeasures: () =>
const wrapper = shallow(<App component={{ key: 'foo' }} />);
expect(wrapper).toMatchSnapshot();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
// create
metricKey: 'metricKey',
value: 'value'
});
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.state().measures).toMatchSnapshot();
expect(wrapper.state().paging.total).toBe(2);
id: '2',
value: 'other'
});
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.state().measures).toMatchSnapshot();
expect(wrapper.state().paging.total).toBe(2);
// delete
wrapper.find('List').prop<Function>('onDelete')('2');
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.state().measures).toMatchSnapshot();
expect(wrapper.state().paging.total).toBe(1);
});
import * as React from 'react';
import { shallow } from 'enzyme';
import Form from '../Form';
-import { change, submit, click } from '../../../../helpers/testUtils';
+import { change, submit, click, waitAndUpdate } from '../../../../helpers/testUtils';
jest.mock('../../../../api/metrics', () => ({
getAllMetrics: () =>
);
expect(wrapper.dive()).toMatchSnapshot();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
const form = wrapper.dive();
expect(form).toMatchSnapshot();
import * as React from 'react';
import { shallow } from 'enzyme';
import App from '../App';
+import { waitAndUpdate } from '../../../../helpers/testUtils';
jest.mock('../../../../api/metrics', () => ({
getMetricDomains: () => Promise.resolve(['Coverage', 'Issues']),
(wrapper.instance() as App).mounted = true;
expect(wrapper).toMatchSnapshot();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
// create
name: 'Bar',
type: 'INT'
});
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.state().metrics).toMatchSnapshot();
expect(wrapper.state().paging.total).toBe(2);
name: 'Bar',
type: 'STRING'
});
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.state().metrics).toMatchSnapshot();
expect(wrapper.state().paging.total).toBe(2);
// delete
wrapper.find('List').prop<Function>('onDelete')('bar');
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.state().metrics).toMatchSnapshot();
expect(wrapper.state().paging.total).toBe(1);
});
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+import * as React from 'react';
+import * as classNames from 'classnames';
+import { getMigrationStatus, getSystemStatus, migrateDatabase } from '../../../api/system';
+import DateFromNow from '../../../components/intl/DateFromNow';
+import TimeFormatter from '../../../components/intl/TimeFormatter';
+import { translate } from '../../../helpers/l10n';
+import { getBaseUrl } from '../../../helpers/urls';
+import '../styles.css';
+
+interface Props {
+ // eslint-disable-next-line camelcase
+ location: { query: { return_to?: string } };
+ setup: boolean;
+}
+
+interface State {
+ message?: string;
+ startedAt?: string;
+ state?: string;
+ status?: string;
+ wasStarting?: boolean;
+}
+
+export default class App extends React.PureComponent<Props, State> {
+ interval?: number;
+ mounted = false;
+ state: State = {};
+
+ componentDidMount() {
+ this.mounted = true;
+ this.fetchStatus();
+ }
+
+ componentWillUnmount() {
+ this.mounted = false;
+ if (this.interval) {
+ window.clearInterval(this.interval);
+ }
+ }
+
+ fetchStatus = () => {
+ const request = this.props.setup ? this.fetchMigrationState() : this.fetchSystemStatus();
+ request.catch(() => {
+ if (this.mounted) {
+ this.setState({
+ message: undefined,
+ startedAt: undefined,
+ state: undefined,
+ status: 'OFFLINE'
+ });
+ }
+ });
+ };
+
+ fetchSystemStatus = () => {
+ return getSystemStatus().then(({ status }) => {
+ if (this.mounted) {
+ this.setState({ status });
+
+ if (status === 'STARTING') {
+ this.setState({ wasStarting: true });
+ this.scheduleRefresh();
+ } else if (status === 'UP') {
+ if (this.state.wasStarting) {
+ this.loadPreviousPage();
+ }
+ } else {
+ this.scheduleRefresh();
+ }
+ }
+ });
+ };
+
+ fetchMigrationState = () => {
+ return getMigrationStatus().then(({ message, startedAt, state }) => {
+ if (this.mounted) {
+ this.setState({ message, startedAt, state });
+ if (state === 'MIGRATION_SUCCEEDED') {
+ this.loadPreviousPage();
+ } else if (state !== 'NO_MIGRATION') {
+ this.scheduleRefresh();
+ }
+ }
+ });
+ };
+
+ scheduleRefresh = () => {
+ this.interval = window.setTimeout(this.fetchStatus, 5000);
+ };
+
+ loadPreviousPage = () => {
+ setInterval(() => {
+ window.location.href = this.props.location.query['return_to'] || getBaseUrl() + '/';
+ }, 2500);
+ };
+
+ handleMigrateClick = (event: React.SyntheticEvent<HTMLButtonElement>) => {
+ event.preventDefault();
+ event.currentTarget.blur();
+ migrateDatabase().then(
+ ({ message, startedAt, state }) => {
+ if (this.mounted) {
+ this.setState({ message, startedAt, state });
+ }
+ },
+ () => {}
+ );
+ };
+
+ render() {
+ const { state, status } = this.state;
+
+ return (
+ <div className="page-wrapper-simple" id="bd">
+ <div
+ className={classNames('page-simple', { 'panel-warning': state === 'MIGRATION_REQUIRED' })}
+ id="nonav">
+ {status === 'OFFLINE' && (
+ <>
+ <h1 className="maintenance-title text-danger">
+ {translate('maintenance.sonarqube_is_offline')}
+ </h1>
+ <p className="maintenance-text">
+ {translate('maintenance.sonarqube_is_offline.text')}
+ </p>
+ <p className="maintenance-text text-center">
+ <a href={getBaseUrl() + '/'}>{translate('maintenance.try_again')}</a>
+ </p>
+ </>
+ )}
+
+ {status === 'UP' && (
+ <>
+ <h1 className="maintenance-title">{translate('maintenance.sonarqube_is_up')}</h1>
+ <p className="maintenance-text text-center">
+ {translate('maintenance.all_systems_opetational')}
+ </p>
+ <p className="maintenance-text text-center">
+ <a href={getBaseUrl() + '/'}>{translate('layout.home')}</a>
+ </p>
+ </>
+ )}
+
+ {status === 'STARTING' && (
+ <>
+ <h1 className="maintenance-title">
+ {translate('maintenance.sonarqube_is_starting')}
+ </h1>
+ <p className="maintenance-spinner">
+ <i className="spinner" />
+ </p>
+ </>
+ )}
+
+ {status === 'DOWN' && (
+ <>
+ <h1 className="maintenance-title text-danger">
+ {translate('maintenance.sonarqube_is_down')}
+ </h1>
+ <p className="maintenance-text">{translate('maintenance.sonarqube_is_down.text')}</p>
+ <p className="maintenance-text text-center">
+ <a href={getBaseUrl() + '/'}>{translate('maintenance.try_again')}</a>
+ </p>
+ </>
+ )}
+
+ {(status === 'DB_MIGRATION_NEEDED' || status === 'DB_MIGRATION_RUNNING') && (
+ <>
+ <h1 className="maintenance-title">
+ {translate('maintenance.sonarqube_is_under_maintenance')}
+ </h1>
+ <p
+ className="maintenance-text"
+ dangerouslySetInnerHTML={{
+ __html: translate('maintenance.sonarqube_is_under_maintenance.1')
+ }}
+ />
+ <p
+ className="maintenance-text"
+ dangerouslySetInnerHTML={{
+ __html: translate('maintenance.sonarqube_is_under_maintenance.2')
+ }}
+ />
+ </>
+ )}
+
+ {state === 'NO_MIGRATION' && (
+ <>
+ <h1 className="maintenance-title">
+ {translate('maintenance.database_is_up_to_date')}
+ </h1>
+ <p className="maintenance-text text-center">
+ <a href={getBaseUrl() + '/'}>{translate('layout.home')}</a>
+ </p>
+ </>
+ )}
+
+ {state === 'MIGRATION_REQUIRED' && (
+ <>
+ <h1 className="maintenance-title">{translate('maintenance.upgrade_database')}</h1>
+ <p className="maintenance-text">{translate('maintenance.upgrade_database.1')}</p>
+ <p className="maintenance-text">{translate('maintenance.upgrade_database.2')}</p>
+ <p className="maintenance-text">{translate('maintenance.upgrade_database.3')}</p>
+ <div className="maintenance-spinner">
+ <button id="start-migration" onClick={this.handleMigrateClick} type="button">
+ {translate('maintenance.upgrade')}
+ </button>
+ </div>
+ </>
+ )}
+
+ {state === 'NOT_SUPPORTED' && (
+ <>
+ <h1 className="maintenance-title text-danger">
+ {translate('maintenance.migration_not_supported')}
+ </h1>
+ <p>{translate('maintenance.migration_not_supported.text')}</p>
+ </>
+ )}
+
+ {state === 'MIGRATION_RUNNING' && (
+ <>
+ <h1 className="maintenance-title">{translate('maintenance.database_migration')}</h1>
+ {this.state.message && (
+ <p className="maintenance-text text-center">{this.state.message}</p>
+ )}
+ {this.state.startedAt && (
+ <p className="maintenance-text text-center">
+ {translate('background_tasks.table.started')}{' '}
+ <DateFromNow date={this.state.startedAt} />
+ <br />
+ <small className="text-muted">
+ <TimeFormatter date={this.state.startedAt} long={true} />
+ </small>
+ </p>
+ )}
+ <p className="maintenance-spinner">
+ <i className="spinner" />
+ </p>
+ </>
+ )}
+
+ {state === 'MIGRATION_SUCCEEDED' && (
+ <>
+ <h1 className="maintenance-title text-success">
+ {translate('maintenance.database_is_up_to_date')}
+ </h1>
+ <p className="maintenance-text text-center">
+ <a href={getBaseUrl() + '/'}>{translate('layout.home')}</a>
+ </p>
+ </>
+ )}
+
+ {state === 'MIGRATION_FAILED' && (
+ <>
+ <h1 className="maintenance-title text-danger">
+ {translate('maintenance.upgrade_failed')}
+ </h1>
+ <p className="maintenance-text">{translate('maintenance.upgrade_failed.text')}</p>
+ </>
+ )}
+ </div>
+ </div>
+ );
+ }
+}
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import * as React from 'react';
-import init from '../init';
-import '../styles.css';
+import App from './App';
interface Props {
+ // eslint-disable-next-line camelcase
location: { query: { return_to: string } };
}
-export default class MaintenanceAppContainer extends React.PureComponent<Props> {
- componentDidMount() {
- init(this.refs.container, false, this.props.location.query['return_to']);
- }
-
- render() {
- return <div ref="container" />;
- }
+export default function MaintenanceAppContainer(props: Props) {
+ return <App setup={false} {...props} />;
}
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import * as React from 'react';
-import init from '../init';
-import '../styles.css';
+import App from './App';
interface Props {
+ // eslint-disable-next-line camelcase
location: { query: { return_to: string } };
}
-export default class SetupAppContainer extends React.PureComponent<Props> {
- componentDidMount() {
- init(this.refs.container, true, this.props.location.query['return_to']);
- }
-
- render() {
- return <div ref="container" />;
- }
+export default function MaintenanceAppContainer(props: Props) {
+ return <App setup={true} {...props} />;
}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+/* eslint-disable import/order */
+import * as React from 'react';
+import { shallow } from 'enzyme';
+import App from '../App';
+import { click, waitAndUpdate } from '../../../../helpers/testUtils';
+
+jest.mock('../../../../api/system', () => ({
+ getMigrationStatus: jest.fn(),
+ getSystemStatus: jest.fn(),
+ migrateDatabase: jest.fn()
+}));
+
+jest.useFakeTimers();
+
+const getMigrationStatus = require('../../../../api/system').getMigrationStatus as jest.Mock;
+const getSystemStatus = require('../../../../api/system').getSystemStatus as jest.Mock;
+const migrateDatabase = require('../../../../api/system').migrateDatabase as jest.Mock;
+
+const location = { query: {} };
+
+beforeEach(() => {
+ getMigrationStatus.mockClear();
+ getSystemStatus.mockClear();
+ migrateDatabase.mockClear();
+});
+
+afterEach(() => {
+ jest.clearAllTimers();
+});
+
+describe('Maintenance Page', () => {
+ ['UP', 'DOWN', 'STARTING', 'DB_MIGRATION_NEEDED', 'DB_MIGRATION_RUNNING'].forEach(status => {
+ it(`should render ${status} status`, async () => {
+ getSystemStatus.mockImplementationOnce(() => Promise.resolve({ status }));
+ await checkApp(false);
+ });
+ });
+
+ it('should render OFFLINE status', async () => {
+ getSystemStatus.mockImplementationOnce(() => Promise.reject(undefined));
+ await checkApp(false);
+ });
+
+ it('should poll status', async () => {
+ getSystemStatus.mockImplementationOnce(() =>
+ Promise.resolve({ status: 'DB_MIGRATION_RUNNING' })
+ );
+ const wrapper = shallow(<App location={location} setup={false} />);
+ await waitAndUpdate(wrapper);
+ expect(getSystemStatus).toBeCalled();
+
+ getSystemStatus.mockClear();
+ getSystemStatus.mockImplementationOnce(() =>
+ Promise.resolve({ status: 'DB_MIGRATION_RUNNING' })
+ );
+ jest.runOnlyPendingTimers();
+ await waitAndUpdate(wrapper);
+ expect(getSystemStatus).toBeCalled();
+
+ getSystemStatus.mockClear();
+ getSystemStatus.mockImplementationOnce(() =>
+ Promise.resolve({ status: 'DB_MIGRATION_RUNNING' })
+ );
+ jest.runOnlyPendingTimers();
+ await waitAndUpdate(wrapper);
+ expect(getSystemStatus).toBeCalled();
+ });
+
+ it('should open previous page', async () => {
+ getSystemStatus.mockImplementationOnce(() => Promise.resolve({ status: 'STARTING' }));
+ const wrapper = shallow(<App location={location} setup={false} />);
+ const loadPreviousPage = jest.fn();
+ (wrapper.instance() as App).loadPreviousPage = loadPreviousPage;
+ await waitAndUpdate(wrapper);
+
+ getSystemStatus.mockImplementationOnce(() => Promise.resolve({ status: 'UP' }));
+ jest.runOnlyPendingTimers();
+ await waitAndUpdate(wrapper);
+ expect(loadPreviousPage).toBeCalled();
+ });
+});
+
+describe('Setup Page', () => {
+ ['NO_MIGRATION', 'NOT_SUPPORTED', 'MIGRATION_SUCCEEDED', 'MIGRATION_FAILED'].forEach(state => {
+ it(`should render ${state} state`, async () => {
+ getMigrationStatus.mockImplementationOnce(() =>
+ Promise.resolve({ message: 'message', startedAt: '2017-01-02T00:00:00.000Z', state })
+ );
+ await checkApp(true);
+ });
+ });
+
+ it('should start migration', async () => {
+ getMigrationStatus.mockImplementationOnce(() =>
+ Promise.resolve({ state: 'MIGRATION_REQUIRED' })
+ );
+ migrateDatabase.mockImplementationOnce(() =>
+ Promise.resolve({ startedAt: '2017-01-02T00:00:00.000Z', state: 'MIGRATION_RUNNING' })
+ );
+ const wrapper = shallow(<App location={location} setup={true} />);
+ await waitAndUpdate(wrapper);
+ expect(wrapper).toMatchSnapshot();
+
+ click(wrapper.find('button'));
+ expect(migrateDatabase).toBeCalled();
+ await waitAndUpdate(wrapper);
+ expect(wrapper).toMatchSnapshot();
+ });
+});
+
+async function checkApp(setup: boolean) {
+ const wrapper = shallow(<App location={location} setup={setup} />);
+ await waitAndUpdate(wrapper);
+ expect(wrapper).toMatchSnapshot();
+}
--- /dev/null
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Maintenance Page should render DB_MIGRATION_NEEDED status 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title"
+ >
+ maintenance.sonarqube_is_under_maintenance
+ </h1>
+ <p
+ className="maintenance-text"
+ dangerouslySetInnerHTML={
+ Object {
+ "__html": "maintenance.sonarqube_is_under_maintenance.1",
+ }
+ }
+ />
+ <p
+ className="maintenance-text"
+ dangerouslySetInnerHTML={
+ Object {
+ "__html": "maintenance.sonarqube_is_under_maintenance.2",
+ }
+ }
+ />
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Maintenance Page should render DB_MIGRATION_RUNNING status 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title"
+ >
+ maintenance.sonarqube_is_under_maintenance
+ </h1>
+ <p
+ className="maintenance-text"
+ dangerouslySetInnerHTML={
+ Object {
+ "__html": "maintenance.sonarqube_is_under_maintenance.1",
+ }
+ }
+ />
+ <p
+ className="maintenance-text"
+ dangerouslySetInnerHTML={
+ Object {
+ "__html": "maintenance.sonarqube_is_under_maintenance.2",
+ }
+ }
+ />
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Maintenance Page should render DOWN status 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title text-danger"
+ >
+ maintenance.sonarqube_is_down
+ </h1>
+ <p
+ className="maintenance-text"
+ >
+ maintenance.sonarqube_is_down.text
+ </p>
+ <p
+ className="maintenance-text text-center"
+ >
+ <a
+ href="/"
+ >
+ maintenance.try_again
+ </a>
+ </p>
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Maintenance Page should render OFFLINE status 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title text-danger"
+ >
+ maintenance.sonarqube_is_offline
+ </h1>
+ <p
+ className="maintenance-text"
+ >
+ maintenance.sonarqube_is_offline.text
+ </p>
+ <p
+ className="maintenance-text text-center"
+ >
+ <a
+ href="/"
+ >
+ maintenance.try_again
+ </a>
+ </p>
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Maintenance Page should render STARTING status 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title"
+ >
+ maintenance.sonarqube_is_starting
+ </h1>
+ <p
+ className="maintenance-spinner"
+ >
+ <i
+ className="spinner"
+ />
+ </p>
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Maintenance Page should render UP status 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title"
+ >
+ maintenance.sonarqube_is_up
+ </h1>
+ <p
+ className="maintenance-text text-center"
+ >
+ maintenance.all_systems_opetational
+ </p>
+ <p
+ className="maintenance-text text-center"
+ >
+ <a
+ href="/"
+ >
+ layout.home
+ </a>
+ </p>
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Setup Page should render MIGRATION_FAILED state 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title text-danger"
+ >
+ maintenance.upgrade_failed
+ </h1>
+ <p
+ className="maintenance-text"
+ >
+ maintenance.upgrade_failed.text
+ </p>
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Setup Page should render MIGRATION_SUCCEEDED state 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title text-success"
+ >
+ maintenance.database_is_up_to_date
+ </h1>
+ <p
+ className="maintenance-text text-center"
+ >
+ <a
+ href="/"
+ >
+ layout.home
+ </a>
+ </p>
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Setup Page should render NO_MIGRATION state 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title"
+ >
+ maintenance.database_is_up_to_date
+ </h1>
+ <p
+ className="maintenance-text text-center"
+ >
+ <a
+ href="/"
+ >
+ layout.home
+ </a>
+ </p>
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Setup Page should render NOT_SUPPORTED state 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title text-danger"
+ >
+ maintenance.migration_not_supported
+ </h1>
+ <p>
+ maintenance.migration_not_supported.text
+ </p>
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Setup Page should start migration 1`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple panel-warning"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title"
+ >
+ maintenance.upgrade_database
+ </h1>
+ <p
+ className="maintenance-text"
+ >
+ maintenance.upgrade_database.1
+ </p>
+ <p
+ className="maintenance-text"
+ >
+ maintenance.upgrade_database.2
+ </p>
+ <p
+ className="maintenance-text"
+ >
+ maintenance.upgrade_database.3
+ </p>
+ <div
+ className="maintenance-spinner"
+ >
+ <button
+ id="start-migration"
+ onClick={[Function]}
+ type="button"
+ >
+ maintenance.upgrade
+ </button>
+ </div>
+ </React.Fragment>
+ </div>
+</div>
+`;
+
+exports[`Setup Page should start migration 2`] = `
+<div
+ className="page-wrapper-simple"
+ id="bd"
+>
+ <div
+ className="page-simple"
+ id="nonav"
+ >
+ <React.Fragment>
+ <h1
+ className="maintenance-title"
+ >
+ maintenance.database_migration
+ </h1>
+ <p
+ className="maintenance-text text-center"
+ >
+ background_tasks.table.started
+
+ <DateFromNow
+ date="2017-01-02T00:00:00.000Z"
+ />
+ <br />
+ <small
+ className="text-muted"
+ >
+ <TimeFormatter
+ date="2017-01-02T00:00:00.000Z"
+ long={true}
+ />
+ </small>
+ </p>
+ <p
+ className="maintenance-spinner"
+ >
+ <i
+ className="spinner"
+ />
+ </p>
+ </React.Fragment>
+ </div>
+</div>
+`;
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-import Backbone from 'backbone';
-import Marionette from 'backbone.marionette';
-import MainView from './main-view';
-
-const App = new Marionette.Application();
-
-App.on('start', options => {
- const viewOptions = {
- ...options,
- model: new Backbone.Model()
- };
- const mainView = new MainView(viewOptions);
- mainView.render().refresh();
-});
-
-export default function(el, setup, returnTo) {
- App.start({ el, setup, returnTo });
-}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-import Marionette from 'backbone.marionette';
-import Template from './templates/maintenance-main.hbs';
-import { getSystemStatus, getMigrationStatus, migrateDatabase } from '../../api/system';
-import { getBaseUrl } from '../../helpers/urls';
-
-export default Marionette.ItemView.extend({
- template: Template,
-
- events: {
- 'click #start-migration': 'startMigration'
- },
-
- initialize() {
- this.pollingInternal = setInterval(() => {
- this.refresh();
- }, 5000);
- this.wasStarting = false;
- },
-
- getStatus() {
- return this.options.setup ? getMigrationStatus() : getSystemStatus();
- },
-
- refresh() {
- return this.getStatus().then(
- r => {
- if (r.status === 'STARTING') {
- this.wasStarting = true;
- }
- // unset `status` in case if was `OFFLINE` previously
- this.model.set({ status: undefined, ...r });
- this.render();
- if (this.model.get('status') === 'UP' || this.model.get('state') === 'NO_MIGRATION') {
- this.stopPolling();
- }
- if (this.model.get('status') === 'UP' && this.wasStarting) {
- this.loadPreviousPage();
- }
- if (this.model.get('state') === 'MIGRATION_SUCCEEDED') {
- this.loadPreviousPage();
- }
- },
- () => {
- this.model.set({ status: 'OFFLINE' });
- this.render();
- }
- );
- },
-
- stopPolling() {
- clearInterval(this.pollingInternal);
- },
-
- startMigration() {
- migrateDatabase().then(
- r => {
- this.model.set(r);
- this.render();
- },
- () => {}
- );
- },
-
- loadPreviousPage() {
- setInterval(() => {
- window.location = this.options.returnTo || getBaseUrl();
- }, 2500);
- },
-
- serializeData() {
- return {
- ...Marionette.ItemView.prototype.serializeData.apply(this, arguments),
- setup: this.options.setup
- };
- }
-});
*/
import * as React from 'react';
import { IndexRoute } from 'react-router';
-import MaintenanceAppContainer from './components/MaintenanceAppContainer';
-import SetupAppContainer from './components/SetupAppContainer';
+import { lazyLoad } from '../../components/lazyLoad';
-export const maintenanceRoutes = <IndexRoute component={MaintenanceAppContainer} />;
+export const maintenanceRoutes = (
+ <IndexRoute component={lazyLoad(() => import('./components/MaintenanceAppContainer'))} />
+);
-export const setupRoutes = <IndexRoute component={SetupAppContainer} />;
+export const setupRoutes = (
+ <IndexRoute component={lazyLoad(() => import('./components/SetupAppContainer'))} />
+);
+++ /dev/null
-<h1 class="maintenance-title text-danger">{{t 'maintenance.upgrade_failed'}}</h1>
-<p class="maintenance-text">{{t 'maintenance.upgrade_failed.text'}}</p>
+++ /dev/null
-<h1 class="maintenance-title text-danger">{{t 'maintenance.migration_not_supported'}}</h1>
-<p>{{t 'maintenance.migration_not_supported.text'}}</p>
+++ /dev/null
-<h1 class="maintenance-title">{{t 'maintenance.upgrade_database'}}</h1>
-<p class="maintenance-text">{{t 'maintenance.upgrade_database.1'}}</p>
-<p class="maintenance-text">{{t 'maintenance.upgrade_database.2'}}</p>
-<p class="maintenance-text">{{t 'maintenance.upgrade_database.3'}}</p>
-<div class="maintenance-spinner">
- <button id="start-migration">{{t 'maintenance.upgrade'}}</button>
-</div>
+++ /dev/null
-<h1 class="maintenance-title">{{t 'maintenance.database_migration'}}</h1>
-{{#if message}}
- <p class="maintenance-text text-center">{{message}}</p>
-{{/if}}
-{{#if startedAt}}
- <p class="maintenance-text text-center">
- {{t 'background_tasks.table.started'}} {{fromNow startedAt}}<br>
- <small class="text-muted">{{dt startedAt}}</small>
- </p>
-{{/if}}
-<p class="maintenance-spinner"><i class="spinner"></i></p>
+++ /dev/null
-<h1 class="maintenance-title text-success">{{t 'maintenance.database_is_up_to_date'}}</h1>
-<p class="maintenance-text text-center">
- <a href="{{link '/'}}">{{t 'layout.home'}}</a>
-</p>
+++ /dev/null
-<h1 class="maintenance-title">{{t 'maintenance.database_is_up_to_date'}}</h1>
-<p class="maintenance-text text-center">
- <a href="{{link '/'}}">{{t 'layout.home'}}</a>
-</p>
+++ /dev/null
-<h1 class="maintenance-title text-danger">{{t 'maintenance.sonarqube_is_down'}}</h1>
-<p class="maintenance-text">{{t 'maintenance.sonarqube_is_down.text'}}</p>
-<p class="maintenance-text text-center">
- <a href="{{link '/'}}">{{t 'maintenance.try_again'}}</a>
-</p>
+++ /dev/null
-<h1 class="maintenance-title">{{t 'maintenance.sonarqube_is_under_maintenance'}}</h1>
-<p class="maintenance-text">{{{t 'maintenance.sonarqube_is_under_maintenance.1'}}}</p>
-<p class="maintenance-text">{{{t 'maintenance.sonarqube_is_under_maintenance.2'}}}</p>
+++ /dev/null
-<h1 class="maintenance-title text-danger">{{t 'maintenance.sonarqube_is_offline'}}</h1>
-<p class="maintenance-text">{{t 'maintenance.sonarqube_is_offline.text'}}</p>
-<p class="maintenance-text text-center">
- <a href="{{link '/'}}">{{t 'maintenance.try_again'}}</a>
-</p>
+++ /dev/null
-<h1 class="maintenance-title">{{t 'maintenance.sonarqube_is_starting'}}</h1>
-<p class="maintenance-spinner"><i class="spinner"></i></p>
+++ /dev/null
-<h1 class="maintenance-title">{{t 'maintenance.sonarqube_is_up'}}</h1>
-<p class="maintenance-text text-center">{{t 'maintenance.all_systems_opetational'}}</p>
-<p class="maintenance-text text-center">
- <a href="{{link '/'}}">{{t 'layout.home'}}</a>
-</p>
+++ /dev/null
-<div id="bd" class="page-wrapper-simple">
- <div id="nonav" class="page-simple {{#eq state 'MIGRATION_REQUIRED'}}panel-warning{{/eq}}">
-
- {{#eq status 'OFFLINE'}}
-
- {{> '_maintenance-status-offline'}}
-
- {{else}}
-
- {{#unless setup}}
-
- {{#eq status 'UP'}}{{> '_maintenance-status-up'}}{{/eq}}
- {{#eq status 'STARTING'}}{{> '_maintenance-status-starting'}}{{/eq}}
- {{#eq status 'DOWN'}}{{> '_maintenance-status-down'}}{{/eq}}
- {{#eq status 'DB_MIGRATION_NEEDED'}}{{> '_maintenance-status-migration'}}{{/eq}}
- {{#eq status 'DB_MIGRATION_RUNNING'}}{{> '_maintenance-status-migration'}}{{/eq}}
-
- {{else}}
-
- {{#eq state 'NO_MIGRATION'}}{{> '_maintenance-state-no-migration'}}{{/eq}}
- {{#eq state 'MIGRATION_REQUIRED'}}{{> '_maintenance-state-migration-required'}}{{/eq}}
- {{#eq state 'NOT_SUPPORTED'}}{{> '_maintenance-state-migration-not-supported'}}{{/eq}}
- {{#eq state 'MIGRATION_RUNNING'}}{{> '_maintenance-state-migration-running'}}{{/eq}}
- {{#eq state 'MIGRATION_SUCCEEDED'}}{{> '_maintenance-state-migration-succeeded'}}{{/eq}}
- {{#eq state 'MIGRATION_FAILED'}}{{> '_maintenance-state-migration-failed'}}{{/eq}}
-
- {{/unless}}
-
- {{/eq}}
-
- </div>
-</div>
/* eslint-disable import/order */
import * as React from 'react';
import { shallow } from 'enzyme';
-import { change } from '../../../../helpers/testUtils';
+import { change, waitAndUpdate } from '../../../../helpers/testUtils';
import LicenseEditionSet from '../LicenseEditionSet';
jest.mock('../../../../api/marketplace', () => ({
it('should display the get license link with parameters', async () => {
const wrapper = getWrapper();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.find('a')).toMatchSnapshot();
});
import * as React from 'react';
import { mount, shallow } from 'enzyme';
import Subscription from '../Subscription';
-import { click } from '../../../../helpers/testUtils';
+import { click, waitAndUpdate } from '../../../../helpers/testUtils';
const subscribe = require('../../../../api/report').subscribe as jest.Mock<any>;
const unsubscribe = require('../../../../api/report').unsubscribe as jest.Mock<any>;
click(wrapper.find('button'));
expect(unsubscribe).toBeCalledWith('foo');
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
click(wrapper.find('button'));
expect(subscribe).toBeCalledWith('foo');
import { shallow, ShallowWrapper } from 'enzyme';
import DeleteBranchModal from '../DeleteBranchModal';
import { ShortLivingBranch, BranchType } from '../../../../app/types';
-import { submit, doAsync, click } from '../../../../helpers/testUtils';
+import { submit, doAsync, click, waitAndUpdate } from '../../../../helpers/testUtils';
import { deleteBranch } from '../../../../api/branches';
beforeEach(() => {
expect(wrapper).toMatchSnapshot();
});
-it('deletes branch', () => {
+it('deletes branch', async () => {
(deleteBranch as jest.Mock<any>).mockImplementation(() => Promise.resolve());
const onDelete = jest.fn();
const wrapper = shallowRender(onDelete);
submitForm(wrapper);
- return doAsync().then(() => {
- wrapper.update();
- expect(wrapper.state().loading).toBe(false);
- expect(onDelete).toBeCalled();
- expect(deleteBranch).toBeCalledWith('foo', 'feature');
- });
+ await waitAndUpdate(wrapper);
+ expect(wrapper.state().loading).toBe(false);
+ expect(onDelete).toBeCalled();
+ expect(deleteBranch).toBeCalledWith('foo', 'feature');
});
it('cancels', () => {
});
});
-it('stops loading on WS error', () => {
+it('stops loading on WS error', async () => {
(deleteBranch as jest.Mock<any>).mockImplementation(() => Promise.reject(null));
const onDelete = jest.fn();
const wrapper = shallowRender(onDelete);
submitForm(wrapper);
- return doAsync().then(() => {
- wrapper.update();
- expect(wrapper.state().loading).toBe(false);
- expect(onDelete).not.toBeCalled();
- expect(deleteBranch).toBeCalledWith('foo', 'feature');
- });
+ await waitAndUpdate(wrapper);
+ expect(wrapper.state().loading).toBe(false);
+ expect(onDelete).not.toBeCalled();
+ expect(deleteBranch).toBeCalledWith('foo', 'feature');
});
function shallowRender(onDelete: () => void = jest.fn(), onClose: () => void = jest.fn()) {
import { shallow, ShallowWrapper } from 'enzyme';
import RenameBranchModal from '../RenameBranchModal';
import { MainBranch } from '../../../../app/types';
-import { submit, doAsync, click, change } from '../../../../helpers/testUtils';
+import { submit, doAsync, click, change, waitAndUpdate } from '../../../../helpers/testUtils';
import { renameBranch } from '../../../../api/branches';
beforeEach(() => {
expect(wrapper).toMatchSnapshot();
});
-it('renames branch', () => {
+it('renames branch', async () => {
(renameBranch as jest.Mock<any>).mockImplementation(() => Promise.resolve());
const onRename = jest.fn();
const wrapper = shallowRender(onRename);
fillAndSubmit(wrapper);
- return doAsync().then(() => {
- wrapper.update();
- expect(wrapper.state().loading).toBe(false);
- expect(onRename).toBeCalled();
- expect(renameBranch).toBeCalledWith('foo', 'dev');
- });
+ await waitAndUpdate(wrapper);
+ expect(wrapper.state().loading).toBe(false);
+ expect(onRename).toBeCalled();
+ expect(renameBranch).toBeCalledWith('foo', 'dev');
});
it('cancels', () => {
});
});
-it('stops loading on WS error', () => {
+it('stops loading on WS error', async () => {
(renameBranch as jest.Mock<any>).mockImplementation(() => Promise.reject(null));
const onRename = jest.fn();
const wrapper = shallowRender(onRename);
fillAndSubmit(wrapper);
- return doAsync().then(() => {
- wrapper.update();
- expect(wrapper.state().loading).toBe(false);
- expect(onRename).not.toBeCalled();
- });
+ await waitAndUpdate(wrapper);
+ expect(wrapper.state().loading).toBe(false);
+ expect(onRename).not.toBeCalled();
});
function shallowRender(onRename: () => void = jest.fn(), onClose: () => void = jest.fn()) {
import * as React from 'react';
import { mount, shallow } from 'enzyme';
import BulkApplyTemplateModal, { Props } from '../BulkApplyTemplateModal';
-import { click } from '../../../helpers/testUtils';
+import { click, waitAndUpdate } from '../../../helpers/testUtils';
jest.mock('react-dom');
});
expect(wrapper).toMatchSnapshot();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
});
import * as React from 'react';
import { shallow } from 'enzyme';
import CreateProjectForm from '../CreateProjectForm';
-import { change, submit, click } from '../../../helpers/testUtils';
+import { change, submit, click, waitAndUpdate } from '../../../helpers/testUtils';
import { Visibility } from '../../../app/types';
const createProject = require('../../../api/components').createProject as jest.Mock<any>;
});
expect(wrapper).toMatchSnapshot();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
});
import { shallow } from 'enzyme';
import ProjectRowActions, { Props } from '../ProjectRowActions';
import { Visibility } from '../../../app/types';
-import { click } from '../../../helpers/testUtils';
+import { click, waitAndUpdate } from '../../../helpers/testUtils';
jest.mock('../../../api/components', () => ({
getComponentShow: jest.fn(() => Promise.reject(undefined))
expect(wrapper).toMatchSnapshot();
wrapper.prop<Function>('onToggleClick')();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
click(wrapper.find('.js-restore-access'));
import * as React from 'react';
import { mount, shallow } from 'enzyme';
import ProfilePermissions from '../ProfilePermissions';
-import { click } from '../../../../helpers/testUtils';
+import { click, waitAndUpdate } from '../../../../helpers/testUtils';
jest.mock('../../../../api/quality-profiles', () => ({
searchUsers: jest.fn(() => Promise.resolve([])),
);
const wrapper = shallow(<ProfilePermissions profile={profile} />);
expect(searchUsers).toHaveBeenCalled();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.find('ProfilePermissionsForm').exists()).toBeFalsy();
click(wrapper.find('button'));
import ProfileRules from '../ProfileRules';
import * as apiRules from '../../../../api/rules';
import * as apiQP from '../../../../api/quality-profiles';
+import { waitAndUpdate } from '../../../../helpers/testUtils';
const PROFILE = {
activeRuleCount: 68,
const instance = wrapper.instance() as any;
instance.mounted = true;
instance.loadRules();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.find('ProfileRulesSonarWayComparison')).toHaveLength(1);
expect(wrapper).toMatchSnapshot();
});
})
);
const wrapper = shallow(<ProfileRules organization={null} profile={PROFILE} />);
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(apiQP.getQualityProfile).toHaveBeenCalledTimes(1);
expect(wrapper.find('ProfileRulesSonarWayComparison')).toHaveLength(0);
});
import * as React from 'react';
import { shallow } from 'enzyme';
import EmailAlreadyExists from '../EmailAlreadyExists';
+import { waitAndUpdate } from '../../../../helpers/testUtils';
jest.mock('../../../../api/users', () => ({
getIdentityProviders: () =>
const wrapper = shallow(<EmailAlreadyExists location={{ query }} />);
(wrapper.instance() as EmailAlreadyExists).mounted = true;
(wrapper.instance() as EmailAlreadyExists).fetchIdentityProviders();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
});
/* eslint-disable import/order */
import * as React from 'react';
import { mount, shallow } from 'enzyme';
-import { click } from '../../../../../helpers/testUtils';
+import { click, waitAndUpdate } from '../../../../../helpers/testUtils';
import SystemUpgradeNotif from '../SystemUpgradeNotif';
jest.mock('../../../../../api/system', () => ({
it('should display correctly', async () => {
const wrapper = shallow(<SystemUpgradeNotif />);
expect(wrapper.type()).toBeNull();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
});
return Promise.resolve({ updateCenterRefresh: '', upgrades: [] });
});
const wrapper = shallow(<SystemUpgradeNotif />);
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper.type()).toBeNull();
});
it('should open the upgrade form', async () => {
const wrapper = shallow(<SystemUpgradeNotif />);
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
click(wrapper.find('button'));
expect(wrapper.find('SystemUpgradeForm').exists()).toBeTruthy();
});
import React from 'react';
import { mount } from 'enzyme';
import NewOrganizationForm from '../NewOrganizationForm';
-import { change, submit } from '../../../../helpers/testUtils';
+import { change, submit, waitAndUpdate } from '../../../../helpers/testUtils';
jest.mock('../../../../api/organizations', () => ({
createOrganization: () => Promise.resolve(),
change(wrapper.find('input'), 'foo');
submit(wrapper.find('form'));
expect(wrapper).toMatchSnapshot(); // spinner
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
expect(onDone).toBeCalledWith('foo');
});
wrapper.find('DeleteButton').prop('onClick')();
wrapper.update();
expect(wrapper).toMatchSnapshot(); // spinner
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
expect(onDelete).toBeCalled();
});
import React from 'react';
import { mount } from 'enzyme';
import NewProjectForm from '../NewProjectForm';
-import { change, submit } from '../../../../helpers/testUtils';
+import { change, submit, waitAndUpdate } from '../../../../helpers/testUtils';
jest.mock('../../../../api/components', () => ({
createProject: () => Promise.resolve(),
change(wrapper.find('input'), 'foo');
submit(wrapper.find('form'));
expect(wrapper).toMatchSnapshot(); // spinner
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
expect(onDone).toBeCalledWith('foo');
});
wrapper.find('DeleteButton').prop('onClick')();
wrapper.update();
expect(wrapper).toMatchSnapshot(); // spinner
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
expect(onDelete).toBeCalled();
});
import React from 'react';
import { mount } from 'enzyme';
import OrganizationStep from '../OrganizationStep';
-import { click } from '../../../../helpers/testUtils';
+import { click, waitAndUpdate } from '../../../../helpers/testUtils';
import { getOrganizations } from '../../../../api/organizations';
jest.mock('../../../../api/organizations', () => ({
stepNumber={1}
/>
);
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
click(wrapper.find('.js-existing'));
expect(wrapper).toMatchSnapshot();
wrapper
stepNumber={1}
/>
);
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
click(wrapper.find('.js-new'));
wrapper.find('NewOrganizationForm').prop('onDone')('new');
wrapper.update();
import React from 'react';
import { mount } from 'enzyme';
import TokenStep from '../TokenStep';
-import { change, click, submit } from '../../../../helpers/testUtils';
+import { change, click, submit, waitAndUpdate } from '../../../../helpers/testUtils';
jest.mock('../../../../api/user-tokens', () => ({
getTokens: () => Promise.resolve([{ name: 'foo' }]),
stepNumber={1}
/>
);
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
change(wrapper.find('input'), 'my token');
submit(wrapper.find('form'));
expect(wrapper).toMatchSnapshot(); // spinner
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
});
wrapper.find('DeleteButton').prop('onClick')();
wrapper.update();
expect(wrapper).toMatchSnapshot(); // spinner
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
});
import { Location } from 'history';
import { shallow } from 'enzyme';
import UsersApp from '../UsersApp';
+import { waitAndUpdate } from '../../../helpers/testUtils';
jest.mock('../../../api/users', () => ({
getIdentityProviders: jest.fn(() =>
expect(wrapper).toMatchSnapshot();
expect(getIdentityProviders).toHaveBeenCalled();
expect(searchUsers).toHaveBeenCalled();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
});
import * as React from 'react';
import { shallow } from 'enzyme';
import SimpleModal, { ChildrenProps } from '../SimpleModal';
-import { click } from '../../../helpers/testUtils';
+import { click, waitAndUpdate } from '../../../helpers/testUtils';
it('renders', () => {
const inner = () => <div />;
expect(onSubmit).toBeCalled();
expect(wrapper).toMatchSnapshot();
- await new Promise(setImmediate);
- wrapper.update();
+ await waitAndUpdate(wrapper);
expect(wrapper).toMatchSnapshot();
});
*/
import * as React from 'react';
-interface Loader {
- (): Promise<{ default: React.ComponentClass }>;
+type ReactComponent<P> = React.ComponentClass<P> | React.StatelessComponent<P>;
+
+interface Loader<P> {
+ (): Promise<{ default: ReactComponent<P> }>;
}
-export function lazyLoad(loader: Loader) {
+export function lazyLoad<P>(loader: Loader<P>) {
interface State {
- Component?: React.ComponentClass;
+ Component?: ReactComponent<P>;
}
// use `React.Component`, not `React.PureComponent` to always re-render
this.mounted = false;
}
- receiveComponent = (Component: React.ComponentClass) => {
+ receiveComponent = (Component: ReactComponent<P>) => {
if (this.mounted) {
this.setState({ Component });
}
export function shallowWithIntl(node: React.ReactElement<any>, options: ShallowRendererProps = {}) {
return shallow(node, { ...options, context: { intl, ...options.context } });
}
+
+export async function waitAndUpdate(wrapper: ShallowWrapper<any, any> | ReactWrapper<any, any>) {
+ await new Promise(setImmediate);
+ wrapper.update();
+}
projects / sonarqube.git / commitdiff