-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11371 from wordpress-mobile/merge/14.3-code-freez…
…e-to-master Merge 14.3 code freeze into master
- Loading branch information
Showing
153 changed files
with
4,828 additions
and
1,737 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 62 additions & 62 deletions
124
WordPress/src/androidTest/java/org/wordpress/android/e2e/LoginTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,63 @@ | ||
| package org.wordpress.android.e2e; | ||
|
|
||
| import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
| import androidx.test.rule.ActivityTestRule; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.wordpress.android.e2e.flows.LoginFlow; | ||
| import org.wordpress.android.support.BaseTest; | ||
| import org.wordpress.android.ui.accounts.LoginMagicLinkInterceptActivity; | ||
|
|
||
| import static org.wordpress.android.BuildConfig.E2E_SELF_HOSTED_USER_PASSWORD; | ||
| import static org.wordpress.android.BuildConfig.E2E_SELF_HOSTED_USER_SITE_ADDRESS; | ||
| import static org.wordpress.android.BuildConfig.E2E_SELF_HOSTED_USER_USERNAME; | ||
| import static org.wordpress.android.BuildConfig.E2E_WP_COM_USER_PASSWORD; | ||
| import static org.wordpress.android.BuildConfig.E2E_WP_COM_USER_SITE_ADDRESS; | ||
| import static org.wordpress.android.BuildConfig.E2E_WP_COM_USER_USERNAME; | ||
|
|
||
| @RunWith(AndroidJUnit4.class) | ||
| public class LoginTests extends BaseTest { | ||
| @Rule | ||
| public ActivityTestRule<LoginMagicLinkInterceptActivity> mMagicLinkActivityTestRule = | ||
| new ActivityTestRule<>(LoginMagicLinkInterceptActivity.class); | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| logoutIfNecessary(); | ||
| } | ||
|
|
||
| @Test | ||
| public void loginWithEmailPassword() { | ||
| wpLogin(); | ||
| } | ||
|
|
||
| @Test | ||
| public void loginWithSiteAddress() { | ||
| new LoginFlow().loginSiteAddress( | ||
| E2E_WP_COM_USER_SITE_ADDRESS, | ||
| E2E_WP_COM_USER_USERNAME, | ||
| E2E_WP_COM_USER_PASSWORD); | ||
| } | ||
|
|
||
| @Test | ||
| public void loginWithMagicLink() { | ||
| new LoginFlow().loginMagicLink(mMagicLinkActivityTestRule); | ||
| } | ||
|
|
||
| @Test | ||
| public void loginWithSelfHostedAccount() { | ||
| new LoginFlow().loginSiteAddress( | ||
| E2E_SELF_HOSTED_USER_SITE_ADDRESS, | ||
| E2E_SELF_HOSTED_USER_USERNAME, | ||
| E2E_SELF_HOSTED_USER_PASSWORD); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| logoutIfNecessary(); | ||
| } | ||
| } | ||
| // Disabled temporarily | ||
| //import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
| //import androidx.test.rule.ActivityTestRule; | ||
| // | ||
| //import org.junit.After; | ||
| //import org.junit.Before; | ||
| //import org.junit.Rule; | ||
| //import org.junit.Test; | ||
| //import org.junit.runner.RunWith; | ||
| //import org.wordpress.android.e2e.flows.LoginFlow; | ||
| //import org.wordpress.android.support.BaseTest; | ||
| //import org.wordpress.android.ui.accounts.LoginMagicLinkInterceptActivity; | ||
| // | ||
| //import static org.wordpress.android.BuildConfig.E2E_SELF_HOSTED_USER_PASSWORD; | ||
| //import static org.wordpress.android.BuildConfig.E2E_SELF_HOSTED_USER_SITE_ADDRESS; | ||
| //import static org.wordpress.android.BuildConfig.E2E_SELF_HOSTED_USER_USERNAME; | ||
| //import static org.wordpress.android.BuildConfig.E2E_WP_COM_USER_PASSWORD; | ||
| //import static org.wordpress.android.BuildConfig.E2E_WP_COM_USER_SITE_ADDRESS; | ||
| //import static org.wordpress.android.BuildConfig.E2E_WP_COM_USER_USERNAME; | ||
| // | ||
| //@RunWith(AndroidJUnit4.class) | ||
| //public class LoginTests extends BaseTest { | ||
| // @Rule | ||
| // public ActivityTestRule<LoginMagicLinkInterceptActivity> mMagicLinkActivityTestRule = | ||
| // new ActivityTestRule<>(LoginMagicLinkInterceptActivity.class); | ||
| // | ||
| // @Before | ||
| // public void setUp() { | ||
| // logoutIfNecessary(); | ||
| // } | ||
| // | ||
| // @Test | ||
| // public void loginWithEmailPassword() { | ||
| // wpLogin(); | ||
| // } | ||
| // | ||
| // @Test | ||
| // public void loginWithSiteAddress() { | ||
| // new LoginFlow().loginSiteAddress( | ||
| // E2E_WP_COM_USER_SITE_ADDRESS, | ||
| // E2E_WP_COM_USER_USERNAME, | ||
| // E2E_WP_COM_USER_PASSWORD); | ||
| // } | ||
| // | ||
| // @Test | ||
| // public void loginWithMagicLink() { | ||
| // new LoginFlow().loginMagicLink(mMagicLinkActivityTestRule); | ||
| // } | ||
| // | ||
| // @Test | ||
| // public void loginWithSelfHostedAccount() { | ||
| // new LoginFlow().loginSiteAddress( | ||
| // E2E_SELF_HOSTED_USER_SITE_ADDRESS, | ||
| // E2E_SELF_HOSTED_USER_USERNAME, | ||
| // E2E_SELF_HOSTED_USER_PASSWORD); | ||
| // } | ||
| // | ||
| // @After | ||
| // public void tearDown() { | ||
| // logoutIfNecessary(); | ||
| // } | ||
| //} |
75 changes: 38 additions & 37 deletions
75
WordPress/src/androidTest/java/org/wordpress/android/e2e/SignUpTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,40 @@ | ||
| package org.wordpress.android.e2e; | ||
|
|
||
| import androidx.test.rule.ActivityTestRule; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.wordpress.android.e2e.flows.SignupFlow; | ||
| import org.wordpress.android.support.BaseTest; | ||
| import org.wordpress.android.ui.accounts.LoginMagicLinkInterceptActivity; | ||
|
|
||
| import static org.wordpress.android.BuildConfig.E2E_SIGNUP_DISPLAY_NAME; | ||
| import static org.wordpress.android.BuildConfig.E2E_SIGNUP_EMAIL; | ||
| import static org.wordpress.android.BuildConfig.E2E_SIGNUP_PASSWORD; | ||
| import static org.wordpress.android.BuildConfig.E2E_SIGNUP_USERNAME; | ||
|
|
||
| public class SignUpTests extends BaseTest { | ||
| @Rule | ||
| public ActivityTestRule<LoginMagicLinkInterceptActivity> mMagicLinkActivityTestRule = | ||
| new ActivityTestRule<>(LoginMagicLinkInterceptActivity.class); | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| logoutIfNecessary(); | ||
| } | ||
|
|
||
| @Test | ||
| public void signUpWithEmail() { | ||
| SignupFlow signupFlow = new SignupFlow(); | ||
| signupFlow.chooseSignupWithEmail(); | ||
| signupFlow.enterEmail(E2E_SIGNUP_EMAIL, mMagicLinkActivityTestRule); | ||
| signupFlow.checkEpilogue( | ||
| E2E_SIGNUP_DISPLAY_NAME, | ||
| E2E_SIGNUP_USERNAME); | ||
| signupFlow.enterPassword(E2E_SIGNUP_PASSWORD); | ||
| signupFlow.dismissInterstitial(); | ||
| signupFlow.confirmSignup(); | ||
| } | ||
| } | ||
| // Disabled temporarily | ||
| //import androidx.test.rule.ActivityTestRule; | ||
| // | ||
| //import org.junit.Before; | ||
| //import org.junit.Rule; | ||
| //import org.junit.Test; | ||
| //import org.wordpress.android.e2e.flows.SignupFlow; | ||
| //import org.wordpress.android.support.BaseTest; | ||
| //import org.wordpress.android.ui.accounts.LoginMagicLinkInterceptActivity; | ||
| // | ||
| //import static org.wordpress.android.BuildConfig.E2E_SIGNUP_DISPLAY_NAME; | ||
| //import static org.wordpress.android.BuildConfig.E2E_SIGNUP_EMAIL; | ||
| //import static org.wordpress.android.BuildConfig.E2E_SIGNUP_PASSWORD; | ||
| //import static org.wordpress.android.BuildConfig.E2E_SIGNUP_USERNAME; | ||
| // | ||
| //public class SignUpTests extends BaseTest { | ||
| // @Rule | ||
| // public ActivityTestRule<LoginMagicLinkInterceptActivity> mMagicLinkActivityTestRule = | ||
| // new ActivityTestRule<>(LoginMagicLinkInterceptActivity.class); | ||
| // | ||
| // @Before | ||
| // public void setUp() { | ||
| // logoutIfNecessary(); | ||
| // } | ||
| // | ||
| // @Test | ||
| // public void signUpWithEmail() { | ||
| // SignupFlow signupFlow = new SignupFlow(); | ||
| // signupFlow.chooseSignupWithEmail(); | ||
| // signupFlow.enterEmail(E2E_SIGNUP_EMAIL, mMagicLinkActivityTestRule); | ||
| // signupFlow.checkEpilogue( | ||
| // E2E_SIGNUP_DISPLAY_NAME, | ||
| // E2E_SIGNUP_USERNAME); | ||
| // signupFlow.enterPassword(E2E_SIGNUP_PASSWORD); | ||
| // signupFlow.dismissInterstitial(); | ||
| // signupFlow.confirmSignup(); | ||
| // } | ||
| //} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.