Merge Master -> Develop 1.28.1

.circleci/config.yml

@@ -109,6 +109,20 @@ jobs:
                 include_job_number_field: false
                 include_project_field: false
                 failure_message: ':red_circle: Scheduled tests failed on Android device!'
+  android-native-unit-tests:
+    parameters:
+      post-to-slack:
+        description: Post to Slack when tests fail. SLACK_WEBHOOK ENV variable must be set.
+        type: boolean
+        default: false
+    docker:
+    - image: circleci/android:api-29-node
+    steps:
+      - checkout
+      - yarn-install
+      - run:
+          name: Run Android native unit tests
+          command: cd android && ./gradlew testDebug
   ios-device-checks:
     parameters:
       post-to-slack:
@@ -226,6 +240,8 @@ workflows:
       - android-device-checks:
           name: Test Android on Device - Full
           requires: [ "Optional UI Tests" ]
+      - android-native-unit-tests:
+          name: Android Native Unit Tests
 
   ui-tests-full-scheduled:
     jobs:

RELEASE-NOTES.txt

@@ -1,3 +1,6 @@
+1.28.1
+------
+* [**] Avoid crash when editor selection state becomes invalid
 1.29.0
 ------
 * [**] Add support for changing overlay color settings in Cover block

__device-tests__/gutenberg-editor-lists.test.js

@@ -7,10 +7,11 @@
  */
 import EditorPage from './pages/editor-page';
 import {
-	setupDriver,
+	backspace,
+	isAndroid,
 	isLocalEnvironment,
+	setupDriver,
 	stopDriver,
-	isAndroid,
 } from './helpers/utils';
 import testData from './helpers/test-data';
 
@@ -63,8 +64,9 @@ describe( 'Gutenberg Editor tests for List block @canary', () => {
 		await editorPage.verifyHtmlContent( testData.listHtml );
 	} );
 
+	// This test depends on being run immediately after 'should be able to add a new List block'
 	it( 'should update format to ordered list, using toolbar button', async () => {
-		const listBlockElement = await editorPage.getBlockAtPosition( listBlockName );
+		let listBlockElement = await editorPage.getBlockAtPosition( listBlockName );
 
 		// Click List block to force EditText focus
 		await listBlockElement.click();
@@ -74,6 +76,41 @@ describe( 'Gutenberg Editor tests for List block @canary', () => {
 
 		// switch to html and verify html
 		await editorPage.verifyHtmlContent( testData.listHtmlOrdered );
+
+		// Remove list block to return editor to empty state
+		listBlockElement = await editorPage.getBlockAtPosition( listBlockName );
+		await listBlockElement.click();
+		await editorPage.removeBlockAtPosition( listBlockName );
+	} );
+
+	// Prevent regression of https://github.com/wordpress-mobile/gutenberg-mobile/issues/871
+	// Commented out because it started failing. This is being tracked by https://github.com/wordpress-mobile/gutenberg-mobile/issues/2315.
+	it.skip( 'should handle spaces in a list', async () => {
+		await editorPage.addNewBlock( listBlockName );
+		let listBlockElement = await editorPage.getBlockAtPosition( listBlockName );
+		// Click List block on Android to force EditText focus
+		if ( isAndroid() ) {
+			await listBlockElement.click();
+		}
+
+		// Send the list item text
+		await editorPage.sendTextToListBlock( listBlockElement, '  a' );
+
+		// send an Enter
+		await editorPage.sendTextToListBlock( listBlockElement, '\n' );
+
+		// send a backspace
+		await editorPage.sendTextToListBlock( listBlockElement, backspace );
+
+		// switch to html and verify html
+		await editorPage.verifyHtmlContent( `<!-- wp:list -->
+<ul><li>  a</li></ul>
+<!-- /wp:list -->` );
+
+		// Remove list block to reset editor to clean state
+		listBlockElement = await editorPage.getBlockAtPosition( listBlockName );
+		await listBlockElement.click();
+		await editorPage.removeBlockAtPosition( listBlockName );
 	} );
 
 	afterAll( async () => {

__device-tests__/gutenberg-editor-paragraph.test.js

@@ -7,6 +7,7 @@
  */
 import EditorPage from './pages/editor-page';
 import {
+	backspace,
 	setupDriver,
 	isLocalEnvironment,
 	clickMiddleOfElement,
@@ -103,7 +104,7 @@ describe( 'Gutenberg Editor tests for Paragraph Block', () => {
 
 		textViewElement = await editorPage.getTextViewForParagraphBlock( paragraphBlockElement );
 		await clickBeginningOfElement( driver, textViewElement );
-		await editorPage.typeTextToParagraphBlock( paragraphBlockElement, '\u0008' );
+		await editorPage.typeTextToParagraphBlock( paragraphBlockElement, backspace );
 
 		const text = await editorPage.getTextForParagraphBlockAtPosition( 1 );
 		expect( text0 + text1 ).toMatch( text );
@@ -127,6 +128,55 @@ describe( 'Gutenberg Editor tests for Paragraph Block', () => {
 		}
 	} );
 
+	// Restricting these test to Android because I was not able to update the html on iOS
+	if ( isAndroid() ) {
+		it( 'should be able to merge blocks with unknown html elements', async () => {
+			await editorPage.setHtmlContentAndroid( `
+<!-- wp:paragraph -->
+<p><unknownhtmlelement>abc</unknownhtmlelement>D</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
+<p>E</p>
+<!-- /wp:paragraph -->` );
+
+			// // Merge paragraphs
+			const secondParagraphBlockElement = await editorPage.getBlockAtPosition( paragraphBlockName, 2 );
+			await clickBeginningOfElement( driver, secondParagraphBlockElement );
+			await editorPage.typeTextToParagraphBlock( secondParagraphBlockElement, backspace );
+
+			// verify the editor has not crashed
+			const text = await editorPage.getTextForParagraphBlockAtPosition( 1 );
+			expect( text.length ).not.toEqual( 0 );
+
+			await editorPage.removeBlockAtPosition( paragraphBlockName );
+		} );
+
+		// Based on https://github.com/wordpress-mobile/gutenberg-mobile/pull/1507
+		it( 'should handle multiline paragraphs from web', async () => {
+			await editorPage.setHtmlContentAndroid( `
+	<!-- wp:paragraph -->
+	<p>multiple lines<br><br></p>
+	<!-- /wp:paragraph -->
+
+	<!-- wp:paragraph -->
+	<p></p>
+	<!-- /wp:paragraph -->`
+			);
+
+			// // Merge paragraphs
+			const secondParagraphBlockElement = await editorPage.getBlockAtPosition( paragraphBlockName, 2 );
+			await clickBeginningOfElement( driver, secondParagraphBlockElement );
+			await editorPage.typeTextToParagraphBlock( secondParagraphBlockElement, backspace );
+
+			// verify the editor has not crashed
+			const text = await editorPage.getTextForParagraphBlockAtPosition( 1 );
+			expect( text.length ).not.toEqual( 0 );
+
+			await editorPage.removeBlockAtPosition( paragraphBlockName );
+		} );
+	}
+
 	afterAll( async () => {
 		if ( ! isLocalEnvironment() ) {
 			driver.sauceJobStatus( allPassed );

__device-tests__/helpers/utils.js

@@ -37,11 +37,13 @@ const localIOSAppPath = process.env.IOS_APP_PATH || defaultIOSAppPath;
 const localAppiumPort = serverConfigs.local.port; // Port to spawn appium process for local runs
 let appiumProcess: ?childProcess.ChildProcess;
 
+const backspace = '\u0008';
+
 // Used to map unicode and special values to keycodes on Android
 // Docs for keycode values: https://developer.android.com/reference/android/view/KeyEvent.html
 const strToKeycode = {
 	'\n': 66,
-	'\u0008': 67,
+	[ backspace ]: 67,
 };
 
 const timer = ( ms: number ) => new Promise < {} > ( ( res ) => setTimeout( res, ms ) );
@@ -373,6 +375,7 @@ const toggleOrientation = async ( driver: wd.PromiseChainWebdriver ) => {
 };
 
 module.exports = {
+	backspace,
 	timer,
 	setupDriver,
 	isLocalEnvironment,

android/app/src/main/java/com/gutenberg/MainApplication.java

@@ -63,7 +63,7 @@ public void requestMediaPickFromMediaLibrary(MediaUploadCallback mediaUploadCall
                 } else if (mediaType == MediaType.VIDEO) {
                     rnMediaList.add(new Media(2, "https://i.cloudup.com/YtZFJbuQCE.mov", "video", "Cloudup" ));
                 }
-                mediaUploadCallback.onUploadMediaFileSelected(rnMediaList);                
+                mediaUploadCallback.onUploadMediaFileSelected(rnMediaList);
             }
 
 
@@ -164,7 +164,8 @@ protected List<ReactPackage> getPackages() {
                         new ReactSliderPackage(),
                         new ReactVideoPackage(),
                         new SvgPackage(),
-                        new ReactAztecPackage(),
+                        // passing null because we do not need log handlers in the demo app
+                        new ReactAztecPackage(null, null),
                         new LinearGradientPackage(),
                         mRnReactNativeGutenbergBridgePackage);
             }

bundle/android/raw/gutenberg_packages_blocklibrary_src_archives_block.json

@@ -4,7 +4,13 @@
 	"attributes": {
 		"align": {
 			"type": "string",
-			"enum": [ "left", "center", "right", "wide", "full" ]
+			"enum": [
+				"left",
+				"center",
+				"right",
+				"wide",
+				"full"
+			]
 		},
 		"className": {
 			"type": "string"
@@ -17,5 +23,9 @@
 			"type": "boolean",
 			"default": false
 		}
+	},
+	"supports": {
+		"align": true,
+		"html": false
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_audio_block.json

@@ -34,5 +34,9 @@
 			"selector": "audio",
 			"attribute": "preload"
 		}
+	},
+	"supports": {
+		"align": true,
+		"lightBlockWrapper": true
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_block_block.json

@@ -5,5 +5,10 @@
 		"ref": {
 			"type": "number"
 		}
+	},
+	"supports": {
+		"customClassName": false,
+		"html": false,
+		"inserter": false
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_button_block.json

@@ -1,6 +1,9 @@
 {
 	"name": "core/button",
 	"category": "layout",
+	"parent": [
+		"core/buttons"
+	],
 	"attributes": {
 		"url": {
 			"type": "string",
@@ -49,5 +52,11 @@
 		"gradient": {
 			"type": "string"
 		}
+	},
+	"supports": {
+		"align": true,
+		"alignWide": false,
+		"reusable": false,
+		"lightBlockWrapper": true
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_buttons_block.json

@@ -1,5 +1,9 @@
 {
 	"name": "core/buttons",
 	"category": "layout",
-	"attributes": {}
+	"supports": {
+		"align": true,
+		"alignWide": false,
+		"lightBlockWrapper": true
+	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_calendar_block.json

@@ -4,7 +4,13 @@
 	"attributes": {
 		"align": {
 			"type": "string",
-			"enum": [ "left", "center", "right", "wide", "full" ]
+			"enum": [
+				"left",
+				"center",
+				"right",
+				"wide",
+				"full"
+			]
 		},
 		"className": {
 			"type": "string"
@@ -15,5 +21,8 @@
 		"year": {
 			"type": "integer"
 		}
+	},
+	"supports": {
+		"align": true
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_categories_block.json

@@ -4,7 +4,13 @@
 	"attributes": {
 		"align": {
 			"type": "string",
-			"enum": [ "left", "center", "right", "wide", "full" ]
+			"enum": [
+				"left",
+				"center",
+				"right",
+				"wide",
+				"full"
+			]
 		},
 		"className": {
 			"type": "string"
@@ -21,5 +27,9 @@
 			"type": "boolean",
 			"default": false
 		}
+	},
+	"supports": {
+		"align": true,
+		"html": false
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_code_block.json

@@ -7,5 +7,9 @@
 			"source": "text",
 			"selector": "code"
 		}
+	},
+	"supports": {
+		"html": false,
+		"lightBlockWrapper": true
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_column_block.json

@@ -1,6 +1,9 @@
 {
 	"name": "core/column",
 	"category": "common",
+	"parent": [
+		"core/columns"
+	],
 	"attributes": {
 		"verticalAlignment": {
 			"type": "string"
@@ -10,5 +13,10 @@
 			"min": 0,
 			"max": 100
 		}
+	},
+	"supports": {
+		"reusable": false,
+		"html": false,
+		"lightBlockWrapper": true
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_cover_block.json

@@ -44,5 +44,10 @@
 		"contentPosition": {
 			"type": "string"
 		}
+	},
+	"supports": {
+		"align": true,
+		"html": false,
+		"lightBlockWrapper": true
 	}
 }

bundle/android/raw/gutenberg_packages_blocklibrary_src_file_block.json

@@ -34,5 +34,8 @@
 			"source": "html",
 			"selector": "a[download]"
 		}
+	},
+	"supports": {
+		"align": true
 	}
 }