mirror of
https://github.com/elastic/kibana.git
synced 2025-06-27 18:51:07 -04:00
autofix all violations
This commit is contained in:
parent
a3553c924d
commit
8e9a8a84dc
4245 changed files with 87774 additions and 82935 deletions
|
@ -23,7 +23,7 @@ import {
|
|||
ElasticsearchSupertestProvider,
|
||||
} from './services';
|
||||
|
||||
export default async function ({ readConfigFile }) {
|
||||
export default async function({ readConfigFile }) {
|
||||
const commonConfig = await readConfigFile(require.resolve('../common/config'));
|
||||
const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
|
||||
|
||||
|
@ -36,7 +36,7 @@ export default async function ({ readConfigFile }) {
|
|||
},
|
||||
servers: commonConfig.get('servers'),
|
||||
junit: {
|
||||
reportName: 'Integration Tests'
|
||||
reportName: 'Integration Tests',
|
||||
},
|
||||
esTestCluster: commonConfig.get('esTestCluster'),
|
||||
kbnTestServer: {
|
||||
|
|
|
@ -17,13 +17,11 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
export default async function ({ readConfigFile }) {
|
||||
export default async function({ readConfigFile }) {
|
||||
const httpConfig = await readConfigFile(require.resolve('../../config'));
|
||||
|
||||
return {
|
||||
testFiles: [
|
||||
require.resolve('./'),
|
||||
],
|
||||
testFiles: [require.resolve('./')],
|
||||
services: httpConfig.get('services'),
|
||||
servers: {
|
||||
...httpConfig.get('servers'),
|
||||
|
|
|
@ -17,13 +17,12 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
export default function ({ getService }) {
|
||||
export default function({ getService }) {
|
||||
const supertest = getService('supertest');
|
||||
|
||||
describe('kibana server with ssl', () => {
|
||||
it('handles requests using ssl', async () => {
|
||||
await supertest.get('/')
|
||||
.expect(302);
|
||||
await supertest.get('/').expect(302);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
import { KibanaSupertestProvider } from '../../services';
|
||||
|
||||
export default async function ({ readConfigFile }) {
|
||||
export default async function({ readConfigFile }) {
|
||||
const httpConfig = await readConfigFile(require.resolve('../../config'));
|
||||
|
||||
const redirectPort = httpConfig.get('servers.kibana.port') + 1;
|
||||
|
@ -31,13 +31,11 @@ export default async function ({ readConfigFile }) {
|
|||
};
|
||||
|
||||
return {
|
||||
testFiles: [
|
||||
require.resolve('./'),
|
||||
],
|
||||
testFiles: [require.resolve('./')],
|
||||
services: {
|
||||
...httpConfig.get('services'),
|
||||
//eslint-disable-next-line new-cap
|
||||
supertest: (arg) => KibanaSupertestProvider(arg, supertestOptions),
|
||||
supertest: arg => KibanaSupertestProvider(arg, supertestOptions),
|
||||
},
|
||||
servers: {
|
||||
...httpConfig.get('servers'),
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
export default function ({ getService }) {
|
||||
export default function({ getService }) {
|
||||
const supertest = getService('supertest');
|
||||
|
||||
describe('kibana server with ssl', () => {
|
||||
|
@ -26,11 +26,13 @@ export default function ({ getService }) {
|
|||
const port = process.env.TEST_KIBANA_PORT || '5620';
|
||||
const url = `https://${host}:${port}/`;
|
||||
|
||||
await supertest.get('/')
|
||||
await supertest
|
||||
.get('/')
|
||||
.expect('location', url)
|
||||
.expect(302);
|
||||
|
||||
await supertest.get('/')
|
||||
await supertest
|
||||
.get('/')
|
||||
.redirects(1)
|
||||
.expect('location', '/app/kibana')
|
||||
.expect(302);
|
||||
|
|
|
@ -17,4 +17,8 @@
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
export { KibanaSupertestProvider, KibanaSupertestWithoutAuthProvider, ElasticsearchSupertestProvider } from './supertest';
|
||||
export {
|
||||
KibanaSupertestProvider,
|
||||
KibanaSupertestWithoutAuthProvider,
|
||||
ElasticsearchSupertestProvider,
|
||||
} from './supertest';
|
||||
|
|
|
@ -26,7 +26,8 @@ export function KibanaSupertestProvider({ getService }, options) {
|
|||
const config = getService('config');
|
||||
const kibanaServerUrl = options ? formatUrl(options) : formatUrl(config.get('servers.kibana'));
|
||||
|
||||
const kibanaServerCert = config.get('kbnTestServer.serverArgs')
|
||||
const kibanaServerCert = config
|
||||
.get('kbnTestServer.serverArgs')
|
||||
.filter(arg => arg.startsWith('--server.ssl.certificate'))
|
||||
.map(arg => arg.split('=').pop())
|
||||
.map(path => readFileSync(path))
|
||||
|
@ -41,10 +42,12 @@ export function KibanaSupertestWithoutAuthProvider({ getService }) {
|
|||
const config = getService('config');
|
||||
const kibanaServerConfig = config.get('servers.kibana');
|
||||
|
||||
return supertestAsPromised(formatUrl({
|
||||
...kibanaServerConfig,
|
||||
auth: false
|
||||
}));
|
||||
return supertestAsPromised(
|
||||
formatUrl({
|
||||
...kibanaServerConfig,
|
||||
auth: false,
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
export function ElasticsearchSupertestProvider({ getService }) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue