Disable timestamp on uptime app navigation for functional tests.

elastic · Mar 12, 2019 · b50843f · b50843f
1 parent f10c481
commit b50843f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/test/functional/page_objects/time_picker.js b/test/functional/page_objects/time_picker.js
@@ -122,6 +122,8 @@ export function TimePickerPageProvider({ getService, getPageObjects }) {
     }
 
     async showStartEndTimes() {
+      // This first await makes sure the superDatePicker has loaded before we check for the ShowDatesButton
+      await testSubjects.exists('superDatePickerToggleQuickMenuButton', { timeout: 20000 });
       const isShowDatesButton = await testSubjects.exists('superDatePickerShowDatesButton');
       if (isShowDatesButton) {
         await testSubjects.click('superDatePickerShowDatesButton');

diff --git a/test/functional/services/browser.js b/test/functional/services/browser.js
@@ -77,7 +77,7 @@ export async function BrowserProvider({ getService }) {
      * @param {boolean} insertTimestamp Optional
      * @return {Promise<void>}
      */
-    async get(url, insertTimestamp = true) {
+    async get(url, insertTimestamp = false) {
       if (insertTimestamp) {
         const urlWithTime = modifyUrl(url, parsed => {
           parsed.query._t = Date.now();

diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -10,17 +10,16 @@ export const UptimePageProvider = ({
   getPageObjects,
   getService,
 }: KibanaFunctionalTestDefaultProviders) => {
-  const pageObject = getPageObjects(['common', 'timePicker']);
+  const pageObjects = getPageObjects(['common', 'timePicker']);
   const uptimeService = getService('uptime');
 
   return new class UptimePage {
     public async goToUptimeOverviewAndLoadData(
       datePickerStartValue: string,
       monitorIdToCheck: string
     ) {
-      await pageObject.common.navigateToApp('home');
-      await uptimeService.navigateToPlugin();
-      await pageObject.timePicker.setAbsoluteStart(datePickerStartValue);
+      await pageObjects.common.navigateToApp('uptime');
+      await pageObjects.timePicker.setAbsoluteStart(datePickerStartValue);
       await uptimeService.monitorIdExists(monitorIdToCheck);
     }
 
@@ -29,9 +28,8 @@ export const UptimePageProvider = ({
       monitorId: string,
       monitorName: string
     ) {
-      await pageObject.common.navigateToApp('home');
-      await uptimeService.navigateToPlugin();
-      await pageObject.timePicker.setAbsoluteStart(datePickerStartValue);
+      await pageObjects.common.navigateToApp('uptime');
+      await pageObjects.timePicker.setAbsoluteStart(datePickerStartValue);
       await uptimeService.navigateToMonitorWithId(monitorId);
       if ((await uptimeService.getMonitorNameDisplayedOnPageTitle()) !== monitorName) {
         throw new Error('Expected monitor name not found');

diff --git a/x-pack/test/functional/services/uptime.ts b/x-pack/test/functional/services/uptime.ts
@@ -14,9 +14,6 @@ export const UptimeProvider = ({ getService }: KibanaFunctionalTestDefaultProvid
         throw new Error(`Couldn't find expected element with key "${key}".`);
       }
     },
-    async navigateToPlugin() {
-      await testSubjects.click('homeSynopsisLinkuptime');
-    },
     async monitorIdExists(key: string) {
       await testSubjects.existOrFail(key);
     },