Merge branch 'trunk' into issue/16202-remove-msd-default-tab-expr

Author: AjeshRPai

WordPress/src/androidTest/java/org/wordpress/android/AppInitializerTest.kt

@@ -0,0 +1,22 @@
+package org.wordpress.android
+
+import androidx.lifecycle.ProcessLifecycleOwner
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Assert.assertFalse
+import org.junit.Test
+import org.wordpress.android.AppInitializer.ApplicationLifecycleMonitor
+import org.wordpress.android.support.BaseTest
+
+/**
+ * This tests if [ProcessLifecycleOwner] observer works at the app startup.
+ *
+ * [WordPress.appIsInTheBackground] is set to false when [ApplicationLifecycleMonitor.onAppComesFromBackground] is
+ * called.
+ */
+@HiltAndroidTest
+class AppInitializerTest : BaseTest() {
+    @Test
+    fun verifyOnAppComesFromBackgroundCalled() {
+        assertFalse(WordPress.appIsInTheBackground)
+    }
+}

WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/MySitesPage.java

@@ -175,6 +175,7 @@ public void goToBackup() {
     public StatsPage goToStats() {
         goToMenuTab();
         clickQuickActionOrSiteMenuItem(R.id.quick_action_stats_button, R.string.stats);
+        idleFor(4000);
         dismissJetpackAdIfPresent();
         waitForElementToBeDisplayedWithoutFailure(R.id.tabLayout);