Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 14.7-rc-2 to master #11733

Merged
merged 1,021 commits into from
Apr 23, 2020
Merged
Changes from 4 commits
Commits
Show all changes
1021 commits
Select commit Hold shift + click to select a range
5fe31c3
Cookie check in reader post list.
khaykov Apr 6, 2020
a58aae0
Private AT photon support in featured image helper.
khaykov Apr 6, 2020
12d02d2
Cookie support at webview activity.
khaykov Apr 6, 2020
21c02af
Semi-blocking cookie check on app start.
khaykov Apr 6, 2020
20eaedd
Minor cleanup.
khaykov Apr 6, 2020
4fcea3d
Updated flux-c reference.
khaykov Apr 6, 2020
6fac659
Merge branch 'feature/support-private-at-sites' of https://github.com…
khaykov Apr 6, 2020
8c7ddf6
Temporary progress dialog.
khaykov Apr 6, 2020
37e8c87
Added missing temp progress dialog.
khaykov Apr 6, 2020
a9e1d18
Merge branch 'feature/support-private-at-sites' of https://github.com…
khaykov Apr 6, 2020
99c619d
Revert "Gutenberg/integrate release 1.25.0 with dark mode (#11580)"
hypest Apr 6, 2020
7b5ef00
Merge branch 'gutenberg/integrate_release_1.25.0-with-dark-mode' into…
hypest Apr 6, 2020
1e8b26a
Point to gutenberg-mobile release
hypest Apr 6, 2020
db3253f
Merge branch 'develop' into issue/9854-site-creation-loading
malinajirka Apr 6, 2020
1eebd97
Update site creation loading screen for dark mode
malinajirka Apr 6, 2020
6ff531f
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
khaykov Apr 6, 2020
88995b4
Merge branch 'feature/support-multiple-auth-headers-in-gb' of https:/…
khaykov Apr 6, 2020
f96b19a
Adding dedicated dimension for menu width.
develric Apr 7, 2020
d4769cb
Adding USER icon management in ImagePlaceholderManager.
develric Apr 7, 2020
3366193
Adding me with gravatar menu item.
develric Apr 7, 2020
770152c
Using MeGravatarLoader in MeFragment and MySiteFragment.
develric Apr 7, 2020
06f49e1
Added Tenor library and API key reference
ThomazFB Mar 21, 2020
be9e118
Changed giphy package name to gifs
ThomazFB Mar 22, 2020
47ac89a
Created TenorProvider infrastructure and basic search
ThomazFB Mar 22, 2020
99751e6
Added GifProvider and TenorProvider documentation
ThomazFB Mar 23, 2020
d393dca
GifProvider is now available through injection with Dagger and provid…
ThomazFB Mar 23, 2020
c401c4c
Replaced Giphy name to Gif from all packages and classes
ThomazFB Mar 23, 2020
6554d88
Connected the TenorProvider implementation to the expected GifMediaVi…
ThomazFB Mar 23, 2020
e376715
Improved test suite for TenorProvider with code refactor and more tes…
ThomazFB Mar 23, 2020
b2d093f
Improved code reuse, naming and deprecated assertion methods
ThomazFB Mar 23, 2020
2e06912
Gif data class removed, using the MutableGifMediaViewModel instead. A…
ThomazFB Mar 24, 2020
bddff06
Fixed GiphyPickerActivity reference on AndroidManifest
ThomazFB Mar 24, 2020
a75cd47
Integrated pagination into the Tenor requests
ThomazFB Mar 24, 2020
91a00b2
Reverted Giphy renaming
ThomazFB Mar 24, 2020
7e384e3
Reverted Giphy renaming for packages
ThomazFB Mar 24, 2020
5b1f835
Additional code refactoring and new test for TenorProvider
ThomazFB Mar 24, 2020
0d23a81
Reconnected GIF search with MediaBrowserActivity
ThomazFB Mar 24, 2020
aca0ca2
Initial load changed to 42
ThomazFB Mar 24, 2020
2e46c33
Improved documentation for GifProvider
ThomazFB Mar 25, 2020
14da4b2
Added code refactoring for parameter organization
ThomazFB Mar 25, 2020
d338de2
Removed unwanted Tenor text reference
ThomazFB Mar 25, 2020
f664593
Added code refactoring for TenorProvider
ThomazFB Mar 25, 2020
3289614
Improved documentation over TenorProvider methods
ThomazFB Mar 25, 2020
f267c9a
Added resilience to the initial load fetching
ThomazFB Mar 25, 2020
40f781c
Changed constant to better fit code convention
ThomazFB Mar 25, 2020
64733fc
Changed TenorProviderTestUtils to TenorProviderTestFixtures, also ref…
ThomazFB Mar 25, 2020
6561720
Changed test assertion to use assertThat pattern and improve test rea…
ThomazFB Mar 25, 2020
a69afcc
Moved Tenor API initialization to the outside of TenorProvider
ThomazFB Mar 25, 2020
45e70dd
Extracted magic numbers to constants
ThomazFB Mar 25, 2020
ec760a1
Reconnected EditPostActivity with GIF Picker
ThomazFB Mar 26, 2020
18f0c2e
Added tests for GIF Picker DataSource
ThomazFB Mar 26, 2020
f0f2006
Added thread safety and timeout handling to TenorProvider
ThomazFB Mar 27, 2020
6dbeea0
Restored Analytics tracking
ThomazFB Mar 27, 2020
ffe47e4
Added Tenor attribution icon, removed the Giphy one
ThomazFB Mar 27, 2020
e4c91bb
Fixed Picker ViewModel tests
ThomazFB Mar 27, 2020
c673a53
Formatted tenor image
ThomazFB Mar 27, 2020
e3efa24
Refactored TenorProviderTest boilerplate
ThomazFB Mar 27, 2020
1a62bb1
Removed unnecessary methods for response and error handling
ThomazFB Mar 27, 2020
a854c91
Replaced Tenor callback implementation to the default retrofit one
ThomazFB Mar 27, 2020
4efed5f
Removed custom timeout exception implementation
ThomazFB Mar 27, 2020
ec38306
Removed coroutine scope injection
ThomazFB Mar 27, 2020
bbf6419
Remove unecessary annotation
ThomazFB Mar 31, 2020
40a5873
Renamed all giphy name references inside viewmodel package to only gif
ThomazFB Mar 29, 2020
3a41fcb
Renamed all giphy name references inside ui package to only gif
ThomazFB Mar 29, 2020
b5b0af6
Replaced all Giphy string references to Tenor
ThomazFB Mar 29, 2020
0ed1483
Adjusted all remaining documentation and code referencing Giphy
ThomazFB Mar 29, 2020
af0aaa7
Adjust GifMediaViewModel documentation
ThomazFB Apr 1, 2020
35f8d0a
Removed maven reference for giphy SDK
ThomazFB Apr 1, 2020
93fe31c
Removed translations of gif strings
ThomazFB Apr 1, 2020
a27b47a
Added local tenor feature flag through BuildConfig
ThomazFB Apr 2, 2020
dfc607f
Added Tenor selection availability through BuildConfig inside EditPos…
ThomazFB Apr 2, 2020
4a0cc13
Added Tenor selection availability through BuildConfig inside MediaBr…
ThomazFB Apr 2, 2020
d512243
Added the Tenor availability to the alpha build
ThomazFB Apr 2, 2020
41cdfaf
Added Tenor library license attribution
ThomazFB Apr 3, 2020
f3bf4e3
Fixed checkstyle errors
ThomazFB Apr 4, 2020
2ad832a
Replaced UI string usage for Exception for internal constant string
ThomazFB Apr 4, 2020
ceac897
Removed UI string usage from the exception for empty search result in…
ThomazFB Apr 4, 2020
0c09c88
Revert TenorProvider string usage with lint unused suppression
ThomazFB Apr 7, 2020
bfdf6bf
Minor code cleanup
malinajirka Apr 7, 2020
3897842
Fix lint
malinajirka Apr 7, 2020
09c867f
Merge pull request #11598 from wordpress-mobile/issue/10511-gravatar-…
planarvoid Apr 7, 2020
13e88ec
Changed the unused resources suppression declaration
ThomazFB Apr 7, 2020
544ec40
comment out the override method shouldOverrideUrlLoading()
Apr 7, 2020
a2183e8
Merge pull request #11595 from wordpress-mobile/merge/14.6-code-freez…
loremattei Apr 7, 2020
14132e7
Show only desired actions in Gutenberg PhotoPicker
malinajirka Apr 7, 2020
f6b8bac
Enable take video action in the photo picker
malinajirka Apr 7, 2020
3ad672e
Mark some string references untranslatable
maxme Apr 7, 2020
f88aa9f
Enable choose video from the device using OS default picker
malinajirka Apr 7, 2020
f16b6cb
Merge pull request #11581 from wordpress-mobile/issue-11576/error_inf…
ashiagr Apr 8, 2020
ff51082
Add dark mode version of site creation loading illustration
malinajirka Apr 8, 2020
02d9838
Minor cleanup
malinajirka Apr 8, 2020
5b75c2b
Extract weekdays to the main strings.xml file
maxme Apr 8, 2020
b5df649
Removing image contentDescription to avoid unneeded double announce w…
develric Apr 8, 2020
774a444
Using TooltipCompat to allow for long press tooltip on me menu
develric Apr 8, 2020
5475f50
Improve how constructGravatarUrl is used.
develric Apr 8, 2020
2bb7690
Enable multiselect in the OS default media picker
malinajirka Apr 8, 2020
ea97163
Using LinearLayout to fix RTL support.
develric Apr 8, 2020
c9f7e77
Merge branch 'develop' into issue/11518-media-picker-actions
malinajirka Apr 8, 2020
6684b17
Merge branch 'develop' into master-custom-image-picker-in-gutenberg
malinajirka Apr 8, 2020
2dca3a8
Merge branch 'master-custom-image-picker-in-gutenberg' into issue/115…
malinajirka Apr 8, 2020
87a0012
Fix typo
malinajirka Apr 8, 2020
55ef57a
Remove unused imports
malinajirka Apr 8, 2020
dbec0ed
As the URL https://en.support.wordpress.com/settings/discussion-setti…
Apr 8, 2020
166e866
Merge pull request #11600 from gibtang/issue11529
aerych Apr 8, 2020
80cc5c3
Merge pull request #11587 from ThomazFB/issue/11456-add-tenor-support
planarvoid Apr 8, 2020
35d64a9
Remove leak canary
planarvoid Apr 8, 2020
c5184cc
Making me menu width 64dp.
develric Apr 8, 2020
1eaabdb
Updating Release Notes.
develric Apr 8, 2020
d91beb3
Update fluxc to enable authenticated rest api request to self-hosted
mchowning Mar 23, 2020
0c0f9ff
Merge branch 'develop' into issue/11599-me-gravatar-menu-accessibility
develric Apr 8, 2020
2f2518f
Merge pull request #11601 from wordpress-mobile/issue/mark-some-strin…
khaykov Apr 8, 2020
99cc1d9
Merge pull request #11618 from wordpress-mobile/fix/remove_leak_canary
oguzkocer Apr 8, 2020
e8798de
Updates .configure to latest hash
oguzkocer Apr 8, 2020
f15e239
Merge pull request #11609 from wordpress-mobile/issue/make-sitesettin…
khaykov Apr 8, 2020
32efd51
Updated GB reference.
khaykov Apr 8, 2020
5964410
Merge branch 'feature/support-multiple-auth-headers-in-gb' of https:/…
khaykov Apr 8, 2020
b2f2f1c
Merge branch 'develop' into gutenberg/authenticated_rest_api_requests
maxme Apr 9, 2020
272fe2b
Merge pull request #11622 from wordpress-mobile/merge/14.6-release-no…
loremattei Apr 9, 2020
a4a7c45
Remove unnecessary pageActionsEnabled for upload as we use an overlay
malinajirka Apr 9, 2020
42b0918
Merge pull request #11591 from wordpress-mobile/replay-dark-mode-commits
marecar3 Apr 9, 2020
835e960
Merge branch 'develop' into issue/11599-me-gravatar-menu-accessibility
develric Apr 9, 2020
0478510
Remove legacy tests and unused code
malinajirka Apr 9, 2020
55cf123
Remove legacy tests and unused code
malinajirka Apr 9, 2020
5ab3139
Fixing import issue after merge from develop.
develric Apr 9, 2020
5d45781
Run configure-apply to update .configure
oguzkocer Apr 9, 2020
c9c8c9f
Merge pull request #11522 from wordpress-mobile/gutenberg/authenticat…
mchowning Apr 9, 2020
c27e85e
Merge pull request #11556 from wordpress-mobile/feature/support-multi…
mchowning Apr 9, 2020
3ad380e
Merge pull request #11624 from wordpress-mobile/issue/update-secrets-…
loremattei Apr 9, 2020
b09333d
Update ruby version
loremattei Apr 9, 2020
fad3ee8
Update Fastlane
loremattei Apr 9, 2020
7625a5c
Updated reader table to include atomic flag.
khaykov Apr 10, 2020
6c9e2e2
Updated flux-c reference.
khaykov Apr 10, 2020
121d429
Loading cookie in wpwebactivity.
khaykov Apr 10, 2020
e85e644
Added cookie check to reader post details.
khaykov Apr 10, 2020
4839fe9
Removed unused cookie references.
khaykov Apr 10, 2020
967f768
Merge pull request #11628 from wordpress-mobile/issue/11620-already-r…
jd-alexander Apr 10, 2020
02402d2
changed auto upload text from cancel to cancel upload.
jd-alexander Apr 10, 2020
1041766
made upload text lower caps.
jd-alexander Apr 10, 2020
b9ee422
Replace the dash with comma
hypest Apr 10, 2020
fdbdb16
Merge pull request #11578 from wordpress-mobile/issue/9854-site-creat…
malinajirka Apr 10, 2020
bed82d4
Merge pull request #11639 from wordpress-mobile/issue/11638-dash-is-n…
maxme Apr 10, 2020
92b5ae5
Add mobile Gutenberg localization to code freeze
loremattei Apr 10, 2020
dabcdeb
Fixed ktlint issue.
jd-alexander Apr 10, 2020
33e7ec2
Updated progress dialog with utility methods.
khaykov Apr 10, 2020
33851fa
Switched to using progress dialog when retrieving cookie.
khaykov Apr 10, 2020
b9d7d30
Updated cookie safe-check logic.
khaykov Apr 10, 2020
741113d
Cleaning up unused imports.
khaykov Apr 10, 2020
c603628
Fixed build error, removed some unused code. Clearing cookie when sig…
khaykov Apr 10, 2020
61c2681
Updated pages test.
khaykov Apr 10, 2020
d629fa6
Reflected recent changes in flux-c counterpart naming.
khaykov Apr 13, 2020
f248a51
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
khaykov Apr 13, 2020
447f949
Merge pull request #11636 from wordpress-mobile/issue-11515/post_page…
ashiagr Apr 13, 2020
0de78bc
Added couple of additional utility methods to progress dialog.
khaykov Apr 13, 2020
7f6c357
Updated strings
khaykov Apr 13, 2020
18748ff
Updated dialog logic in wpwebview activity.
khaykov Apr 13, 2020
75de27b
Updated progress dialog login in editor.
khaykov Apr 13, 2020
2116a70
Updated progress logic in reader post details.
khaykov Apr 13, 2020
b9d91e9
Fixed lint issues.
khaykov Apr 13, 2020
457bf31
Added logging/messaging when cookie loading fails.
khaykov Apr 13, 2020
8263ada
Minor refactoring/comments.
khaykov Apr 13, 2020
b09e1fd
Updated strings.
khaykov Apr 13, 2020
2936364
Fixed checkstyle issue.
khaykov Apr 13, 2020
0cccf8e
Point gutenberg hash to release/1.26.0
pinarol Apr 13, 2020
190c092
Update release notes
pinarol Apr 13, 2020
d175d87
Update release notes
pinarol Apr 13, 2020
2b0df79
Update main strings.xml file
pinarol Apr 13, 2020
915a3d9
Update gutenberg hash
pinarol Apr 13, 2020
8224c2c
Fixed styling.
khaykov Apr 13, 2020
88807ee
Change parent style of NoDisplay activity to WordPress.NoActionBar
khaykov Apr 8, 2020
e7bd605
Fixed share intent receiver in dark mode.
khaykov Apr 14, 2020
2833f29
Removed unused styles.
khaykov Apr 14, 2020
2463a61
Merge pull request #11655 from wordpress-mobile/issue/11635-fix-shari…
malinajirka Apr 14, 2020
2022664
Merge branch 'develop' into issue/11599-me-gravatar-menu-accessibility
develric Apr 14, 2020
ed6b137
Hide "take photo" on media custom picker in gutenberg
malinajirka Apr 14, 2020
6bc984a
Make git push not dependet on local config
loremattei Apr 14, 2020
45be4af
Merge pull request #11611 from wordpress-mobile/issue/11518-media-pic…
ashiagr Apr 14, 2020
6cbaf97
Merge branch 'develop' into master-custom-image-picker-in-gutenberg
malinajirka Apr 14, 2020
c19e590
Update release notes
malinajirka Apr 14, 2020
37b7ec7
Switch styles of the login and signup buttons
planarvoid Apr 14, 2020
d34d7e4
Merge pull request #11642 from wordpress-mobile/issue/add-gutenberg-l…
maxme Apr 14, 2020
228cf25
Added reader post table migration.
khaykov Apr 14, 2020
e2a2489
Merge pull request #11613 from wordpress-mobile/issue/11599-me-gravat…
khaykov Apr 14, 2020
ac61bcc
Renamed posts's isAtomic to isPrivateAtomic which is only true for pr…
khaykov Apr 14, 2020
796b8fd
Merge branch 'develop' into master-custom-image-picker-in-gutenberg
malinajirka Apr 15, 2020
aba5f5a
Re-enable and refactor login tests that don't use magic links
rachelmcr Apr 15, 2020
90f0918
Fix linting
rachelmcr Apr 15, 2020
c923571
Merge pull request #11660 from wordpress-mobile/feature/make-signup-p…
develric Apr 15, 2020
2a0a8cb
Merge pull request #11654 from wordpress-mobile/issue/11652-fix-reade…
0nko Apr 15, 2020
252fbe0
Update mocks for screenshot test
rachelmcr Apr 15, 2020
ad6611b
Merge branch 'develop' into gutenberg/integrate_release_1.26.0
pinarol Apr 15, 2020
395d22d
Update gutenberg hash
pinarol Apr 15, 2020
8f0e676
Merge pull request #11666 from wordpress-mobile/try/enable-login-sign…
oguzkocer Apr 15, 2020
92a302f
Update media insertion to send caption information.
SergioEstevao Apr 15, 2020
97ddf67
Merge branch 'develop' into master-custom-image-picker-in-gutenberg
malinajirka Apr 15, 2020
36a05e9
Merge pull request #11658 from wordpress-mobile/master-custom-image-p…
malinajirka Apr 15, 2020
e84a8cb
Merge pull request #11669 from wordpress-mobile/fix/wpscreenshot-test…
oguzkocer Apr 15, 2020
f3cc975
Re-enable magic link login test
rachelmcr Apr 15, 2020
57aa05c
Re-enable refactored signup test
rachelmcr Apr 15, 2020
821b02a
Run tests with animations disabled
rachelmcr Apr 15, 2020
2c89b86
Updated flux-c tag.
khaykov Apr 15, 2020
291f780
Added null check for fragmentManager in PrivateAtCookieRefreshProgres…
khaykov Apr 15, 2020
5157609
Fixed preview.
khaykov Apr 15, 2020
eccdc8a
Merge pull request #11668 from wordpress-mobile/merge/14.6-rc-2-to-de…
loremattei Apr 16, 2020
37999f1
Update release-toolkit
loremattei Apr 16, 2020
0d433f5
Merge pull request #11630 from wordpress-mobile/issue/update-fastlane…
loremattei Apr 16, 2020
acc8048
Point gutenberg ref to v1.26.0
pinarol Apr 16, 2020
33b3f58
Merge branch 'develop' into gutenberg/integrate_release_1.26.0
pinarol Apr 16, 2020
03da46e
Merge pull request #11647 from wordpress-mobile/gutenberg/integrate_r…
pinarol Apr 16, 2020
8715afb
Fallback to featured image url in case thumbnail url is empty.
develric Apr 16, 2020
71ff103
Merge pull request #11671 from wordpress-mobile/try/enable-magic-link…
oguzkocer Apr 16, 2020
1efd36c
Fixed editor image preview logic - using media proxy for private at s…
khaykov Apr 16, 2020
480ae4e
Fixed issue where cookie might not be added to WebView cookie jar whe…
khaykov Apr 16, 2020
edd53f1
Make sure url utils recognizes atomic image proxy as valid image url.
khaykov Apr 16, 2020
a6cd8aa
Updated log tags and fixed a typo.
khaykov Apr 16, 2020
e38d5b5
removed unused import
khaykov Apr 16, 2020
a3988b1
Merge pull request #11590 from wordpress-mobile/feature/support-priva…
develric Apr 16, 2020
ca7d52d
Adding unit testing.
develric Apr 16, 2020
b39a6fb
Removing unnecessary stubbing.
develric Apr 16, 2020
d96ed07
Merge pull request #11683 from wordpress-mobile/issue/11675-featured-…
malinajirka Apr 17, 2020
3cb8fe5
Fixing unit testing conflict not detected by github during merge.
develric Apr 17, 2020
d534adf
Merge pull request #11689 from wordpress-mobile/issue/11683-pr-fix-un…
malinajirka Apr 17, 2020
8534443
Set MySiteFragment title to be "My site", instead of using site title
frosty Apr 17, 2020
9efe89e
Updated release notes
frosty Apr 17, 2020
50a69ce
Remove unused `updateTitle()` method
frosty Apr 17, 2020
3888e64
Removed unused string from resources
frosty Apr 17, 2020
fe66baa
Merge pull request #11691 from wordpress-mobile/feature/my-site-title
planarvoid Apr 17, 2020
19458d3
Wrap suggestion insertion in a single transaction for the sake of speed.
mchowning Apr 20, 2020
ab6ded9
Merge branch 'develop' into issue/insert_captions_for_media_library
SergioEstevao Apr 20, 2020
a458f0b
Fix lint error.
SergioEstevao Apr 20, 2020
1d6c7cf
Merge pull request #11670 from wordpress-mobile/issue/insert_captions…
maxme Apr 20, 2020
4a6964e
Merge remote-tracking branch 'origin/develop' into merge/14.6-final-t…
oguzkocer Apr 20, 2020
4acc67c
Merge pull request #11703 from wordpress-mobile/merge/14.6-final-to-d…
shiki Apr 20, 2020
ee116f1
Merge pull request #11702 from wordpress-mobile/speed_up_suggestion_i…
oguzkocer Apr 20, 2020
ce4d16f
Bump version number
oguzkocer Apr 20, 2020
c9bcf31
Update release notes.
oguzkocer Apr 20, 2020
c993d10
Revert "Update media insertion to send caption information."
cameronvoell Apr 20, 2020
54592b0
Merge pull request #11706 from wordpress-mobile/revert-11670-issue/in…
mchowning Apr 21, 2020
9447d22
Update FluxC version to 1.6.10
oguzkocer Apr 21, 2020
e533f6f
Add translatable=false flag to app_theme_entries array
renanferrari Apr 22, 2020
f4effcf
Bump version number
oguzkocer Apr 22, 2020
bc5ea31
Remove unnecessary translations for app_theme_entries array
renanferrari Apr 22, 2020
97ba825
Merge pull request #11725 from wordpress-mobile/issue/11724-app-setti…
oguzkocer Apr 22, 2020
aba96b7
Added a new icon for unknown file type.
khaykov Apr 22, 2020
f869b8e
Merge remote-tracking branch 'origin/release/14.7' into merge/14.6.1-…
oguzkocer Apr 22, 2020
71e162e
Merge pull request #11729 from wordpress-mobile/issue/11617-add-place…
oguzkocer Apr 22, 2020
ec48654
Merge pull request #11731 from wordpress-mobile/merge/14.6.1-to-relea…
oguzkocer Apr 22, 2020
e615dfd
Bump version number
oguzkocer Apr 22, 2020
f8ccf25
Bump alpha version to 855
oguzkocer Apr 22, 2020
6bf77d9
Fix alpha and beta version numbers
oguzkocer Apr 22, 2020
c34aa33
Merge remote-tracking branch 'origin/master' into merge/14.7-rc-2-to-…
oguzkocer Apr 22, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions WordPress/build.gradle
Original file line number Diff line number Diff line change
@@ -118,6 +118,7 @@ android {
}

testOptions {
animationsDisabled = true
unitTests {
includeAndroidResources = true
returnDefaultValues = true
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package org.wordpress.android.e2e;
import androidx.test.ext.junit.runners.AndroidJUnit4;
//import androidx.test.rule.ActivityTestRule;
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.junit.Rule;
//import org.wordpress.android.ui.accounts.LoginMagicLinkInterceptActivity;
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;
@@ -20,9 +20,9 @@

@RunWith(AndroidJUnit4.class)
public class LoginTests extends BaseTest {
// @Rule
// public ActivityTestRule<LoginMagicLinkInterceptActivity> mMagicLinkActivityTestRule =
// new ActivityTestRule<>(LoginMagicLinkInterceptActivity.class);
@Rule
public ActivityTestRule<LoginMagicLinkInterceptActivity> mMagicLinkActivityTestRule =
new ActivityTestRule<>(LoginMagicLinkInterceptActivity.class, true, false);

@Before
public void setUp() {
@@ -45,14 +45,13 @@ public void loginWithSiteAddress() {
.confirmLogin();
}

// Disabled temporarily, see: https://github.com/wordpress-mobile/WordPress-Android/pull/11283
// @Test
// public void loginWithMagicLink() {
// new LoginFlow().chooseLogin()
// .enterEmailAddress()
// .chooseMagicLink(mMagicLinkActivityTestRule)
// .confirmLogin();
// }
@Test
public void loginWithMagicLink() {
new LoginFlow().chooseLogin()
.enterEmailAddress()
.chooseMagicLink(mMagicLinkActivityTestRule)
.confirmLogin();
}

@Test
public void loginWithSelfHostedAccount() {
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
package org.wordpress.android.e2e;

// 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();
// }
//}
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, true, false);

@Before
public void setUp() {
logoutIfNecessary();
}

@Test
public void signUpWithMagicLink() {
new SignupFlow().chooseSignupWithEmail()
.enterEmail(E2E_SIGNUP_EMAIL)
.openMagicLink(mMagicLinkActivityTestRule)
.checkEpilogue(
E2E_SIGNUP_DISPLAY_NAME,
E2E_SIGNUP_USERNAME)
.enterPassword(E2E_SIGNUP_PASSWORD)
.dismissInterstitial()
.confirmSignup();
}
}
Original file line number Diff line number Diff line change
@@ -20,17 +20,25 @@
import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayed;

public class SignupFlow {
public void chooseSignupWithEmail() {
public SignupFlow chooseSignupWithEmail() {
clickOn(onView(withId(R.id.create_site_button)));
clickOn(onView(withId(R.id.signup_email)));

return this;
}

public void enterEmail(String email,
ActivityTestRule<LoginMagicLinkInterceptActivity> magicLinkActivityTestRule) {
public SignupFlow enterEmail(String email) {
// Email file = id/input
populateTextField(onView(withId(R.id.input)), email);
clickOn(onView(withId(R.id.primary_button)));

// Should See Open Mail button
waitForElementToBeDisplayed(R.id.signup_magic_link_button);

return this;
}

public SignupFlow openMagicLink(ActivityTestRule<LoginMagicLinkInterceptActivity> magicLinkActivityTestRule) {
// Follow the magic link to continue login
// Intent is invoked directly rather than through a browser as WireMock is unavailable once in the background
Intent intent = new Intent(
@@ -39,9 +47,11 @@ public void enterEmail(String email,
).setPackage(getApplicationContext().getPackageName());

magicLinkActivityTestRule.launchActivity(intent);

return this;
}

public void checkEpilogue(String displayName, String username) {
public SignupFlow checkEpilogue(String displayName, String username) {
// Check Epilogue data
ViewInteraction emailHeaderView = onView(withId(R.id.signup_epilogue_header_email));
waitForElementToBeDisplayed(emailHeaderView);
@@ -51,21 +61,27 @@ public void checkEpilogue(String displayName, String username) {

waitForElementToBeDisplayed(displayNameField);
waitForElementToBeDisplayed(usernameField);

return this;
}

public void enterPassword(String password) {
public SignupFlow enterPassword(String password) {
// Enter Password
ViewInteraction passwordField = onView(allOf(withId(R.id.input), withHint("Password (optional)")));
waitForElementToBeDisplayed(passwordField);
populateTextField(passwordField, password);

// Click continue
clickOn(onView(withId(R.id.primary_button)));

return this;
}

public void dismissInterstitial() {
public SignupFlow dismissInterstitial() {
// Dismiss post-signup interstitial
clickOn(onView(withId(R.id.dismiss_button)));

return this;
}

public void confirmSignup() {