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

[Security Solution] Unskip cypress tests #86653

Merged
merged 19 commits into from
Jan 8, 2021
Merged

[Security Solution] Unskip cypress tests #86653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
14850f6
unskip data provider cypress test
angorayc Dec 21, 2020
fbcb096
remove extra whitespace for filter classes
angorayc Dec 21, 2020
59821e3
remove cy.wait
angorayc Dec 21, 2020
1af4bda
update functional test
angorayc Dec 21, 2020
6f5a232
fix cypress and add tabType to dataTestSubj
angorayc Dec 22, 2020
02e6d32
fix cypress test
angorayc Dec 22, 2020
4f4d67a
revert createNewTimeline task
angorayc Dec 22, 2020
f89646d
Merge branch 'master' into unskip-dataprovider
kibanamachine Dec 23, 2020
8aee256
Merge branch 'master' into unskip-dataprovider
kibanamachine Dec 27, 2020
7daeef0
fix dependency
angorayc Dec 27, 2020
60f815b
Merge remote-tracking branch 'upstream/master' into unskip-dataprovider
angorayc Dec 28, 2020
e3925b8
fix line error
angorayc Dec 28, 2020
6f5cade
Merge branch 'master' into unskip-dataprovider
kibanamachine Dec 30, 2020
cb2ee11
Merge branch 'master' into unskip-dataprovider
kibanamachine Dec 30, 2020
4a9c9e6
Merge branch 'master' into unskip-dataprovider
kibanamachine Dec 30, 2020
133e674
Merge branch 'master' into unskip-dataprovider
kibanamachine Jan 4, 2021
0f61f66
Merge branch 'master' into unskip-dataprovider
kibanamachine Jan 6, 2021
c240357
Merge branch 'master' into unskip-dataprovider
kibanamachine Jan 7, 2021
1ca8af9
Merge branch 'master' of github.com:elastic/kibana into unskip-datapr…
angorayc Jan 8, 2021
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
9 changes: 8 additions & 1 deletion src/plugins/data/public/ui/filter_bar/filter_item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,14 @@ export function FilterItem(props: Props) {
const dataTestSubjNegated = filter.meta.negate ? 'filter-negated' : '';
const dataTestSubjDisabled = `filter-${isDisabled(labelConfig) ? 'disabled' : 'enabled'}`;
const dataTestSubjPinned = `filter-${isFilterPinned(filter) ? 'pinned' : 'unpinned'}`;
return `filter ${dataTestSubjDisabled} ${dataTestSubjKey} ${dataTestSubjValue} ${dataTestSubjPinned} ${dataTestSubjNegated}`;
return classNames(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we limit the scope of the changes to the Security solution plugin only?

Copy link
Contributor Author

@angorayc angorayc Dec 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I understand, but it added an extra whitespace in the data-test-subj and failed the cypress test.
I had a quick fix by adding an extra whitespace in x-pack/plugins/security_solution/cypress/screens/timeline.ts Line 111 in my previous PR to adapt to it, but I don't think that's a good solution.
#85871

'filter',
dataTestSubjDisabled,
dataTestSubjKey,
dataTestSubjValue,
dataTestSubjPinned,
dataTestSubjNegated
);
}

function getPanels() {
Expand Down
10 changes: 9 additions & 1 deletion test/functional/services/filter_bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* under the License.
*/

import classNames from 'classnames';
import { FtrProviderContext } from '../ftr_provider_context';

export function FilterBarProvider({ getService, getPageObjects }: FtrProviderContext) {
Expand Down Expand Up @@ -45,7 +46,14 @@ export function FilterBarProvider({ getService, getPageObjects }: FtrProviderCon
const filterPinnedState = pinned ? 'pinned' : 'unpinned';
const filterNegatedState = negated ? 'filter-negated' : '';
return testSubjects.exists(
`filter filter-${filterActivationState} filter-key-${key} filter-value-${value} filter-${filterPinnedState} ${filterNegatedState}`,
classNames(
'filter',
`filter-${filterActivationState}`,
key !== '' && `filter-key-${key}`,
value !== '' && `filter-value-${value}`,
`filter-${filterPinnedState}`,
filterNegatedState
),
{
allowHidden: true,
}
Expand Down
4 changes: 1 addition & 3 deletions x-pack/plugins/security_solution/cypress/integration/timeline_data_providers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ import { closeTimeline, createNewTimeline } from '../tasks/timeline';
import { HOSTS_URL } from '../urls/navigation';
import { cleanKibana } from '../tasks/common';

// FLAKY: https://github.com/elastic/kibana/issues/85098
// FLAKY: https://github.com/elastic/kibana/issues/62060
describe.skip('timeline data providers', () => {
describe('timeline data providers', () => {
before(() => {
cleanKibana();
loginAndWaitForPage(HOSTS_URL);
Expand Down
22 changes: 16 additions & 6 deletions x-pack/plugins/security_solution/cypress/screens/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,18 @@ export const SAVE_FILTER_BTN = '[data-test-subj="saveFilter"]';
export const SEARCH_OR_FILTER_CONTAINER =
'[data-test-subj="timeline-search-or-filter-search-container"]';

export const QUERY_TAB_EVENTS_TABLE = '[data-test-subj="query-events-table"]';

export const QUERY_TAB_EVENTS_BODY = '[data-test-subj="query-tab-flyout-body"]';

export const QUERY_TAB_EVENTS_FOOTER = '[data-test-subj="query-tab-flyout-footer"]';

export const PINNED_TAB_EVENTS_TABLE = '[data-test-subj="pinned-events-table"]';

export const PINNED_TAB_EVENTS_BODY = '[data-test-subj="pinned-tab-flyout-body"]';

export const PINNED_TAB_EVENTS_FOOTER = '[data-test-subj="pinned-tab-flyout-footer"]';

export const SERVER_SIDE_EVENT_COUNT = '[data-test-subj="server-side-event-count"]';

export const STAR_ICON = '[data-test-subj="timeline-favorite-empty-star"]';
Expand All @@ -108,10 +120,8 @@ export const TIMELINE_DROPPED_DATA_PROVIDERS = '[data-test-subj="providerContain
export const TIMELINE_FIELDS_BUTTON =
'[data-test-subj="timeline"] [data-test-subj="show-field-browser"]';

export const TIMELINE_FILTER = (filter: TimelineFilter) => {
// The space at the end of the line is required. We want to keep it until it is updated.
return `[data-test-subj="filter filter-enabled filter-key-${filter.field} filter-value-${filter.value} filter-unpinned "]`;
};
export const TIMELINE_FILTER = (filter: TimelineFilter) =>
`[data-test-subj="filter filter-enabled filter-key-${filter.field} filter-value-${filter.value} filter-unpinned"]`;

export const TIMELINE_FILTER_FIELD = '[data-test-subj="filterFieldSuggestionList"]';

Expand All @@ -124,9 +134,9 @@ export const TIMELINE_FILTER_VALUE =

export const TIMELINE_FLYOUT = '[data-test-subj="eui-flyout"]';

export const TIMELINE_FLYOUT_HEADER = '[data-test-subj="eui-flyout-header"]';
export const TIMELINE_FLYOUT_HEADER = '[data-test-subj="query-tab-flyout-header"]';

export const TIMELINE_FLYOUT_BODY = '[data-test-subj="eui-flyout-body"]';
export const TIMELINE_FLYOUT_BODY = '[data-test-subj="query-tab-flyout-body"]';

export const TIMELINE_INSPECT_BUTTON = `${TIMELINE_FLYOUT} [data-test-subj="inspect-icon-button"]`;

Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/security_solution/cypress/tasks/timeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ export const closeTimeline = () => {

export const createNewTimeline = () => {
cy.get(TIMELINE_SETTINGS_ICON).filter(':visible').click({ force: true });
cy.wait(1000);
cy.get(CREATE_NEW_TIMELINE).should('be.visible');
cy.get(CREATE_NEW_TIMELINE).click();
};
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ export const BodyComponent = React.memo<StatefulBodyProps>(
<EventsTable
$activePage={activePage}
$columnCount={columnHeaders.length + 1}
data-test-subj="events-table"
data-test-subj={`${tabType}-events-table`}
columnWidths={columnWidths}
onKeyDown={onKeyDown}
$rowCount={data.length}
Expand Down
6 changes: 4 additions & 2 deletions .../security_solution/public/timelines/components/timeline/pinned_tab_content/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { TestProviders } from '../../../../common/mock/test_providers';

import { Sort } from '../body/sort';
import { useMountAppended } from '../../../../common/utils/use_mount_appended';
import { TimelineId } from '../../../../../common/types/timeline';
import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
import { useTimelineEvents } from '../../../containers/index';
import { useTimelineEventsDetails } from '../../../containers/details/index';
import { useSourcererScope } from '../../../../common/containers/sourcerer';
Expand Down Expand Up @@ -117,7 +117,9 @@ describe('PinnedTabContent', () => {
</TestProviders>
);

expect(wrapper.find('[data-test-subj="events-table"]').exists()).toEqual(true);
expect(
wrapper.find(`[data-test-subj="${TimelineTabs.pinned}-events-table"]`).exists()
).toEqual(true);
});

it('it shows the timeline footer', () => {
Expand Down
9 changes: 6 additions & 3 deletions ...ugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,13 @@ export const PinnedTabContentComponent: React.FC<Props> = ({

return (
<>
<FullWidthFlexGroup>
<FullWidthFlexGroup data-test-subj={`${TimelineTabs.pinned}-tab`}>
<ScrollableFlexItem grow={2}>
<EventDetailsWidthProvider>
<StyledEuiFlyoutBody data-test-subj="eui-flyout-body" className="timeline-flyout-body">
<StyledEuiFlyoutBody
data-test-subj={`${TimelineTabs.pinned}-tab-flyout-body`}
className="timeline-flyout-body"
>
<StatefulBody
activePage={pageInfo.activePage}
browserFields={browserFields}
Expand All @@ -192,7 +195,7 @@ export const PinnedTabContentComponent: React.FC<Props> = ({
/>
</StyledEuiFlyoutBody>
<StyledEuiFlyoutFooter
data-test-subj="eui-flyout-footer"
data-test-subj={`${TimelineTabs.pinned}-tab-flyout-footer`}
className="timeline-flyout-footer"
>
<Footer
Expand Down
16 changes: 12 additions & 4 deletions ...s/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ describe('Timeline', () => {
</TestProviders>
);

expect(wrapper.find('[data-test-subj="events-table"]').exists()).toEqual(true);
expect(
wrapper.find(`[data-test-subj="${TimelineTabs.query}-events-table"]`).exists()
).toEqual(true);
});

test('it does render the timeline table when the source is loading with no events', () => {
Expand All @@ -161,7 +163,9 @@ describe('Timeline', () => {
</TestProviders>
);

expect(wrapper.find('[data-test-subj="events-table"]').exists()).toEqual(true);
expect(
wrapper.find(`[data-test-subj="${TimelineTabs.query}-events-table"]`).exists()
).toEqual(true);
expect(wrapper.find('[data-test-subj="events"]').exists()).toEqual(false);
});

Expand All @@ -172,7 +176,9 @@ describe('Timeline', () => {
</TestProviders>
);

expect(wrapper.find('[data-test-subj="events-table"]').exists()).toEqual(true);
expect(
wrapper.find(`[data-test-subj="${TimelineTabs.query}-events-table"]`).exists()
).toEqual(true);
expect(wrapper.find('[data-test-subj="events"]').exists()).toEqual(false);
});

Expand All @@ -183,7 +189,9 @@ describe('Timeline', () => {
</TestProviders>
);

expect(wrapper.find('[data-test-subj="events-table"]').exists()).toEqual(true);
expect(
wrapper.find(`[data-test-subj="${TimelineTabs.query}-events-table"]`).exists()
).toEqual(true);
expect(wrapper.find('[data-test-subj="events"]').exists()).toEqual(false);
});

Expand Down
12 changes: 9 additions & 3 deletions ...lugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,10 @@ export const QueryTabContentComponent: React.FC<Props> = ({
<FullWidthFlexGroup>
<ScrollableFlexItem grow={2}>
<HideShowContainer $isVisible={!timelineFullScreen}>
<StyledEuiFlyoutHeader data-test-subj="eui-flyout-header" hasBorder={false}>
<StyledEuiFlyoutHeader
data-test-subj={`${activeTab}-tab-flyout-header`}
hasBorder={false}
>
<EuiFlexGroup gutterSize="s" data-test-subj="timeline-date-picker-container">
<DatePicker grow={1}>
<SuperDatePicker id="timeline" timelineId={timelineId} />
Expand Down Expand Up @@ -303,7 +306,10 @@ export const QueryTabContentComponent: React.FC<Props> = ({
</HideShowContainer>

<EventDetailsWidthProvider>
<StyledEuiFlyoutBody data-test-subj="eui-flyout-body" className="timeline-flyout-body">
<StyledEuiFlyoutBody
data-test-subj={`${TimelineTabs.query}-tab-flyout-body`}
className="timeline-flyout-body"
>
<StatefulBody
activePage={pageInfo.activePage}
browserFields={browserFields}
Expand All @@ -320,7 +326,7 @@ export const QueryTabContentComponent: React.FC<Props> = ({
</StyledEuiFlyoutBody>

<StyledEuiFlyoutFooter
data-test-subj="eui-flyout-footer"
data-test-subj={`${TimelineTabs.query}-tab-flyout-footer`}
className="timeline-flyout-footer"
>
{!isBlankTimeline && (
Expand Down