Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Storybook and Jest cleanup #79305

Merged
merged 4 commits into from
Oct 5, 2020
Merged

Storybook and Jest cleanup #79305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e07e1ac
Storybook and Jest cleanup
smith Sep 30, 2020
c2f01ce
More type fixing
smith Oct 2, 2020
65f1556
ok another type fix
smith Oct 2, 2020
a1ccd93
Merge branch 'master' into nls/sb-fixes-2
kibanamachine Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions x-pack/plugins/apm/public/components/alerting/ErrorCountAlertTrigger/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,44 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { storiesOf } from '@storybook/react';
import React from 'react';
import { MemoryRouter } from 'react-router-dom';
import { ErrorCountAlertTrigger } from '.';
import { ApmPluginContextValue } from '../../../context/ApmPluginContext';
import {
mockApmPluginContextValue,
MockApmPluginContextWrapper,
} from '../../../context/ApmPluginContext/MockApmPluginContext';

storiesOf('app/ErrorCountAlertTrigger', module).add(
'example',
() => {
const params = {
threshold: 2,
window: '5m',
};

return (
export default {
title: 'app/ErrorCountAlertTrigger',
component: ErrorCountAlertTrigger,
decorators: [
(Story: React.ComponentClass) => (
<MockApmPluginContextWrapper
value={(mockApmPluginContextValue as unknown) as ApmPluginContextValue}
>
<div style={{ width: 400 }}>
<ErrorCountAlertTrigger
alertParams={params as any}
setAlertParams={() => undefined}
setAlertProperty={() => undefined}
/>
</div>
<MemoryRouter>
<div style={{ width: 400 }}>
<Story />
</div>
</MemoryRouter>
</MockApmPluginContextWrapper>
);
},
{
info: {
propTablesExclude: [ErrorCountAlertTrigger, MockApmPluginContextWrapper],
source: false,
},
}
);
),
],
};

export function Example() {
const params = {
threshold: 2,
window: '5m',
};

return (
<ErrorCountAlertTrigger
alertParams={params as any}
setAlertParams={() => undefined}
setAlertProperty={() => undefined}
/>
);
}
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/components/alerting/fields.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { act, fireEvent, render } from '@testing-library/react';
import { expectTextsInDocument } from '../../utils/testHelpers';

describe('alerting fields', () => {
describe('Service Fiels', () => {
describe('Service Field', () => {
it('renders with value', () => {
const component = render(<ServiceField value="foo" />);
expectTextsInDocument(component, ['foo']);
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/public/components/alerting/fields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function EnvironmentField({
})}
>
<EuiSelect
value={currentValue}
defaultValue={currentValue}
options={options}
onChange={onChange}
compressed
Expand Down Expand Up @@ -75,7 +75,7 @@ export function TransactionTypeField({
<PopoverExpression value={currentValue} title={label}>
<EuiSelect
data-test-subj="transactionTypeField"
value={currentValue}
defaultValue={currentValue}
options={options}
onChange={onChange}
compressed
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ describe('ErrorGroupOverview -> List', () => {
<MemoryRouter>
<MockApmPluginContextWrapper>
<MockUrlParamsContextProvider>
{/* @ts-expect-error invalid json props */}
<ErrorGroupList items={props.items} serviceName="opbeans-python" />
</MockUrlParamsContextProvider>
</MockApmPluginContextWrapper>
Expand Down
60 changes: 44 additions & 16 deletions ...m/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/props.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,39 @@
"items": [
{
"message": "About to blow up!",
"type": "AssertionError",
"occurrenceCount": 75,
"culprit": "elasticapm.contrib.django.client.capture",
"groupId": "a0ce2c8978ef92cdf2ff163ae28576ee",
"latestOccurrenceAt": "2018-01-10T10:06:37.561Z"
"latestOccurrenceAt": "2018-01-10T10:06:37.561Z",
"handled": true
},
{
"message": "AssertionError: ",
"type": "AssertionError",
"occurrenceCount": 75,
"culprit": "opbeans.views.oopsie",
"groupId": "f3ac95493913cc7a3cfec30a19d2120a",
"latestOccurrenceAt": "2018-01-10T10:06:37.630Z"
"latestOccurrenceAt": "2018-01-10T10:06:37.630Z",
"handled": true
},
{
"message": "AssertionError: Bad luck!",
"type": "AssertionError",
"occurrenceCount": 24,
"culprit": "opbeans.tasks.update_stats",
"groupId": "e90863d04b7a692435305f09bbe8c840",
"latestOccurrenceAt": "2018-01-10T10:06:36.859Z"
"latestOccurrenceAt": "2018-01-10T10:06:36.859Z",
"handled": true
},
{
"message": "Customer with ID 8517 not found",
"type": "AssertionError",
"occurrenceCount": 15,
"culprit": "opbeans.views.customer",
"groupId": "8673d8bf7a032e387c101bafbab0d2bc",
"latestOccurrenceAt": "2018-01-10T10:06:13.211Z"
"latestOccurrenceAt": "2018-01-10T10:06:13.211Z",
"handled": true
}
],
"location": {
Expand Down
Loading