Prettier: Upgrade to 2 (#30387)

* Updated package json but not updated source files

* Update eslint plugin

* updated files
This commit is contained in:
Torkel Ödegaard
2021-01-20 07:59:48 +01:00
committed by GitHub
parent f27450ed94
commit 1d689888b0
1069 changed files with 4370 additions and 5260 deletions

View File

@@ -20,7 +20,7 @@ export const setup = () => {
};
};
export default data => {
export default (data) => {
client.withOrgId(data.orgId);
group('annotation by tag test', () => {
@@ -29,8 +29,8 @@ export default data => {
let res = client.ui.login('admin', 'admin');
check(res, {
'response status is 200': r => r.status === 200,
"response has cookie 'grafana_session' with 32 characters": r =>
'response status is 200': (r) => r.status === 200,
"response has cookie 'grafana_session' with 32 characters": (r) =>
r.cookies.grafana_session[0].value.length === 32,
});
});
@@ -63,7 +63,7 @@ export default data => {
let responses = client.batch(requests);
for (let n = 0; n < batchCount; n++) {
check(responses[n], {
'response status is 200': r => r.status === 200,
'response status is 200': (r) => r.status === 200,
});
}
});
@@ -73,4 +73,4 @@ export default data => {
sleep(5);
};
export const teardown = data => {};
export const teardown = (data) => {};

View File

@@ -2,7 +2,6 @@ import { sleep, check, group } from 'k6';
import { createClient, createBasicAuthClient, createBearerAuthClient } from './modules/client.js';
import { createTestOrgIfNotExists, createTestdataDatasourceIfNotExists } from './modules/util.js';
export let options = {
noCookiesReset: true,
};
@@ -28,7 +27,7 @@ export const setup = () => {
};
};
export default data => {
export default (data) => {
client.withOrgId(data.orgId);
group('API key test', () => {
@@ -37,7 +36,7 @@ export default data => {
let res = client.datasources.getAll();
check(res, {
'response status is 200': r => r.status === 200,
'response status is 200': (r) => r.status === 200,
});
});
}
@@ -69,7 +68,7 @@ export default data => {
let responses = client.batch(requests);
for (let n = 0; n < batchCount; n++) {
check(responses[n], {
'response status is 200': r => r.status === 200,
'response status is 200': (r) => r.status === 200,
});
}
});
@@ -79,4 +78,4 @@ export default data => {
sleep(5);
};
export const teardown = data => {};
export const teardown = (data) => {};

View File

@@ -21,7 +21,7 @@ export const setup = () => {
};
};
export default data => {
export default (data) => {
group('auth proxy test', () => {
group('batch proxy requests', () => {
const d = new Date();
@@ -44,7 +44,7 @@ export default data => {
let responses = client.batch(requests);
for (let n = 0; n < batchCount; n++) {
check(responses[n], {
'response status is 200': r => r.status === 200,
'response status is 200': (r) => r.status === 200,
});
}
});
@@ -53,4 +53,4 @@ export default data => {
sleep(5);
};
export const teardown = data => {};
export const teardown = (data) => {};

View File

@@ -21,7 +21,7 @@ export const setup = () => {
};
};
export default data => {
export default (data) => {
client.withOrgId(data.orgId);
group(`user auth token slow test (queries between 1 and ${slowQuery} seconds)`, () => {
@@ -30,8 +30,8 @@ export default data => {
let res = client.ui.login('admin', 'admin');
check(res, {
'response status is 200': r => r.status === 200,
"response has cookie 'grafana_session' with 32 characters": r =>
'response status is 200': (r) => r.status === 200,
"response has cookie 'grafana_session' with 32 characters": (r) =>
r.cookies.grafana_session[0].value.length === 32,
});
});
@@ -65,7 +65,7 @@ export default data => {
let responses = client.batch(requests);
for (let n = 0; n < batchCount; n++) {
check(responses[n], {
'response status is 200': r => r.status === 200,
'response status is 200': (r) => r.status === 200,
});
}
});
@@ -75,4 +75,4 @@ export default data => {
sleep(5);
};
export const teardown = data => {};
export const teardown = (data) => {};

View File

@@ -21,7 +21,7 @@ export const setup = () => {
};
};
export default data => {
export default (data) => {
client.withOrgId(data.orgId);
group('user auth token test', () => {
@@ -30,8 +30,8 @@ export default data => {
let res = client.ui.login('admin', 'admin');
check(res, {
'response status is 200': r => r.status === 200,
"response has cookie 'grafana_session' with 32 characters": r =>
'response status is 200': (r) => r.status === 200,
"response has cookie 'grafana_session' with 32 characters": (r) =>
r.cookies.grafana_session[0].value.length === 32,
});
});
@@ -64,7 +64,7 @@ export default data => {
let responses = client.batch(requests);
for (let n = 0; n < batchCount; n++) {
check(responses[n], {
'response status is 200': r => r.status === 200,
'response status is 200': (r) => r.status === 200,
});
}
});
@@ -74,4 +74,4 @@ export default data => {
sleep(5);
};
export const teardown = data => {};
export const teardown = (data) => {};

View File

@@ -196,11 +196,11 @@ export class BearerAuthClient extends BaseClient {
beforeRequest(params) {
params = params || {};
params.headers = params.headers || {};
params.headers['Authorization'] = `Bearer ${this.token}`;
params.headers['Authorization'] = `Bearer ${this.token}`;
}
}
export const createClient = url => {
export const createClient = (url) => {
return new GrafanaClient(new BaseClient(url, ''));
};
@@ -210,4 +210,4 @@ export const createBasicAuthClient = (url, username, password) => {
export const createBearerAuthClient = (url, token) => {
return new GrafanaClient(new BearerAuthClient(url, '', token));
}
};

View File

@@ -1,4 +1,4 @@
export const createTestOrgIfNotExists = client => {
export const createTestOrgIfNotExists = (client) => {
let orgId = 0;
let res = client.orgs.getByName('k6');
@@ -20,8 +20,7 @@ export const createTestOrgIfNotExists = client => {
return res.json().id;
};
export const createTestdataDatasourceIfNotExists = client => {
export const createTestdataDatasourceIfNotExists = (client) => {
const payload = {
access: 'proxy',
isDefault: false,