Merge branch 'master' into user-pending

test/e2e/page_objects/embedStream.js

@@ -8,6 +8,11 @@ module.exports = {
     },
     getEmbedSection: function() {
       this.waitForElementVisible('@iframe');
+
+      // Pause a bit to let iframe initialize in the hope that it'll
+      // fix https://www.browserstack.com/automate/builds/96419cf46e3d6376a36ae6d3f90934112df1ed91/sessions/224f1a1566c1c8c7859e2e76ece51862200f0173#automate_button
+      this.api.pause(200);
+
       this.api.frame(iframeId);
       this.expect.section('@embed').to.be.present;
       return this.section.embed;
@@ -23,11 +28,13 @@ module.exports = {
     embed: {
       commands: [{
         getProfileSection: function() {
+          this.waitForElementVisible('@profileTabButton');
           this.click('@profileTabButton');
           this.expect.section('@profile').to.be.present;
           return this.section.profile;
         },
         getCommentsSection: function() {
+          this.waitForElementVisible('@commentsTabButton');
           this.click('@commentsTabButton');
           this.expect.section('@comments').to.be.present;
           return this.section.comments;