Merge branch 'trunk' into merge/20.9-rc-3

Author: AliSoftware

RELEASE-NOTES.txt

@@ -2,7 +2,9 @@
 
 21.0
 -----
-
+* [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
+* [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]
+* [*] Stats: Fix Western Arabic Numerals not being shown on every text of the stats screens in Arabic languages [https://github.com/wordpress-mobile/WordPress-Android/pull/17217]
 
 20.9
 -----

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

@@ -17,6 +17,7 @@ import org.wordpress.android.support.BaseTest
 class AppInitializerTest : BaseTest() {
     @Test
     fun verifyOnAppComesFromBackgroundCalled() {
+        Thread.sleep(100)
         assertFalse(WordPress.appIsInTheBackground)
     }
 }

WordPress/src/androidTest/java/org/wordpress/android/TestUtils.java

@@ -4,9 +4,10 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.database.sqlite.SQLiteDatabase;
-import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
+import androidx.preference.PreferenceManager;
+
 import org.greenrobot.eventbus.EventBus;
 import org.wordpress.android.util.DateTimeUtils;
 

WordPress/src/androidTest/java/org/wordpress/android/e2e/BlockEditorTests.java

@@ -39,7 +39,7 @@ public void setUp() {
                        + "<!-- /wp:image --></div>\n";
 
     @Test
-    public void publishSimplePost() {
+    public void e2ePublishSimplePost() {
         String title = "publishSimplePost";
 
         new MySitesPage()
@@ -55,7 +55,7 @@ public void publishSimplePost() {
     }
 
     @Test
-    public void publishFullPost() {
+    public void e2ePublishFullPost() {
         String title = "publishFullPost";
 
         new MySitesPage()
@@ -75,7 +75,7 @@ public void publishFullPost() {
     }
 
     @Test
-    public void blockEditorCanDisplayElementAddedInHtmlMode() {
+    public void e2eBlockEditorCanDisplayElementAddedInHtmlMode() {
         String title = "blockEditorCanDisplayElementAddedInHtmlMode";
 
         new MySitesPage()

WordPress/src/androidTest/java/org/wordpress/android/e2e/ContactUsTests.java

@@ -20,7 +20,7 @@ public void setUp() {
 
     @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
-    public void sendButtonEnabledWhenTextIsEntered() {
+    public void e2eSendButtonEnabledWhenTextIsEntered() {
         try {
             new LoginFlow()
                 .chooseContinueWithWpCom()
@@ -38,39 +38,16 @@ public void sendButtonEnabledWhenTextIsEntered() {
         }
     }
 
-    @Ignore("As long as CI does not use gradle.properties from MobileSecrets")
     @Test
-    public void messageCanBeSent() {
-        String userMessageText = "Please ignore, this is an automated test.";
-        String automatedReplyText = "Mobile support will respond as soon as possible, "
-                                    + "generally within 48-96 hours. "
-                                    + "Please reply with your site address (URL) "
-                                    + "and any additional details we should know.";
-
-        try {
-            new LoginFlow()
-                .chooseContinueWithWpCom()
-                .tapHelp()
-                .openContactUs()
-                .setMessageText(userMessageText)
-                .tapSendButton()
-                .assertUserMessageDelivered(userMessageText)
-                .assertSystemMessageReceived(automatedReplyText);
-        } finally {
-            new ContactSupportScreen().goBackAndDeleteUnsentMessageIfNeeded();
-        }
-    }
-
-    @Test
-    public void helpCanBeOpenedWhileEnteringEmail() {
+    public void e2eHelpCanBeOpenedWhileEnteringEmail() {
         new LoginFlow()
                 .chooseContinueWithWpCom()
                 .tapHelp()
                 .assertHelpAndSupportScreenLoaded();
     }
 
     @Test
-    public void helpCanBeOpenedWhileEnteringPassword() {
+    public void e2eHelpCanBeOpenedWhileEnteringPassword() {
         new LoginFlow()
                 .chooseContinueWithWpCom()
                 .enterEmailAddress(E2E_WP_COM_USER_EMAIL)

WordPress/src/androidTest/java/org/wordpress/android/e2e/EditorTests.java

@@ -56,7 +56,7 @@ public void setUp() {
     // For more info see Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/14389
     @Ignore("Classic Editor being deprecated for new posts, test should be adjusted to editing existing classic post")
     @Test
-    public void testPublishSimplePost() {
+    public void e2ePublishSimplePostClassic() {
         String title = "Hello Espresso!";
         String content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
 
@@ -70,7 +70,7 @@ public void testPublishSimplePost() {
     // For more info see Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/14389
     @Ignore("Classic Editor being deprecated for new posts, test should be adjusted to editing existing classic post")
     @Test
-    public void testPublishFullPost() {
+    public void e2ePublishFullPostClassic() {
         String title = "Hello Espresso!";
         String content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
                          + "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud "

WordPress/src/androidTest/java/org/wordpress/android/e2e/LoginTests.java

@@ -2,7 +2,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.wordpress.android.e2e.flows.LoginFlow;
 import org.wordpress.android.support.BaseTest;
@@ -24,36 +23,33 @@ public void setUp() {
         logoutIfNecessary();
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
-    public void loginWithEmailPassword() {
+    public void e2eLoginWithEmailPassword() {
         new LoginFlow().chooseContinueWithWpCom()
                        .enterEmailAddress(E2E_WP_COM_USER_EMAIL)
                        .enterPassword(E2E_WP_COM_USER_PASSWORD)
                        .confirmLogin(false);
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
-    public void loginWithPasswordlessAccount() {
+    public void e2eLoginWithPasswordlessAccount() {
         new LoginFlow().chooseContinueWithWpCom()
                        .enterEmailAddress(E2E_WP_COM_PASSWORDLESS_USER_EMAIL)
                        .openMagicLink()
                        .confirmLogin(false);
     }
 
     @Test
-    public void loginWithSiteAddress() {
+    public void e2eLoginWithSiteAddress() {
         new LoginFlow().chooseEnterYourSiteAddress()
                        .enterSiteAddress(E2E_WP_COM_USER_SITE_ADDRESS)
                        .enterEmailAddress(E2E_WP_COM_USER_EMAIL)
                        .enterPassword(E2E_WP_COM_USER_PASSWORD)
                        .confirmLogin(false);
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
-    public void loginWithMagicLink() {
+    public void e2eLoginWithMagicLink() {
         new LoginFlow().chooseContinueWithWpCom()
                        .enterEmailAddress(E2E_WP_COM_USER_EMAIL)
                        .chooseMagicLink()
@@ -62,7 +58,7 @@ public void loginWithMagicLink() {
     }
 
     @Test
-    public void loginWithSelfHostedAccount() {
+    public void e2eLoginWithSelfHostedAccount() {
         new LoginFlow().chooseEnterYourSiteAddress()
                        .enterSiteAddress(E2E_SELF_HOSTED_USER_SITE_ADDRESS)
                        .enterUsernameAndPassword(E2E_SELF_HOSTED_USER_USERNAME, E2E_SELF_HOSTED_USER_PASSWORD)

WordPress/src/androidTest/java/org/wordpress/android/e2e/ReaderTests.java

@@ -6,6 +6,7 @@
 
 import org.junit.Before;
 import org.junit.Rule;
+import org.junit.Test;
 import org.wordpress.android.e2e.pages.ReaderPage;
 import org.wordpress.android.support.BaseTest;
 
@@ -26,8 +27,8 @@ public void setUp() {
     String mCoachingPostTitle = "Let's check out the coaching team!";
     String mCompetitionPostTitle = "Let's focus on the competition.";
 
-//    @Test
-    public void navigateThroughPosts() {
+    @Test
+    public void e2eNavigateThroughPosts() {
         new ReaderPage()
                 .tapFollowingTab()
                 .openPost(mCoachingPostTitle)
@@ -39,8 +40,8 @@ public void navigateThroughPosts() {
                 .goBackToReader();
     }
 
-//    @Test
-    public void likePost() {
+    @Test
+    public void e2eLikePost() {
         new ReaderPage()
                 .tapFollowingTab()
                 .openPost(mCoachingPostTitle)

WordPress/src/androidTest/java/org/wordpress/android/e2e/SignUpTests.java

@@ -26,7 +26,7 @@ public void tearDown() {
     }
 
     @Test
-    public void signUpWithMagicLink() {
+    public void e2eSignUpWithMagicLink() {
         new SignupFlow().chooseContinueWithWpCom()
                         .enterEmail(E2E_SIGNUP_EMAIL)
                         .openMagicLink()

WordPress/src/androidTest/java/org/wordpress/android/e2e/StatsTests.java

@@ -38,7 +38,7 @@ public void tearDown() {
     }
 
     @Test
-    public void allDayStatsLoad() {
+    public void e2eAllDayStatsLoad() {
         StatsVisitsData todayVisits = new StatsVisitsData("97", "28", "14", "11");
         List<StatsKeyValueData> postsList = new StatsMocksReader().readDayTopPostsToList();
         List<StatsKeyValueData> referrersList = new StatsMocksReader().readDayTopReferrersToList();