From 6e56015138f074c663bb77ba1f3bbd8ac0b29a46 Mon Sep 17 00:00:00 2001
From: Javon Davis <JavonDavis@users.noreply.github.com>
Date: Mon, 28 Sep 2020 21:40:15 -0500
Subject: [PATCH 1/9] Find recyclerview by getting child of the RelativeLayout

---
 .bundle/config                                        |  2 +-
 .idea/codeStyles/Project.xml                          | 11 +----------
 .../org/wordpress/android/e2e/pages/EditorPage.java   |  2 +-
 .../wordpress/android/e2e/pages/PostsListPage.java    |  4 +++-
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.bundle/config b/.bundle/config
index 395b3edaa503..c996205d262b 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -2,4 +2,4 @@
 BUNDLE_PATH: "vendor/bundle"
 BUNDLE_RETRY: "3"
 BUNDLE_JOBS: "3"
-BUNDLE_WITHOUT: "screenshots"
+BUNDLE_WITH: "screenshots:screenshots`."
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index dd2e16ebd1ae..3bf04816d9bb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -32,16 +32,7 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java
index 3a6657b9eae1..82c50fe60dc5 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java
@@ -85,7 +85,7 @@ public void enterImage() {
 
         waitForElementToBeDisplayed(publishButton);
     }
-
+    
     public void openSettings() {
         openActionBarOverflowOrOptionsMenu(ApplicationProvider.getApplicationContext());
         clickOn(onView(withText(R.string.post_settings)));
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
index 22486c85c738..da48971c1538 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
@@ -1,5 +1,7 @@
 package org.wordpress.android.e2e.pages;
 
+import android.view.ViewGroup;
+
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
@@ -22,6 +24,6 @@ public static void scrollToTop() {
 
     private static RecyclerView getRecyclerView() {
         ViewPager pager = getCurrentActivity().findViewById(R.id.postPager);
-        return (RecyclerView) pager.getChildAt(pager.getCurrentItem()).findViewById(R.id.recycler_view);
+        return (RecyclerView) ((ViewGroup) ((ViewGroup) (pager.getChildAt(pager.getCurrentItem())).findViewById(R.id.ptr_layout)).getChildAt(0)).getChildAt(0);
     }
 }

From d98ae7393e0de7df307514dc37a2971965ec2958 Mon Sep 17 00:00:00 2001
From: Javon Davis <JavonDavis@users.noreply.github.com>
Date: Mon, 28 Sep 2020 21:43:47 -0500
Subject: [PATCH 2/9] fix unwanted changes

---
 .bundle/config                                        |  2 +-
 .idea/codeStyles/Project.xml                          | 11 ++++++++++-
 .../org/wordpress/android/e2e/pages/EditorPage.java   |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.bundle/config b/.bundle/config
index c996205d262b..d1b42d0b6d2a 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -2,4 +2,4 @@
 BUNDLE_PATH: "vendor/bundle"
 BUNDLE_RETRY: "3"
 BUNDLE_JOBS: "3"
-BUNDLE_WITH: "screenshots:screenshots`."
+BUNDLE_WITH: "screenshots"
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3bf04816d9bb..dd2e16ebd1ae 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -32,7 +32,16 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java
index 82c50fe60dc5..3a6657b9eae1 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java
@@ -85,7 +85,7 @@ public void enterImage() {
 
         waitForElementToBeDisplayed(publishButton);
     }
-    
+
     public void openSettings() {
         openActionBarOverflowOrOptionsMenu(ApplicationProvider.getApplicationContext());
         clickOn(onView(withText(R.string.post_settings)));

From fc74963eb2ef224cb70d5a4d6994bf5818ba8551 Mon Sep 17 00:00:00 2001
From: Javon Davis <JavonDavis@users.noreply.github.com>
Date: Mon, 28 Sep 2020 21:44:23 -0500
Subject: [PATCH 3/9] fix unwanted changes

---
 .bundle/config               |  2 +-
 .idea/codeStyles/Project.xml | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.bundle/config b/.bundle/config
index d1b42d0b6d2a..395b3edaa503 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -2,4 +2,4 @@
 BUNDLE_PATH: "vendor/bundle"
 BUNDLE_RETRY: "3"
 BUNDLE_JOBS: "3"
-BUNDLE_WITH: "screenshots"
+BUNDLE_WITHOUT: "screenshots"
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index dd2e16ebd1ae..3bf04816d9bb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -32,16 +32,7 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />

From 02b074a7e7b51549c7c48b65a7a7de1f4a969b11 Mon Sep 17 00:00:00 2001
From: Javon Davis <JavonDavis@users.noreply.github.com>
Date: Mon, 28 Sep 2020 21:46:53 -0500
Subject: [PATCH 4/9] fix unwanted changes

---
 .idea/codeStyles/Project.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3bf04816d9bb..dd2e16ebd1ae 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -32,7 +32,16 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />

From 58e2cde372687384e12d423fc62781a56991d206 Mon Sep 17 00:00:00 2001
From: Javon Davis <JavonDavis@users.noreply.github.com>
Date: Tue, 29 Sep 2020 13:16:46 -0500
Subject: [PATCH 5/9] fix linter error

---
 .../java/org/wordpress/android/e2e/pages/PostsListPage.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
index da48971c1538..9580f70440c9 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
@@ -24,6 +24,7 @@ public static void scrollToTop() {
 
     private static RecyclerView getRecyclerView() {
         ViewPager pager = getCurrentActivity().findViewById(R.id.postPager);
-        return (RecyclerView) ((ViewGroup) ((ViewGroup) (pager.getChildAt(pager.getCurrentItem())).findViewById(R.id.ptr_layout)).getChildAt(0)).getChildAt(0);
+        return (RecyclerView) ((ViewGroup) ((ViewGroup) (pager.getChildAt(pager.getCurrentItem()))
+                .findViewById(R.id.ptr_layout)).getChildAt(0)).getChildAt(0);
     }
 }

From 7008088c5660fd63ba9c55c774017df006b6f453 Mon Sep 17 00:00:00 2001
From: Javon Davis <JavonDavis@users.noreply.github.com>
Date: Fri, 2 Oct 2020 07:25:46 -0500
Subject: [PATCH 6/9] add comment and put workaround in if check

---
 .../org/wordpress/android/e2e/pages/PostsListPage.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
index 9580f70440c9..46b499a094ca 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
@@ -24,7 +24,12 @@ public static void scrollToTop() {
 
     private static RecyclerView getRecyclerView() {
         ViewPager pager = getCurrentActivity().findViewById(R.id.postPager);
-        return (RecyclerView) ((ViewGroup) ((ViewGroup) (pager.getChildAt(pager.getCurrentItem()))
-                .findViewById(R.id.ptr_layout)).getChildAt(0)).getChildAt(0);
+        RecyclerView recyclerView = (RecyclerView) pager.getChildAt(pager.getCurrentItem()).findViewById(R.id.recycler_view);
+        if (recyclerView == null) {
+            // Workaround for cases when recyclerview id missing
+            recyclerView = (RecyclerView) ((ViewGroup) ((ViewGroup) (pager.getChildAt(pager.getCurrentItem()))
+                    .findViewById(R.id.ptr_layout)).getChildAt(0)).getChildAt(0);
+        }
+        return recyclerView;
     }
 }

From 9239ddf9fcef8bee7ff8ce0ee0e921af4a0a45de Mon Sep 17 00:00:00 2001
From: Javon Davis <JavonDavis@users.noreply.github.com>
Date: Mon, 5 Oct 2020 06:51:28 -0500
Subject: [PATCH 7/9] fix linter error

---
 .../java/org/wordpress/android/e2e/pages/PostsListPage.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
index 46b499a094ca..ccf1c39c9a7a 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
@@ -24,7 +24,8 @@ public static void scrollToTop() {
 
     private static RecyclerView getRecyclerView() {
         ViewPager pager = getCurrentActivity().findViewById(R.id.postPager);
-        RecyclerView recyclerView = (RecyclerView) pager.getChildAt(pager.getCurrentItem()).findViewById(R.id.recycler_view);
+        RecyclerView recyclerView = (RecyclerView) pager.getChildAt(pager.getCurrentItem())
+                                                        .findViewById(R.id.recycler_view);
         if (recyclerView == null) {
             // Workaround for cases when recyclerview id missing
             recyclerView = (RecyclerView) ((ViewGroup) ((ViewGroup) (pager.getChildAt(pager.getCurrentItem()))

From 4431537e0e854354932741f4ae8cd978e1a69a76 Mon Sep 17 00:00:00 2001
From: Sheri Bigelow <sheri@designsimply.com>
Date: Thu, 8 Oct 2020 00:07:03 -0600
Subject: [PATCH 8/9] Update Screenshot UI Tests with New Designs

---
 .../ui/screenshots/WPScreenshotTest.java      | 92 ++++++++++---------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java b/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
index 5833357a20b7..7cc9db0bc27e 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
@@ -62,29 +62,18 @@ public void wPScreenshotTest() {
 
         wpLogin();
 
-        idleFor(1000);
-        takeScreenshot("1-build-and-manage-your-website");
-
-        navigateMySite();
         editBlogPost();
-        manageMedia();
-        navigateNotifications();
+        navigateDiscover();
         navigateStats();
+        navigateMySite();
+        navigateNotifications();
+        manageMedia();
 
         // Turn Demo Mode off on the emulator when we're done
         mDemoModeEnabler.disable();
         logoutIfNecessary();
     }
 
-    private void navigateMySite() {
-        // Click on the "Sites" tab and take a screenshot
-        clickOn(R.id.nav_sites);
-
-        waitForElementToBeDisplayedWithoutFailure(R.id.row_blog_posts);
-
-        takeScreenshot("4-keep-tabs-on-your-site");
-    }
-
     private void editBlogPost() {
         // Choose the "sites" tab in the nav
         clickOn(R.id.nav_sites);
@@ -100,18 +89,11 @@ private void editBlogPost() {
         // Choose "Drafts"
         selectItemWithTitleInTabLayout(getTranslatedString(R.string.post_list_tab_drafts), R.id.tabLayout);
 
-        // Get a screenshot of the writing feature (without image)
-        String name = "2-create-beautiful-posts-and-pages";
-        screenshotPostWithName("Time to Book Summer Sessions", name, false);
-
-        // Get a screenshot of the drafts feature
-        screenshotPostWithName("Ideas", "6-capture-ideas-on-the-go", false);
+        // TODO: Tap the + in the editor toolbar to open the block library
 
-        // Get a screenshot of the drafts feature
-        screenshotPostWithName("Summer Band Jam", "7-create-beautiful-posts-and-pages", true);
-
-        // Get a screenshot for "write without compromises"
-        screenshotPostWithName("Now Booking Summer Sessions", "8-write-without-compromises", true);
+        // Get a screenshot of the editor with the block library expanded
+        String name = "1-create-a-site-or-start-a-blog";
+        screenshotPostWithName("Summer Band Jam", name, false);
 
         // Exit back to the main activity
         pressBackUntilElementIsDisplayed(R.id.nav_sites);
@@ -141,16 +123,43 @@ private void screenshotPostWithName(String name, String screenshotName, boolean
         pressBackUntilElementIsDisplayed(R.id.tabLayout);
     }
 
-    private void manageMedia() {
-        // Click on the "Sites" tab in the nav, then choose "Media"
+    private void navigateDiscover() {
+        // Click on the "Reader" tab and take a screenshot
+        clickOn(R.id.nav_reader);
+
+        // TODO: add this back after mocked data for Discover has been fixed
+        // waitForElementToBeDisplayedWithoutFailure(R.id.interests_fragment_container);
+
+        takeScreenshot("2-discover-new-reads");
+
+        // Exit back to the main activity
+        pressBackUntilElementIsDisplayed(R.id.nav_sites);
+    }
+
+    private void navigateStats() {
+        // Click on the "Sites" tab in the nav, then choose "Stats"
         clickOn(R.id.nav_sites);
-        clickOn(R.id.quick_action_media_button);
+        clickOn(R.id.row_stats);
 
-        waitForElementToBeDisplayedWithoutFailure(R.id.media_grid_item_image);
+        // Show the months view
+        selectItemWithTitleInTabLayout(getTranslatedString(R.string.stats_timeframe_months), R.id.tabLayout);
+
+        // Wait for the stats to load
+        idleFor(5000);
 
-        takeScreenshot("5-share-from-anywhere");
+        takeScreenshot("3-build-an-audience");
 
-        pressBackUntilElementIsDisplayed(R.id.quick_action_media_button);
+        // Exit the Stats Activity
+        pressBackUntilElementIsDisplayed(R.id.nav_sites);
+    }
+
+    private void navigateMySite() {
+        // Click on the "Sites" tab and take a screenshot
+        clickOn(R.id.nav_sites);
+
+        waitForElementToBeDisplayedWithoutFailure(R.id.row_blog_posts);
+
+        takeScreenshot("4-keep-tabs-on-your-site");
     }
 
     private void navigateNotifications() {
@@ -161,27 +170,22 @@ private void navigateNotifications() {
         waitForImagesOfTypeWithPlaceholder(R.id.note_avatar, ImageType.AVATAR);
 
 
-        takeScreenshot("4-check-whats-happening-in-real-time");
+        takeScreenshot("5-reply-in-real-time");
 
         // Exit the notifications activity
         pressBackUntilElementIsDisplayed(R.id.nav_sites);
     }
 
-    private void navigateStats() {
-        // Click on the "Sites" tab in the nav, then choose "Stats"
+    private void manageMedia() {
+        // Click on the "Sites" tab in the nav, then choose "Media"
         clickOn(R.id.nav_sites);
-        clickOn(R.id.row_stats);
-
-        // Show the year view – it'll have the best layout
-        selectItemWithTitleInTabLayout(getTranslatedString(R.string.stats_timeframe_years), R.id.tabLayout);
+        clickOn(R.id.quick_action_media_button);
 
-        // Wait for the stats to load
-        idleFor(5000);
+        waitForElementToBeDisplayedWithoutFailure(R.id.media_grid_item_image);
 
-        takeScreenshot("3-track-what-your-visitors-love");
+        takeScreenshot("6-upload-on-the-go");
 
-        // Exit the Stats Activity
-        pressBackUntilElementIsDisplayed(R.id.nav_sites);
+        pressBackUntilElementIsDisplayed(R.id.quick_action_media_button);
     }
 
     private void takeScreenshot(String screenshotName) {

From 4c9d135fa9f69fbd5c2db0748abf7401664e269a Mon Sep 17 00:00:00 2001
From: Sheri Bigelow <sheri@designsimply.com>
Date: Thu, 8 Oct 2020 20:01:44 -0600
Subject: [PATCH 9/9] Get the add block button to click (add_block_diff.txt)

---
 .../wordpress/android/support/WPSupportUtils.java   |  5 +++++
 .../android/ui/screenshots/WPScreenshotTest.java    | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java b/WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java
index 3f779e95e7db..240882eaeb4c 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java
@@ -39,6 +39,7 @@
 import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
 import static androidx.test.espresso.action.ViewActions.longClick;
 import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static org.wordpress.android.support.BetterScrollToAction.scrollTo;
 import static androidx.test.espresso.action.ViewActions.swipeLeft;
 import static androidx.test.espresso.action.ViewActions.swipeRight;
@@ -111,6 +112,10 @@ public static void clickOn(ViewInteraction viewInteraction) {
         idleFor(500); // allow for transitions
     }
 
+    public static void clickOnViewWithContentDescription(String contentDescription) {
+        clickOn(onView(withContentDescription(contentDescription)));
+    }
+
     /**
      * Returns an action that performs a single click on the view.
      *
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java b/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
index 7cc9db0bc27e..94e432ec32a2 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
@@ -23,6 +23,7 @@
 import org.wordpress.android.util.image.ImageType;
 
 import static org.wordpress.android.support.WPSupportUtils.clickOn;
+import static org.wordpress.android.support.WPSupportUtils.clickOnViewWithContentDescription;
 import static org.wordpress.android.support.WPSupportUtils.dialogExistsWithTitle;
 import static org.wordpress.android.support.WPSupportUtils.getCurrentActivity;
 import static org.wordpress.android.support.WPSupportUtils.getTranslatedString;
@@ -93,13 +94,17 @@ private void editBlogPost() {
 
         // Get a screenshot of the editor with the block library expanded
         String name = "1-create-a-site-or-start-a-blog";
-        screenshotPostWithName("Summer Band Jam", name, false);
+        screenshotPostWithName("Summer Band Jam", name, false, true);
+
 
         // Exit back to the main activity
         pressBackUntilElementIsDisplayed(R.id.nav_sites);
     }
 
-    private void screenshotPostWithName(String name, String screenshotName, boolean hideKeyboard) {
+    @SuppressWarnings("checkstyle:WhitespaceAround") private void screenshotPostWithName(String name,
+                                                                                         String screenshotName,
+                                                                                         boolean hideKeyboard,
+                                                                                         boolean openBlockList) {
         idleFor(2000);
 
         PostsListPage.scrollToTop();
@@ -119,6 +124,10 @@ private void screenshotPostWithName(String name, String screenshotName, boolean
             Espresso.closeSoftKeyboard();
         }
 
+        if(openBlockList) {
+            clickOnViewWithContentDescription("Add block, Double tap to add a block");
+        }
+
         takeScreenshot(screenshotName);
         pressBackUntilElementIsDisplayed(R.id.tabLayout);
     }