Revert "Replace Leadfoot with WebDriver API (#26477)" (#31382)

* Revert "Replace Leadfoot with WebDriver API (#26477)" This reverts commit 0bd3b4f. * leadfoot expectes execute args to be an array * disable flaky graphql tests
elastic · Feb 18, 2019 · a48a03c · a48a03c
1 parent b4f3808
commit a48a03c
Show file tree

Hide file tree

Showing 32 changed files with 1,039 additions and 1,093 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -208,7 +208,7 @@ module.exports = {
      */
     {
       files: [
-        'test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js',
+        'test/functional/services/lib/leadfoot_element_wrapper/scroll_into_view_if_necessary.js',
         '**/browser_exec_scripts/**/*',
       ],
       rules: {

diff --git a/package.json b/package.json
@@ -274,6 +274,7 @@
     "@types/eslint": "^4.16.2",
     "@types/execa": "^0.9.0",
     "@types/fetch-mock": "7.2.1",
+    "@types/json5": "^0.0.30",
     "@types/getopts": "^2.0.0",
     "@types/glob": "^5.0.35",
     "@types/globby": "^8.0.0",
@@ -286,7 +287,6 @@
     "@types/joi": "^13.4.2",
     "@types/jquery": "^3.3.6",
     "@types/js-yaml": "^3.11.1",
-    "@types/json5": "^0.0.30",
     "@types/listr": "^0.13.0",
     "@types/lodash": "^3.10.1",
     "@types/minimatch": "^2.0.29",
@@ -373,6 +373,7 @@
     "karma-junit-reporter": "1.2.0",
     "karma-mocha": "1.3.0",
     "karma-safari-launcher": "1.0.0",
+    "leadfoot": "1.7.5",
     "license-checker": "^16.0.0",
     "listr": "^0.14.1",
     "load-grunt-config": "0.19.2",
@@ -392,7 +393,6 @@
     "proxyquire": "1.7.11",
     "regenerate": "^1.4.0",
     "sass-lint": "^1.12.1",
-    "selenium-webdriver": "^4.0.0-alpha.1",
     "simple-git": "1.37.0",
     "sinon": "^5.0.7",
     "strip-ansi": "^3.0.1",

diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js
@@ -33,7 +33,6 @@ export default {
     '<rootDir>/src/setup_node_env',
     '<rootDir>/packages',
     '<rootDir>/src/test_utils',
-    '<rootDir>/test/functional/services/remote',
   ],
   collectCoverageFrom: [
     'packages/kbn-ui-framework/src/components/**/*.js',

diff --git a/src/functional_test_runner/lib/providers/provider_collection.js b/src/functional_test_runner/lib/providers/provider_collection.js
@@ -105,7 +105,7 @@ export class ProviderCollection {
           instance = createAsyncInstance(type, name, instance);
         }
 
-        if (name !== '__webdriver__' && name !== 'log' && name !== 'config' && instance && typeof instance === 'object') {
+        if (name !== '__leadfoot__' && name !== 'log' && name !== 'config' && instance && typeof instance === 'object') {
           instance = createVerboseInstance(
             this._log,
             type === 'PageObject' ? `PageObjects.${name}` : name,

diff --git a/test/functional/apps/dashboard/_dashboard_grid.js b/test/functional/apps/dashboard/_dashboard_grid.js
@@ -37,9 +37,10 @@ export default function ({ getService, getPageObjects }) {
         const lastVisTitle = 'Rendering Test: datatable';
         const panelTitleBeforeMove = await dashboardPanelActions.getPanelHeading(lastVisTitle);
         const position1 = await panelTitleBeforeMove.getPosition();
+
         await browser.dragAndDrop(
-          { location: panelTitleBeforeMove },
-          { location: { x: -20, y: -450 } }
+          { element: panelTitleBeforeMove },
+          { element: null, xOffset: -20, yOffset: -450 }
         );
 
         const panelTitleAfterMove = await dashboardPanelActions.getPanelHeading(lastVisTitle);

diff --git a/test/functional/config.js b/test/functional/config.js
@@ -102,7 +102,7 @@ export default async function ({ readConfigFile }) {
       esArchiver: commonConfig.get('services.esArchiver'),
       kibanaServer: commonConfig.get('services.kibanaServer'),
       retry: commonConfig.get('services.retry'),
-      __webdriver__: RemoteProvider,
+      __leadfoot__: RemoteProvider,
       filterBar: FilterBarProvider,
       queryBar: QueryBarProvider,
       find: FindProvider,

diff --git a/test/functional/page_objects/discover_page.js b/test/functional/page_objects/discover_page.js
@@ -117,8 +117,8 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
     async brushHistogram(from, to) {
       const bars = await find.allByCssSelector('.series.histogram rect');
       await browser.dragAndDrop(
-        { location: bars[from], offset: { x: 0, y: -5 } },
-        { location: bars[to], offset: { x: 0, y: -5 } }
+        { element: bars[from], xOffset: 0, yOffset: -5 },
+        { element: bars[to], xOffset: 0, yOffset: -5 }
       );
     }
 

diff --git a/test/functional/page_objects/time_picker.js b/test/functional/page_objects/time_picker.js
@@ -39,14 +39,6 @@ export function TimePickerPageProvider({ getService, getPageObjects }) {
       return dateString.substring(0, 23);
     }
 
-    async getTimePickerPanel() {
-      return await find.byCssSelector('div.euiPopover__panel-isOpen');
-    }
-
-    async waitPanelIsGone(panelElement) {
-      await find.waitForElementStale(panelElement);
-    }
-
     /**
      * @param {String} fromTime YYYY-MM-DD HH:mm:ss.SSS
      * @param {String} fromTime YYYY-MM-DD HH:mm:ss.SSS
@@ -57,14 +49,11 @@ export function TimePickerPageProvider({ getService, getPageObjects }) {
 
       // set to time
       await testSubjects.click('superDatePickerendDatePopoverButton');
-      let panel = await this.getTimePickerPanel();
       await testSubjects.click('superDatePickerAbsoluteTab');
       await testSubjects.setValue('superDatePickerAbsoluteDateInput', toTime);
 
       // set from time
       await testSubjects.click('superDatePickerstartDatePopoverButton');
-      await this.waitPanelIsGone(panel);
-      panel = await this.getTimePickerPanel();
       await testSubjects.click('superDatePickerAbsoluteTab');
       await testSubjects.setValue('superDatePickerAbsoluteDateInput', fromTime);
 
@@ -79,7 +68,6 @@ export function TimePickerPageProvider({ getService, getPageObjects }) {
         await testSubjects.click('querySubmitButton');
       }
 
-      await this.waitPanelIsGone(panel);
       await PageObjects.header.awaitGlobalLoadingIndicatorHidden();
     }
 
@@ -157,13 +145,11 @@ export function TimePickerPageProvider({ getService, getPageObjects }) {
 
       // get to time
       await testSubjects.click('superDatePickerendDatePopoverButton');
-      const panel = await this.getTimePickerPanel();
       await testSubjects.click('superDatePickerAbsoluteTab');
       const end = await testSubjects.getAttribute('superDatePickerAbsoluteDateInput', 'value');
 
       // get from time
       await testSubjects.click('superDatePickerstartDatePopoverButton');
-      await this.waitPanelIsGone(panel);
       await testSubjects.click('superDatePickerAbsoluteTab');
       const start = await testSubjects.getAttribute('superDatePickerAbsoluteDateInput', 'value');
 

diff --git a/test/functional/page_objects/visual_builder_page.js b/test/functional/page_objects/visual_builder_page.js
@@ -68,7 +68,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }) {
         await input.pressKeys([browser.keys.CONTROL, 'a']); // Select all for everything else
       }
       await input.pressKeys(browser.keys.NULL); // Release modifier keys
-      await input.pressKeys(browser.keys.BACK_SPACE); // Delete all content
+      await input.pressKeys(browser.keys.BACKSPACE); // Delete all content
       await input.type(markdown);
       await PageObjects.visualize.waitForRenderingCount(prevRenderingCount + 1);
     }