1.29.0 Release

.circleci/config.yml

@@ -68,6 +68,9 @@ jobs:
         description: Post to Slack when tests fail. SLACK_WEBHOOK ENV variable must be set.
         type: boolean
         default: false
+      is-canary:
+        type: string
+        default: ""
     docker:
     - image: circleci/android:api-29-node
     steps:
@@ -92,7 +95,8 @@ jobs:
             curl -u "$SAUCE_USERNAME:$SAUCE_ACCESS_KEY" -X POST -H "Content-Type: application/octet-stream" https://saucelabs.com/rest/v1/storage/automattic/Gutenberg-$SAUCE_FILENAME.apk?overwrite=true --data-binary @./android/app/build/outputs/apk/debug/app-debug.apk
       - run:
           name: Run Device Tests
-          command: yarn device-tests
+          command: yarn device-tests<<parameters.is-canary>>
+          no_output_timeout: 1200
           environment:
             JEST_JUNIT_OUTPUT: "reports/test-results/android-test-results.xml"
       - store_test_results:
@@ -125,6 +129,9 @@ jobs:
         description: Post to Slack when tests fail. SLACK_WEBHOOK ENV variable must be set.
         type: boolean
         default: false
+      is-canary:
+        type: string
+        default: ""
     macos:
       xcode: "11.2.1"
     steps:
@@ -178,7 +185,8 @@ jobs:
     - run:
         name: Run Device Tests
         command: |
-          yarn device-tests
+          yarn device-tests<<parameters.is-canary>>
+        no_output_timeout: 1200
         environment:
           JEST_JUNIT_OUTPUT: "reports/test-results/ios-test-results.xml"
     - store_test_results:
@@ -215,9 +223,23 @@ workflows:
           platform: android
           check-tests: true
       - ios-device-checks:
-          name: Test iOS on Device
+          name: Test iOS on Device - Canaries
+          is-canary: "-canary"
+      - android-device-checks:
+          name: Test Android on Device - Canaries
+          is-canary: "-canary"
+      - Optional UI Tests:
+          type: approval
+          filters:
+            branches:
+              ignore:
+                - develop
+      - ios-device-checks:
+          name: Test iOS on Device - Full
+          requires: [ "Optional UI Tests" ]
       - android-device-checks:
-          name: Test Android on Device
+          name: Test Android on Device - Full
+          requires: [ "Optional UI Tests" ]
       - android-native-unit-tests:
           name: Android Native Unit Tests
 

RELEASE-NOTES.txt

@@ -1,3 +1,15 @@
+1.29.0
+------
+* [**] Add support for changing overlay color settings in Cover block
+* Add enter/exit animation in FloatingToolbar
+* [***] New block: Verse
+* [*] Fix merging of text blocks when text had active formatting (bold, italic, strike, link)
+* [***] Trash icon that is used to remove blocks is moved to the new menu reachable via ellipsis button in the block toolbar
+* [**] Block toolbar can now collapse when the block width is smaller than the toolbar content
+* [**] Creating undo levels less frequently
+* [**] Tooltip for page template selection buttons
+* [*] Fix button alignment in page templates and make strings consistent
+* [*] Add support for displaying radial gradients in Buttons and Cover blocks
 1.28.2
 ------
 * [***] Disable Pullquote Block on Android
@@ -21,6 +33,7 @@
 
 1.27.0
 ------
+* Block Editor: Add dialog for mentioning other users in your post
 * Prefill caption for image blocks when available on the Media library
 * New block: Buttons. From now you’ll be able to add the individual Button block only inside the Buttons block
 * Fix bug where whitespaces at start of text blocks were being removed

RNTAztecView.podspec

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.xcconfig         = {'OTHER_LDFLAGS' => '-lxml2',
                         'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
   s.dependency         'React-Core'
-  s.dependency         'WordPress-Aztec-iOS', '~> 1.19.0'
+  s.dependency         'WordPress-Aztec-iOS', '~> 1.19.2'
 
 end

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

@@ -11,7 +11,7 @@ import testData from './helpers/test-data';
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000;
 
-describe( 'Gutenberg Editor tests', () => {
+describe( 'Gutenberg Editor tests @canary', () => {
 	let driver;
 	let editorPage;
 	let allPassed = true;

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

@@ -18,7 +18,7 @@ import testData from './helpers/test-data';
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000;
 
-describe( 'Gutenberg Editor Image Block tests', () => {
+describe( 'Gutenberg Editor Image Block tests @canary', () => {
 	let driver;
 	let editorPage;
 	let allPassed = true;

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

@@ -17,7 +17,7 @@ import testData from './helpers/test-data';
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000;
 
-describe( 'Gutenberg Editor tests for List block', () => {
+describe( 'Gutenberg Editor tests for List block @canary', () => {
 	let driver;
 	let editorPage;
 	let allPassed = true;

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

@@ -0,0 +1,57 @@
+/**
+ * @format
+ * */
+
+/**
+ * Internal dependencies
+ */
+import EditorPage from './pages/editor-page';
+import {
+	setupDriver,
+	isLocalEnvironment,
+	stopDriver,
+} from './helpers/utils';
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000;
+
+describe( 'Gutenberg Editor Verse Block Tests', () => {
+	let driver;
+	let editorPage;
+	let allPassed = true;
+	const verseBlockName = 'Verse';
+
+	// Use reporter for setting status for saucelabs Job
+	if ( ! isLocalEnvironment() ) {
+		const reporter = {
+			specDone: async ( result ) => {
+				allPassed = allPassed && result.status !== 'failed';
+			},
+		};
+
+		jasmine.getEnv().addReporter( reporter );
+	}
+
+	beforeAll( async () => {
+		driver = await setupDriver();
+		editorPage = new EditorPage( driver );
+	} );
+
+	it( 'should be able to see visual editor', async () => {
+		await expect( editorPage.getBlockList() ).resolves.toBe( true );
+	} );
+
+	it( 'should be able to add a verse block', async () => {
+		await editorPage.addNewBlock( verseBlockName );
+		const verseBlock = await editorPage.getBlockAtPosition( verseBlockName );
+
+		expect( verseBlock ).toBeTruthy();
+		await editorPage.removeBlockAtPosition( verseBlockName );
+	} );
+
+	afterAll( async () => {
+		if ( ! isLocalEnvironment() ) {
+			driver.sauceJobStatus( allPassed );
+		}
+		await stopDriver( driver );
+	} );
+} );

__device-tests__/helpers/caps.js

@@ -6,7 +6,7 @@ const ios = {
 	os: 'iOS',
 	deviceOrientation: 'portrait',
 	automationName: 'XCUITest',
-	appiumVersion: '1.15.0', // SauceLabs requires appiumVersion to be specified.
+	appiumVersion: '1.16.0', // SauceLabs requires appiumVersion to be specified.
 	app: undefined, // will be set later, locally this is relative to root of project
 	processArguments: {
 		args: [
@@ -37,6 +37,6 @@ exports.android8 = {
 	appPackage: 'com.gutenberg',
 	appActivity: 'com.gutenberg.MainActivity',
 	deviceOrientation: 'portrait',
-	appiumVersion: '1.15.0',
+	appiumVersion: '1.16.0',
 	app: undefined,
 };

__device-tests__/pages/editor-page.js

@@ -17,6 +17,7 @@ export default class EditorPage {
 	accessibilityIdKey: string;
 	accessibilityIdXPathAttrib: string;
 	paragraphBlockName = 'Paragraph';
+	verseBlockName = 'Verse';
 	orderedListButtonName = 'Convert to ordered list';
 
 	constructor( driver: wd.PromiseChainWebdriver ) {
@@ -242,20 +243,26 @@ export default class EditorPage {
 		}
 
 		const buttonElementName = isAndroid() ? '//*' : '//XCUIElementTypeButton';
-		const removeButtonIdentifier = `Remove block at row ${ position }`;
-		const removeBlockLocator = `${ buttonElementName }[contains(@${ this.accessibilityIdXPathAttrib }, "${ removeButtonIdentifier }")]`;
+		const blockActionsMenuButtonIdentifier = `Open Block Actions Menu`;
+		const blockActionsMenuButtonLocator = `${ buttonElementName }[contains(@${ this.accessibilityIdXPathAttrib }, "${ blockActionsMenuButtonIdentifier }")]`;
 
 		if ( isAndroid() ) {
 			const block = await this.getBlockAtPosition( blockName, position );
-			let checkList = await this.driver.elementsByXPath( removeBlockLocator );
+			let checkList = await this.driver.elementsByXPath( blockActionsMenuButtonLocator );
 			while ( checkList.length === 0 ) {
 				await swipeUp( this.driver, block ); // Swipe up to show remove icon at the bottom
-				checkList = await this.driver.elementsByXPath( removeBlockLocator );
+				checkList = await this.driver.elementsByXPath( blockActionsMenuButtonLocator );
 			}
 		}
 
-		const removeButton = await this.driver.elementByXPath( removeBlockLocator );
-		await removeButton.click();
+		const blockActionsMenuButton = await this.driver.elementByXPath( blockActionsMenuButtonLocator );
+		await blockActionsMenuButton.click();
+
+		const removeActionButtonIdentifier = `Remove ${ blockName }`;
+		const removeActionButtonLocator = `${ buttonElementName }[contains(@${ this.accessibilityIdXPathAttrib }, "${ removeActionButtonIdentifier }")]`;
+		const removeActionButton = await this.driver.elementByXPath( removeActionButtonLocator );
+
+		await removeActionButton.click();
 	}
 
 	// =========================

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

@@ -1,6 +1,13 @@
 package com.gutenberg;
 
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+
+import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode;
 
 public class MainActivity extends ReactActivity {
 
@@ -12,4 +19,19 @@ public class MainActivity extends ReactActivity {
     protected String getMainComponentName() {
         return "gutenberg";
     }
+
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+        return new ReactActivityDelegate(this, getMainComponentName()) {
+            @Nullable
+            @Override
+            protected Bundle getLaunchOptions() {
+                Bundle bundle = new Bundle();
+                Bundle capabilities = new Bundle();
+                capabilities.putBoolean(WPAndroidGlueCode.PROP_NAME_CAPABILITIES_MENTIONS, true);
+                bundle.putBundle(WPAndroidGlueCode.PROP_NAME_CAPABILITIES, capabilities);
+                return bundle;
+            }
+        };
+    }
 }

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

@@ -115,6 +115,14 @@ public void requestMediaEditor(MediaUploadCallback mediaUploadCallback, String m
             public void logUserEvent(GutenbergUserEvent gutenbergUserEvent, ReadableMap eventProperties) {
             }
 
+            @Override
+            public void setStarterPageTemplatesTooltipShown(boolean tooltipShown) {
+            }
+
+            @Override
+            public void requestStarterPageTemplatesTooltipShown(StarterPageTemplatesTooltipShownCallback starterPageTemplatesTooltipShownCallback) {
+            }
+
             @Override
             public void editorDidEmitLog(String message, LogLevel logLevel) {
                 switch (logLevel) {
@@ -136,6 +144,11 @@ public void editorDidEmitLog(String message, LogLevel logLevel) {
             @Override
             public void performRequest(String path, Consumer<String> onSuccess, Consumer<Bundle> onError) {}
 
+            @Override
+            public void onAddMention(Consumer<String> onSuccess) {
+                onSuccess.accept("matt");
+            }
+
         }, isDarkMode());
 
         return new ReactNativeHost(this) {