Added several data-test-subj attributes and used them in the tests

elastic · Dec 16, 2016 · 0528a55 · 0528a55
1 parent c4f3e6c
commit 0528a55
Show file tree

Hide file tree

Showing 6 changed files with 165 additions and 250 deletions.
diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html
@@ -6,6 +6,6 @@
           ng-click="toggleDisplay(field)"
           ng-class="::field.display ? 'btn-danger' : 'btn-primary'"
           ng-bind="::field.display ? 'remove' : 'add'"
-          class="btn btn-xs btn-primary discover-field-toggle" ></button>
+          class="btn btn-xs btn-primary discover-field-toggle" data-test-subj="fieldToggle-{{::field.name}}"></button>
       </div>
     </li>
diff --git a/...core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html b/...core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html
@@ -45,7 +45,8 @@ <h5 ng-show="!field.details.error">Quick Count <kbn-info info="Top 5 values base
       <a
         ng-href="{{vizLocation(field)}}"
         ng-show="field.visualizable"
-        class="sidebar-item-button primary">
+        class="sidebar-item-button primary"
+        data-test-subj="fieldVisualize-{{::field.name}}">
           Visualize
           <span class="discover-field-vis-warning" ng-show="warnings.length" tooltip="{{warnings.join(' ')}}">
           ( {{::warnings.length}} <ng-pluralize count="warnings.length" when="{'1':'warning', 'other':'warnings'}"></ng-pluralize> <i aria-hidden="true" class="fa fa-warning"></i> )

diff --git a/src/ui/public/field_editor/field_editor.html b/src/ui/public/field_editor/field_editor.html
@@ -13,7 +13,8 @@
       required
       placeholder="New Scripted Field"
       input-focus
-      class="form-control">
+      class="form-control"
+      data-test-subj="editorFieldName">
   </div>
   <div ng-if="editor.creating && editor.indexPattern.fields.byName[editor.field.name]" class="hintbox">
     <p>
@@ -30,7 +31,8 @@
       ng-model="editor.field.lang"
       ng-options="lang as lang for lang in editor.scriptingLangs"
       required
-      class="form-control">
+      class="form-control"
+      data-test-subj="editorFieldLang">
       <option value="">-- Select Language --</option>
     </select>
   </div>
@@ -41,7 +43,8 @@
       ng-if="editor.field.scripted"
       ng-model="editor.field.type"
       ng-options="type as type for type in editor.fieldTypes"
-      class="form-control">
+      class="form-control"
+      data-test-subj="editorFieldType">
     </select>
     <input
       ng-if="!editor.field.scripted"
@@ -70,7 +73,8 @@ <h4 class="hintbox-heading">
     <select
       ng-model="editor.selectedFormatId"
       ng-options="format.id as format.title for format in editor.fieldFormatTypes"
-      class="form-control">
+      class="form-control"
+      data-test-subj="editorSelectedFormatId">
     </select>
     <fieldset
       field-format-editor
@@ -87,22 +91,23 @@ <h4 class="hintbox-heading">
       <input
         ng-model="editor.field.count"
         type="number"
-        class="form-control">
+        class="form-control"
+        data-test-subj=editorFieldCount>
 
       <span class="input-group-btn">
         <button
           type="button"
           ng-click="editor.field.count = editor.field.count + 1"
           aria-label="Plus"
           class="btn btn-default">
-          <i aria-hidden="true" class="fa fa-plus"></i>
+          <i aria-hidden="true" class="fa fa-plus" data-test-subj=editorFieldCountPlus></i>
         </button>
         <button
           type="button"
           ng-click="editor.field.count = editor.field.count - 1"
           aria-label="Minus"
           class="btn btn-default">
-          <i aria-hidden="true" class="fa fa-minus"></i>
+          <i aria-hidden="true" class="fa fa-minus" data-test-subj=editorFieldCountMinus></i>
         </button>
       </span>
     </div>
@@ -111,7 +116,8 @@ <h4 class="hintbox-heading">
   <div ng-if="editor.field.scripted">
     <div class="form-group">
       <label>Script</label>
-      <textarea required class="field-editor_script-input form-control text-monospace" ng-model="editor.field.script"></textarea>
+      <textarea required class="field-editor_script-input form-control text-monospace"
+      ng-model="editor.field.script" data-test-subj="editorFieldScript"></textarea>
     </div>
 
     <div class="form-group">

diff --git a/src/ui/public/filter_bar/filter_bar.html b/src/ui/public/filter_bar/filter_bar.html
@@ -73,7 +73,7 @@
       <a ng-click="showFilterActions = !showFilterActions">
         Actions
         <i class="fa"
-        ng-class="{'fa-caret-down': showFilterActions, 'fa-caret-right': !showFilterActions}"></i>
+        ng-class="{'fa-caret-down': showFilterActions, 'fa-caret-right': !showFilterActions}" data-test-subj="showFilterActions"></i>
       </a>
     </div>
   </div>
@@ -103,7 +103,7 @@
       <div class="filter-description"><a ng-click="toggleAll()">Toggle</a></div>
     </div>
     <div class="filter-link">
-      <div class="filter-description"><a ng-click="removeAll()">Remove</a></div>
+      <div class="filter-description"><a ng-click="removeAll()" data-test-subj="removeAllFilters">Remove</a></div>
     </div>
   </div>
 </div>
diff --git a/test/support/page_objects/discover_page.js b/test/support/page_objects/discover_page.js
@@ -290,14 +290,14 @@ export default class DiscoverPage {
     .findByCssSelector('li[attr-field="' + field + '"]').click();
   }
 
-  clickFieldListItemAdd(field) {
-    return this.findTimeout
-    .findByCssSelector('li[attr-field="' + field + '"] > div > button').click();
+  async clickFieldListItemAdd(field) {
+    await PageObjects.common.findTestSubject('fieldToggle-' + field).click();
   }
 
-  clickFieldListItemVisualize(field) {
-    return this.findTimeout
-    .findByCssSelector('li[attr-field="' + field + '"] > a').click();
+  async clickFieldListItemVisualize(field) {
+    return await PageObjects.common.try(async () => {
+      await PageObjects.common.findTestSubject('fieldVisualize-' + field).click();
+    });
   }
 
   clickFieldListPlusFilter(field, value) {
@@ -316,15 +316,9 @@ export default class DiscoverPage {
     .click();
   }
 
-  removeAllFilters() {
-    return this.findTimeout
-    .findByCssSelector('a[ng-click="showFilterActions = !showFilterActions"]')
-    .click()
-    .then(() => {
-      return this.findTimeout
-      .findByCssSelector('a[ng-click="removeAll()"]')
-      .click();
-    });
+  async removeAllFilters() {
+    await PageObjects.common.findTestSubject('showFilterActions').click();
+    await PageObjects.common.findTestSubject('removeAllFilters').click();
   }