Merge branch 'trunk' into core-data-test-case

crazytonyli · crazytonyli · commit 45b5f0556413 · 2022-05-19T17:15:49.000+12:00
Conflicts:
	WordPress/WordPressTest/Dashboard/BlogDashboardServiceTests.swift
diff --git a/WordPress/Jetpack/Resources/AppStoreStrings.po b/WordPress/Jetpack/Resources/AppStoreStrings.po
@@ -38,20 +38,22 @@ msgctxt "app_store_keywords"
 msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
 msgstr ""
 
-msgctxt "v19.8-whats-new"
+msgctxt "v19.9-whats-new"
 msgid ""
-"When you Follow Conversation in Reader post cards and post details, in-app notifications are now opt-out rather than opt-in.\n"
+"Blocks are now drag-and-drop, so you can easily rearrange your content however you like. We like to move it, move it.\n"
 "\n"
-"We replaced the quick-start prompt when you log in as an existing user. Now you can tell us what you’d like to focus on and enable notifications for things like site traffic, new followers, and other milestones. Cue confetti.\n"
+"That’s not the only change in the block editor. We adjusted color contrast so it’s easier to read text when you’re working in dark mode. We also fixed a problem with the Link To setting in Gallery blocks, and we added Image Size settings while we were at it.\n"
 "\n"
-"Ready for the grand tour? We made some tweaks to the Stats and Reader tours in the Quick Start section. Now you can move through the tours more smoothly and get more pointers and messages as you go.\n"
+"The WordPress.com tour banner no longer pops up in the unsupported block editor. Speaking of tours—you’ll now see a different set of Quick Start tasks, depending on whether you’re building a new site or working with an existing one. Learning new tasks, like checking notifications and uploading media, is a piece of cake.\n"
 "\n"
-"We also made some sweet, sweet changes to the Block Editor.\n"
+"Finally, we squashed some pesky bugs to make the app easier to use.\n"
 "\n"
-"- You can now adjust Featured Image settings for any posts in a Latest Post block.\n"
-"- You’ll see the correct notices when you’re fast-switching between HTML and Visual mode.\n"
-"- Media previews are no longer cut off when you edit a URL in an Embed block.\n"
-"- If you’re using an iPad with an external keyboard, you’ll no longer see extra space between the toolbar and the bottom of the screen. Mind the gap.\n"
+"- Widget text isn’t flipped anymore for devices using right-to-left languages.\n"
+"- The app won’t crash when you switch between Stat Insights and other site sections. Phew.\n"
+"- In the Posts list, the create button is now visible for iPad users working in split screen.\n"
+"- When you change your site title in site settings, it’ll be updated in My Site, too.\n"
+"- You’ll see the right message in the media picker when there’s no media available.\n"
+"- The navigation buttons in the Site Creation process now scale properly when your device uses large fonts.\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of the first screenshot in the App Store.
diff --git a/WordPress/Jetpack/Resources/release_notes.txt b/WordPress/Jetpack/Resources/release_notes.txt
@@ -1,12 +1,14 @@
-* [*] Site Settings: we fixed an issue that prevented the site title to be updated when it changed in Site Settings [#18543]
-* [*] Media Picker: Fixed an issue where the empty state view was being displayed incorrectly. [#18471]
-* [*] Quick Start: We are now showing a different set of Quick Start tasks for existing sites and new sites. The existing sites checklist includes new tours such as: "Check your notifications" and "Upload photos or videos".  [#18395, #18412, #18443, #18471]
-* [*] Site Creation: we fixed an issue where the navigation buttons were not scaling when large fonts were selected on the device [#18559]
-* [**] Block Editor: Cover Block: Improve color contrast between background and text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4808]
-* [***] Block Editor: Add drag & drop blocks feature [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4832]
-* [*] Block Editor: Gallery block: Fix broken "Link To" settings and add "Image Size" settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4841]
-* [*] Block Editor: Unsupported Block Editor: Prevent WordPress.com tour banner from displaying. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4820]
-* [*] Widgets: we fixed an issue where text appeared flipped in rtl languages [#18567]
-* [*] Stats: we fixed a crash that occurred sometimes in Stats [#18613]
-* [*] Posts list: we fixed an issue where the create button was not shown on iPad in split screen [#18609]
+Blocks are now drag-and-drop, so you can easily rearrange your content however you like. We like to move it, move it.
 
+That’s not the only change in the block editor. We adjusted color contrast so it’s easier to read text when you’re working in dark mode. We also fixed a problem with the Link To setting in Gallery blocks, and we added Image Size settings while we were at it.
+
+The WordPress.com tour banner no longer pops up in the unsupported block editor. Speaking of tours—you’ll now see a different set of Quick Start tasks, depending on whether you’re building a new site or working with an existing one. Learning new tasks, like checking notifications and uploading media, is a piece of cake.
+
+Finally, we squashed some pesky bugs to make the app easier to use.
+
+- Widget text isn’t flipped anymore for devices using right-to-left languages.
+- The app won’t crash when you switch between Stat Insights and other site sections. Phew.
+- In the Posts list, the create button is now visible for iPad users working in split screen.
+- When you change your site title in site settings, it’ll be updated in My Site, too.
+- You’ll see the right message in the media picker when there’s no media available.
+- The navigation buttons in the Site Creation process now scale properly when your device uses large fonts.
diff --git a/WordPress/Resources/AppStoreStrings.po b/WordPress/Resources/AppStoreStrings.po
@@ -45,22 +45,22 @@ msgctxt "app_store_keywords"
 msgid "blogger,writing,blogging,web,maker,online,store,business,make,create,write,blogs"
 msgstr ""
 
-msgctxt "v19.8-whats-new"
+msgctxt "v19.9-whats-new"
 msgid ""
-"You can now upload videos of any length to self-hosted sites—the only limit is your own imagination. (Oh, and the 2 GB file size limit, we guess.)\n"
+"Blocks are now drag-and-drop, so you can easily rearrange your content however you like. We like to move it, move it.\n"
 "\n"
-"When you Follow Conversation in Reader post cards and post details, in-app notifications are now opt-out rather than opt-in.\n"
+"That’s not the only change in the block editor. We adjusted color contrast so it’s easier to read text when you’re working in dark mode. We also fixed a problem with the Link To setting in Gallery blocks, and we added Image Size settings while we were at it.\n"
 "\n"
-"We replaced the quick-start prompt when you log in as an existing user. Now you can tell us what you’d like to focus on and enable notifications for things like site traffic, new followers, and other milestones. Cue confetti.\n"
+"The WordPress.com tour banner no longer pops up in the unsupported block editor. Speaking of tours—you’ll now see a different set of Quick Start tasks, depending on whether you’re building a new site or working with an existing one. Learning new tasks, like checking notifications and uploading media, is a piece of cake.\n"
 "\n"
-"Ready for the grand tour? We made some tweaks to the Stats and Reader tours in the Quick Start section. Now you can move through the tours more smoothly and get more pointers and messages as you go.\n"
+"Finally, we squashed some pesky bugs to make the app easier to use.\n"
 "\n"
-"We also made some sweet, sweet changes to the Block Editor.\n"
-"\n"
-"- You can now adjust Featured Image settings for any posts in a Latest Post block.\n"
-"- You’ll see the correct notices when you’re fast-switching between HTML and Visual mode.\n"
-"- Media previews are no longer cut off when you edit a URL in an Embed block.\n"
-"- If you’re using an iPad with an external keyboard, you’ll no longer see extra space between the toolbar and the bottom of the screen. Mind the gap.\n"
+"- Widget text isn’t flipped anymore for devices using right-to-left languages.\n"
+"- The app won’t crash when you switch between Stat Insights and other site sections. Phew.\n"
+"- In the Posts list, the create button is now visible for iPad users working in split screen.\n"
+"- When you change your site title in site settings, it’ll be updated in My Site, too.\n"
+"- You’ll see the right message in the media picker when there’s no media available.\n"
+"- The navigation buttons in the Site Creation process now scale properly when your device uses large fonts.\n"
 msgstr ""
 
 #. translators: This is a standard chunk of text used to tell a user what's new with a release when nothing major has changed.
diff --git a/WordPress/Resources/release_notes.txt b/WordPress/Resources/release_notes.txt
@@ -1,12 +1,14 @@
-* [*] Site Settings: we fixed an issue that prevented the site title to be updated when it changed in Site Settings [#18543]
-* [*] Media Picker: Fixed an issue where the empty state view was being displayed incorrectly. [#18471]
-* [*] Quick Start: We are now showing a different set of Quick Start tasks for existing sites and new sites. The existing sites checklist includes new tours such as: "Check your notifications" and "Upload photos or videos".  [#18395, #18412, #18443, #18471]
-* [*] Site Creation: we fixed an issue where the navigation buttons were not scaling when large fonts were selected on the device [#18559]
-* [**] Block Editor: Cover Block: Improve color contrast between background and text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4808]
-* [***] Block Editor: Add drag & drop blocks feature [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4832]
-* [*] Block Editor: Gallery block: Fix broken "Link To" settings and add "Image Size" settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4841]
-* [*] Block Editor: Unsupported Block Editor: Prevent WordPress.com tour banner from displaying. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4820]
-* [*] Widgets: we fixed an issue where text appeared flipped in rtl languages [#18567]
-* [*] Stats: we fixed a crash that occurred sometimes in Stats [#18613]
-* [*] Posts list: we fixed an issue where the create button was not shown on iPad in split screen [#18609]
+Blocks are now drag-and-drop, so you can easily rearrange your content however you like. We like to move it, move it.
 
+That’s not the only change in the block editor. We adjusted color contrast so it’s easier to read text when you’re working in dark mode. We also fixed a problem with the Link To setting in Gallery blocks, and we added Image Size settings while we were at it.
+
+The WordPress.com tour banner no longer pops up in the unsupported block editor. Speaking of tours—you’ll now see a different set of Quick Start tasks, depending on whether you’re building a new site or working with an existing one. Learning new tasks, like checking notifications and uploading media, is a piece of cake.
+
+Finally, we squashed some pesky bugs to make the app easier to use.
+
+- Widget text isn’t flipped anymore for devices using right-to-left languages.
+- The app won’t crash when you switch between Stat Insights and other site sections. Phew.
+- In the Posts list, the create button is now visible for iPad users working in split screen.
+- When you change your site title in site settings, it’ll be updated in My Site, too.
+- You’ll see the right message in the media picker when there’s no media available.
+- The navigation buttons in the Site Creation process now scale properly when your device uses large fonts.
diff --git a/WordPress/WordPressTest/Dashboard/BlogDashboardServiceTests.swift b/WordPress/WordPressTest/Dashboard/BlogDashboardServiceTests.swift
@@ -3,14 +3,7 @@ import Nimble
 
 @testable import WordPress
 
-/// This test stuite is clashing with other tests
-/// Specifically:
-/// - [BlogJetpackTest testJetpackSetupDoesntReplaceDotcomAccount]
-/// - CommentServiceTests.testFailingFetchCommentLikesShouldCallFailureBlock()
-///
-/// We weren't able to figure out why but it seems a race condition + Core data
-/// For now, renaming the suite to change the execution order solves the issue.
-class ZBlogDashboardServiceTests: CoreDataTestCase {
+class BlogDashboardServiceTests: CoreDataTestCase {
     private var context: NSManagedObjectContext!
 
     private var service: BlogDashboardService!
@@ -257,7 +250,7 @@ class ZBlogDashboardServiceTests: CoreDataTestCase {
     }
 
     func dictionary(from file: String) -> NSDictionary? {
-        let fileURL: URL = Bundle(for: ZBlogDashboardServiceTests.self).url(forResource: file, withExtension: nil)!
+        let fileURL: URL = Bundle(for: BlogDashboardServiceTests.self).url(forResource: file, withExtension: nil)!
         let data: Data = try! Data(contentsOf: fileURL)
         return try? JSONSerialization.jsonObject(with: data, options: []) as? NSDictionary
     }
@@ -292,7 +285,7 @@ class DashboardServiceRemoteMock: DashboardServiceRemote {
         didCallWithBlogID = blogID
         didRequestCards = cards
 
-        if let fileURL: URL = Bundle(for: ZBlogDashboardServiceTests.self).url(forResource: respondWith.rawValue, withExtension: nil),
+        if let fileURL: URL = Bundle(for: BlogDashboardServiceTests.self).url(forResource: respondWith.rawValue, withExtension: nil),
         let data: Data = try? Data(contentsOf: fileURL),
            let jsonObject = try? JSONSerialization.jsonObject(with: data, options: []) as AnyObject {
             success(jsonObject as! NSDictionary)
diff --git a/WordPress/WordPressTest/Dashboard/DashboardCardTests.swift b/WordPress/WordPressTest/Dashboard/DashboardCardTests.swift
@@ -9,7 +9,7 @@ class MockDefaultSectionProvider: DefaultSectionProvider {
     }
 }
 
-class ZDashboardCardTests: CoreDataTestCase {
+class DashboardCardTests: CoreDataTestCase {
 
     private var context: NSManagedObjectContext!
     private var blog: Blog!

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class MockDefaultSectionProvider: DefaultSectionProvider {`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`		`-class ZDashboardCardTests: CoreDataTestCase {`
	`12`	`+class DashboardCardTests: CoreDataTestCase {`
`13`	`13`
`14`	`14`	`private var context: NSManagedObjectContext!`
`15`	`15`	`private var blog: Blog!`