Update setFilterRatioOption function

elastic · Jul 19, 2021 · 0c14193 · 0c14193
1 parent cf328d3
commit 0c14193
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.js
@@ -101,12 +101,12 @@ export const FilterRatioAgg = (props) => {
                 defaultMessage="Numerator"
               />
             }
-            data-test-subj="numeratorRow"
           >
             <QueryBarWrapper
               query={model.numerator}
               onChange={handleNumeratorQueryChange}
               indexPatterns={[indexPattern]}
+              data-test-subj="filterRatioNumeratorInput"
             />
           </EuiFormRow>
         </EuiFlexItem>
@@ -120,12 +120,12 @@ export const FilterRatioAgg = (props) => {
                 defaultMessage="Denominator"
               />
             }
-            data-test-subj="denominatorRow"
           >
             <QueryBarWrapper
               query={model.denominator}
               onChange={handleDenominatorQueryChange}
               indexPatterns={[indexPattern]}
+              data-test-subj="filterRatioDenominatorInput"
             />
           </EuiFormRow>
         </EuiFlexItem>

diff --git a/src/plugins/vis_type_timeseries/public/application/components/query_bar_wrapper.tsx b/src/plugins/vis_type_timeseries/public/application/components/query_bar_wrapper.tsx
@@ -18,9 +18,15 @@ import { fetchIndexPattern, isStringTypeIndexPattern } from '../../../common/ind
 
 type QueryBarWrapperProps = Pick<QueryStringInputProps, 'query' | 'onChange'> & {
   indexPatterns: IndexPatternValue[];
+  'data-test-subj'?: string;
 };
 
-export function QueryBarWrapper({ query, onChange, indexPatterns }: QueryBarWrapperProps) {
+export function QueryBarWrapper({
+  query,
+  onChange,
+  indexPatterns,
+  'data-test-subj': dataTestSubj,
+}: QueryBarWrapperProps) {
   const { indexPatterns: indexPatternsService } = getDataStart();
   const [indexes, setIndexes] = useState<QueryStringInputProps['indexPatterns']>([]);
 
@@ -58,6 +64,7 @@ export function QueryBarWrapper({ query, onChange, indexPatterns }: QueryBarWrap
       onChange={onChange}
       indexPatterns={indexes}
       {...coreStartContext}
+      dataTestSubj={dataTestSubj}
     />
   );
 }
diff --git a/test/functional/apps/visualize/_tsvb_table.ts b/test/functional/apps/visualize/_tsvb_table.ts
@@ -92,8 +92,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       it('should display correct values for filter ratio aggregation with numerator and denominator', async () => {
         const EXPECTED = 'OS Filter Ratio\nwin 8 2\nwin xp 0\nwin 7 3\nios 0\nosx 0';
         await visualBuilder.selectAggType('Filter Ratio');
-        await visualBuilder.setFilterRatioOption('numerator', 'extension.raw : "css"');
-        await visualBuilder.setFilterRatioOption('denominator', 'bytes <= 3000');
+        await visualBuilder.setFilterRatioOption('Numerator', 'extension.raw : "css"');
+        await visualBuilder.setFilterRatioOption('Denominator', 'bytes <= 3000');
         await visChart.waitForVisualizationRenderingStabilized();
 
         const tableData = await visualBuilder.getViewTable();

diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
@@ -728,10 +728,8 @@ export class VisualBuilderPageObject extends FtrService {
     });
   }
 
-  public async setFilterRatioOption(optionType: 'numerator' | 'denominator', query: string) {
-    const optionInput = await this.find.byCssSelector(
-      `[data-test-subj="${optionType}Row"] [data-test-subj="queryInput"]`
-    );
+  public async setFilterRatioOption(optionType: 'Numerator' | 'Denominator', query: string) {
+    const optionInput = await this.testSubjects.find(`filterRatio${optionType}Input`);
     await optionInput.type(query);
   }
 }