Skip to content

Commit

Permalink
change the names in all files
Browse files Browse the repository at this point in the history
  • Loading branch information
mbondyra committed Jan 12, 2024
1 parent 5dec780 commit 088478d
Show file tree
Hide file tree
Showing 64 changed files with 136 additions and 128 deletions.
4 changes: 2 additions & 2 deletions test/accessibility/apps/filter_panel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.discover.openAddFilterPanel();
await a11y.testAppSnapshot();
await PageObjects.discover.closeAddFilterPanel();
await filterBar.addFilter({ field: 'OriginCityName', operation: 'is', value: 'Rome' });
await filterBar.addFilter({ field: 'OriginCityName', operation: 'equals', value: 'Rome' });
});

it('a11y test on Edit filter as Query DSL panel', async () => {
Expand All @@ -36,7 +36,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

// the following tests are for the new saved query panel which also has filter panel options
it('a11y test on saved query panel- on more than one filters', async () => {
await filterBar.addFilter({ field: 'DestCountry', operation: 'is', value: 'AU' });
await filterBar.addFilter({ field: 'DestCountry', operation: 'equals', value: 'AU' });
await testSubjects.click('queryBarMenuPopover');
await a11y.testAppSnapshot();
});
Expand Down
4 changes: 2 additions & 2 deletions test/examples/unified_field_list_examples/field_stats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
});

it('should apply filters and queries', async () => {
await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'US' });
await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'US' });
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.unifiedFieldList.clickFieldListItem('bytes');
expect(await PageObjects.unifiedFieldList.getFieldStatsViewType()).to.be(
Expand Down Expand Up @@ -176,7 +176,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
it('should return a single-value histogram when filtering a precalculated histogram', async () => {
await filterBar.addFilter({
field: 'histogram-title',
operation: 'is',
operation: 'equals',
value: 'single value',
});
await PageObjects.header.waitUntilLoadingHasFinished();
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/context/_context_navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.common.navigateToApp('discover');
await PageObjects.header.waitUntilLoadingHasFinished();
for (const [columnName, value] of TEST_FILTER_COLUMN_NAMES) {
await filterBar.addFilter({ field: columnName, operation: 'is', value });
await filterBar.addFilter({ field: columnName, operation: 'equals', value });
}
});

Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/context/_discover_navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
}

for (const [columnName, value] of TEST_FILTER_COLUMN_NAMES) {
await filterBar.addFilter({ field: columnName, operation: 'is', value });
await filterBar.addFilter({ field: columnName, operation: 'equals', value });
await PageObjects.header.waitUntilLoadingHasFinished();
}
});
Expand Down
29 changes: 16 additions & 13 deletions test/functional/apps/context/_filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('inclusive filter should be toggleable via the filter bar', async function () {
await filterBar.addFilter({
field: TEST_ANCHOR_FILTER_FIELD,
operation: 'is',
operation: 'equals',
value: TEST_ANCHOR_FILTER_VALUE,
});
await PageObjects.context.waitUntilContextLoadingHasFinished();
Expand Down Expand Up @@ -96,7 +96,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const addPinnedFilter = async () => {
await filterBar.addFilter({
field: TEST_ANCHOR_FILTER_FIELD,
operation: 'is',
operation: 'equals',
value: TEST_ANCHOR_FILTER_VALUE,
});
await filterBar.toggleFilterPinned(TEST_ANCHOR_FILTER_FIELD);
Expand Down Expand Up @@ -133,7 +133,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

it('should preserve filters when the page is refreshed', async function () {
await addPinnedFilter();
await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'png' });
await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'png' });
await PageObjects.context.waitUntilContextLoadingHasFinished();
await expectFiltersToExist();
await browser.refresh();
Expand All @@ -142,7 +142,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

it('should update filters when navigating forward and backward in history', async () => {
await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'png' });
await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'png' });
await PageObjects.context.waitUntilContextLoadingHasFinished();
expect(await filterBar.getFilterCount()).to.be(1);
expect(await filterBar.hasFilter('extension', 'png')).to.be(true);
Expand All @@ -162,8 +162,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await filterBar.addFilter({
condition: 'OR',
filters: [
{ field: 'extension', operation: 'is', value: 'png' },
{ field: 'bytes', operation: 'is between', value: { from: '1000', to: '2000' } },
{ field: 'extension', operation: 'equals', value: 'png' },
{ field: 'bytes', operation: 'between', value: { from: '1000', to: '2000' } },
],
});

Expand All @@ -182,8 +182,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await filterBar.addFilter({
condition: 'AND',
filters: [
{ field: 'extension', operation: 'is one of', value: ['png', 'jpeg'] },
{ field: 'bytes', operation: 'is between', value: { from: '1000', to: '2000' } },
{ field: 'extension', operation: 'one of', value: ['png', 'jpeg'] },
{ field: 'bytes', operation: 'between', value: { from: '1000', to: '2000' } },
],
});

Expand All @@ -206,10 +206,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
condition: 'OR',
filters: [
{ field: 'clientip', operation: 'does not exist' },
{ field: 'extension', operation: 'is one of', value: ['png', 'jpeg'] },
{ field: 'extension', operation: 'one of', value: ['png', 'jpeg'] },
],
},
{ field: 'bytes', operation: 'is between', value: { from: '1000', to: '2000' } },
{ field: 'bytes', operation: 'between', value: { from: '1000', to: '2000' } },
],
});

Expand All @@ -225,7 +225,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

it('should add comma delimiter values', async () => {
await filterBar.addFilter({ field: 'extension', operation: 'is one of', value: 'png, jpeg' });
await filterBar.addFilter({ field: 'extension', operation: 'one of', value: 'png, jpeg' });

await PageObjects.context.waitUntilContextLoadingHasFinished();
expect(await filterBar.getFilterCount()).to.be(1);
Expand All @@ -237,7 +237,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

it('should display the negated values correctly', async () => {
await filterBar.addFilter({ field: 'extension', operation: 'is not', value: 'png' });
await filterBar.addFilter({ field: 'extension', operation: 'does not equal', value: 'png' });

await PageObjects.context.waitUntilContextLoadingHasFinished();
expect(await filterBar.getFilterCount()).to.be(1);
Expand All @@ -246,7 +246,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

await filterBar.clickEditFilterById('0');
await filterBar.addAndFilter('0');
await filterBar.createFilter({ field: 'extension', operation: 'is', value: 'jpeg' }, '0.1');
await filterBar.createFilter(
{ field: 'extension', operation: 'equals', value: 'jpeg' },
'0.1'
);
await testSubjects.clickWhenNotDisabled('saveFilter');

const filterLabelUpdated = await filterBar.getFiltersLabel();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const addFilterAndRefresh = async () => {
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.dashboard.waitForRenderComplete();
await filterBar.addFilter({ field: 'bytes', operation: 'is', value: '12345678' });
await filterBar.addFilter({ field: 'bytes', operation: 'equals', value: '12345678' });
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.dashboard.waitForRenderComplete();
// first round of requests sometimes times out, refresh all visualizations to fetch again
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/dashboard/group2/full_screen_mode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

it('shows filter bar in fullscreen mode', async () => {
await filterBar.addFilter({ field: 'bytes', operation: 'is', value: '12345678' });
await filterBar.addFilter({ field: 'bytes', operation: 'equals', value: '12345678' });
await PageObjects.dashboard.waitForRenderComplete();
await PageObjects.dashboard.clickFullScreenMode();
await retry.try(async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.dashboard.gotoDashboardLandingPage();
await PageObjects.dashboard.loadSavedDashboard('Dashboard with Missing Lens Panel');
await PageObjects.header.waitUntilLoadingHasFinished();
await filterBar.addFilter({ field: 'bytes', operation: 'is', value: '12345678' });
await filterBar.addFilter({ field: 'bytes', operation: 'equals', value: '12345678' });
await PageObjects.header.waitUntilLoadingHasFinished();
expect(await filterBar.getFilterCount()).to.be(1);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

it('highlighting on filtering works', async function () {
await dashboardAddPanel.addSavedSearch('Rendering-Test:-saved-search');
await filterBar.addFilter({ field: 'agent', operation: 'is', value: 'Mozilla' });
await filterBar.addFilter({ field: 'agent', operation: 'equals', value: 'Mozilla' });
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.dashboard.waitForRenderComplete();
const dataTable = await find.byCssSelector(`[data-test-subj="embeddedSavedSearchDocTable"]`);
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/dashboard/group5/share.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

it('unpinned filter should show up only in app state when dashboard is unsaved', async () => {
await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'AE' });
await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'AE' });
await PageObjects.dashboard.waitForRenderComplete();

const sharedUrl = await getSharedUrl(mode);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

describe('do not apply global filters', async () => {
it('- filter pills', async () => {
await filterBar.addFilter({ field: 'animal.keyword', operation: 'is', value: 'cat' });
await filterBar.addFilter({ field: 'animal.keyword', operation: 'equals', value: 'cat' });
await dashboardControls.optionsListOpenPopover(firstOptionsListId);
let afterCount = await dashboardControls.optionsListPopoverGetAvailableOptionsCount();
expect(afterCount).to.be.lessThan(beforeCount);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
before(async () => {
await filterBar.addFilter({
field: 'sound.keyword',
operation: 'is one of',
operation: 'one of',
value: ['bark', 'bow ow ow', 'ruff'],
});
await header.waitUntilLoadingHasFinished();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

it('Can mark multiple selections invalid with Filter', async () => {
await filterBar.addFilter({ field: 'sound.keyword', operation: 'is', value: 'hiss' });
await filterBar.addFilter({ field: 'sound.keyword', operation: 'equals', value: 'hiss' });
await dashboard.waitForRenderComplete();
await header.waitUntilLoadingHasFinished();
await dashboardControls.ensureAvailableOptionsEqual(controlId, {
Expand Down Expand Up @@ -144,7 +144,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

it('Does not mark multiple selections invalid with Filter', async () => {
await filterBar.addFilter({ field: 'sound.keyword', operation: 'is', value: 'hiss' });
await filterBar.addFilter({ field: 'sound.keyword', operation: 'equals', value: 'hiss' });
await dashboard.waitForRenderComplete();
await header.waitUntilLoadingHasFinished();
await dashboardControls.ensureAvailableOptionsEqual(controlId, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
expect(hitCount).to.be('4,731');
});

await filterBar.addFilter({ field: 'extension.raw', operation: 'is one of', value: ['jpg'] });
await filterBar.addFilter({ field: 'extension.raw', operation: 'one of', value: ['jpg'] });
await retry.try(async function tryingForTime() {
const hitCount = await PageObjects.discover.getHitCount();
expect(hitCount).to.be('3,029');
Expand Down
8 changes: 4 additions & 4 deletions test/functional/apps/discover/group1/_filter_editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should add a phrases filter', async function () {
await filterBar.addFilter({
field: 'extension.raw',
operation: 'is one of',
operation: 'one of',
value: ['jpg'],
});
expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(true);
Expand All @@ -60,7 +60,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should support filtering on nested fields', async () => {
await filterBar.addFilter({
field: 'nestedField.child',
operation: 'is',
operation: 'equals',
value: 'nestedValue',
});
expect(await filterBar.hasFilter('nestedField.child', 'nestedValue')).to.be(true);
Expand Down Expand Up @@ -117,7 +117,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should support range filter on version fields', async () => {
await filterBar.addFilter({
field: 'version',
operation: 'is between',
operation: 'between',
value: { from: '2.0.0', to: '3.0.0' },
});
expect(await filterBar.hasFilter('version', '2.0.0 to 3.0.0')).to.be(true);
Expand All @@ -137,7 +137,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
await filterBar.addFilter({
field: 'extension.raw',
operation: 'is',
operation: 'equals',
value: 'css',
});
if (pinned) {
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/discover/group1/_url_state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.timePicker.setDefaultAbsoluteRange();
await filterBar.addFilter({
field: 'extension.raw',
operation: 'is one of',
operation: 'one of',
value: ['jpg', 'css'],
});
await filterBar.toggleFilterPinned('extension.raw');
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/discover/group3/_request_counts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await expectSearches(type, 2, async () => {
await filterBar.addFilter({
field: 'extension',
operation: 'is',
operation: 'equals',
value: 'jpg',
});
});
Expand Down
4 changes: 2 additions & 2 deletions test/functional/apps/discover/group3/_sidebar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.unifiedFieldList.clickFieldListItem('extension');
expect(await testSubjects.getVisibleText('dscFieldStats-topValues')).to.be(allTermsResult);

await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'jpg' });
await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'jpg' });
await PageObjects.header.waitUntilLoadingHasFinished();

const onlyJpgResult = 'jpg\n100%';
Expand Down Expand Up @@ -573,7 +573,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
'jpg\n65.0%\ncss\n15.4%\npng\n9.8%\ngif\n6.6%\nphp\n3.2%'
);

await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'jpg' });
await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'jpg' });
await PageObjects.header.waitUntilLoadingHasFinished();
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});

it('should not show the badge after pinning the first filter but after disabling a filter', async () => {
await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'png' });
await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'png' });
await filterBar.addFilter({ field: 'bytes', operation: 'exists' });
await PageObjects.discover.saveSearch(SAVED_SEARCH_WITH_FILTERS_NAME);
await PageObjects.discover.waitUntilSearchingHasFinished();
Expand Down
6 changes: 3 additions & 3 deletions test/functional/apps/discover/group4/_adhoc_data_views.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should support query and filtering', async () => {
await filterBar.addFilter({
field: 'nestedField.child',
operation: 'is',
operation: 'equals',
value: 'nestedValue',
});
expect(await filterBar.hasFilter('nestedField.child', 'nestedValue')).to.be(true);
Expand Down Expand Up @@ -236,12 +236,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

await filterBar.addFilter({
field: 'nestedField.child',
operation: 'is',
operation: 'equals',
value: 'nestedValue',
});
await PageObjects.header.waitUntilLoadingHasFinished();

await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'jpg' });
await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'jpg' });
await PageObjects.header.waitUntilLoadingHasFinished();

const first = await PageObjects.discover.getCurrentDataViewId();
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/visualize/group1/_data_table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should correctly filter for applied time filter on the main timefield', async () => {
await filterBar.addFilter({
field: '@timestamp',
operation: 'is between',
operation: 'between',
value: { from: '2015-09-19', to: '2015-09-21' },
});
await PageObjects.visChart.waitForVisualizationRenderingStabilized();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should correctly filter for applied time filter on the main timefield', async () => {
await filterBar.addFilter({
field: '@timestamp',
operation: 'is between',
operation: 'between',
value: { from: '2015-09-19', to: '2015-09-21' },
});
await PageObjects.header.waitUntilLoadingHasFinished();
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/visualize/group1/_embedding_chart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('should allow to filter in embedded mode', async () => {
await filterBar.addFilter({
field: '@timestamp',
operation: 'is between',
operation: 'between',
value: { from: '2015-09-21', to: '2015-09-23' },
});
await PageObjects.header.waitUntilLoadingHasFinished();
Expand Down
Loading

0 comments on commit 088478d

Please sign in to comment.