Merge pull request elastic#8286 from elastic/jasper/backport/8285/5.x

cjcenizal · web-flow · commit a2ddb4580cf3 · 2016-09-14T14:11:21.000-07:00
[backport] PR elastic#8285 to 5.x - Fix functional tests for Share UI.
diff --git a/src/ui/public/share/views/share.html b/src/ui/public/share/views/share.html
@@ -2,7 +2,10 @@
   <!-- Left panel -->
   <div class="share-panel share-panel--left">
     <!-- Title -->
-    <div class="share-panel__title">
+    <div
+      data-test-subj="shareUiTitle"
+      class="share-panel__title"
+    >
       Share saved {{share.objectType}}
     </div>
 
@@ -146,6 +149,7 @@
         </div>
         <div class="share-panel-header__actions">
           <a
+            data-test-subj="sharedSnapshotShortUrlButton"
             class="share-panel-header__action"
             ng-if="!share.urlFlags.shortSnapshot"
             ng-click="share.toggleShortSnapshotUrl()"
@@ -162,6 +166,7 @@
           </a>
 
           <a
+            data-test-subj="sharedSnapshotCopyButton"
             class="share-panel-header__action"
             ng-click="share.copyToClipboard('#snapshotUrl')"
           >
@@ -172,6 +177,7 @@
 
       <!-- Input -->
       <input
+        data-test-subj="sharedSnapshotUrl"
         id="snapshotUrl"
         class="share-panel-input"
         type="text"
diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js
@@ -52,14 +52,14 @@ bdd.describe('shared links', function describeIndexTests() {
 
   bdd.describe('shared link', function () {
     bdd.it('should show "Share a link" caption', function () {
-      var expectedCaption = 'Share a link';
+      var expectedCaption = 'Share saved';
       return PageObjects.discover.clickShare()
       .then(function () {
         PageObjects.common.saveScreenshot('Discover-share-link');
         return PageObjects.discover.getShareCaption();
       })
       .then(function (actualCaption) {
-        expect(actualCaption).to.be(expectedCaption);
+        expect(actualCaption).to.contain(expectedCaption);
       });
     });
 
@@ -100,7 +100,7 @@ bdd.describe('shared links', function describeIndexTests() {
       .then(function () {
         return PageObjects.common.try(function tryingForTime() {
           PageObjects.common.saveScreenshot('Discover-shorten-url-button');
-          return PageObjects.discover.getShortenedUrl()
+          return PageObjects.discover.getSharedUrl()
           .then(function (actualUrl) {
             expect(actualUrl).to.match(re);
           });
diff --git a/test/support/page_objects/discover_page.js b/test/support/page_objects/discover_page.js
@@ -202,31 +202,25 @@ export default class DiscoverPage {
 
   clickShortenUrl() {
     return this.findTimeout
-    .findByCssSelector('button.shorten-button')
+    .findByCssSelector('[data-test-subj="sharedSnapshotShortUrlButton"]')
     .click();
   }
 
   clickCopyToClipboard() {
     return this.findTimeout
-    .findDisplayedByCssSelector('button.clipboard-button')
+    .findByCssSelector('[data-test-subj="sharedSnapshotCopyButton"]')
     .click();
   }
 
   getShareCaption() {
     return this.findTimeout
-    .findByCssSelector('.vis-share label')
+    .findByCssSelector('[data-test-subj="shareUiTitle"]')
     .getVisibleText();
   }
 
   getSharedUrl() {
     return this.findTimeout
-    .findByCssSelector('.url')
-    .getProperty('value');
-  }
-
-  getShortenedUrl() {
-    return this.findTimeout
-    .findByCssSelector('.url')
+    .findByCssSelector('[data-test-subj="sharedSnapshotUrl"]')
     .getProperty('value');
   }
 
