Merge branch 'develop' into merge_release_1.43.0_to_develop

.circleci/config.yml

@@ -64,7 +64,7 @@ jobs:
         type: boolean
         default: false
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:14
     steps:
       - checkout
       - checkout-submodules

RELEASE-NOTES.txt

@@ -9,6 +9,10 @@ Unreleased
 1.42.2
 ------
 * [**] Fix issue where removing blocks some blocks would crash the editor.
+* [***] Full-width and wide alignment support for Columns
+* [***] New Block: File [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2835]
+* [**] Image block - Add link picker to the block settings and enhance link settings with auto-hide options [https://github.com/WordPress/gutenberg/pull/27292]
+* [*] Fix button link setting, rel link will not be overwritten if modified by the user.
 
 1.42.0
 ------

__device-tests__/.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+	extends: '../gutenberg/packages/react-native-editor/__device-tests__/.eslintrc.js',
+};

__device-tests__/gutenberg-editor-contact-info.test.js

@@ -1,48 +1,12 @@
 /**
  * Internal dependencies
  */
-import EditorPage from '../gutenberg/packages/react-native-editor/__device-tests__/pages/editor-page';
-import {
-	setupDriver,
-	isLocalEnvironment,
-	stopDriver,
-} from '../gutenberg/packages/react-native-editor/__device-tests__/helpers/utils';
-
-jest.setTimeout( 1000000 );
-
 describe( 'Gutenberg Editor Contact Info Block tests', () => {
-	let driver;
-	let editorPage;
-	let allPassed = true;
 	// const contactInfoBlockName = 'Contact Info';
 
-	// Use reporter for setting status for saucelabs Job
-	if ( ! isLocalEnvironment() ) {
-		const reporter = {
-			specDone: async ( result ) => {
-				allPassed = allPassed && result.status !== 'failed';
-			},
-		};
-
-		// eslint-disable-next-line jest/no-jasmine-globals
-		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 );
 	} );
 
 	//TODO: Add tests
-
-	afterAll( async () => {
-		if ( ! isLocalEnvironment() ) {
-			driver.sauceJobStatus( allPassed );
-		}
-		await stopDriver( driver );
-	} );
 } );

bin/ci-checks-js.sh

@@ -16,6 +16,7 @@ function checkDiff() {
   if [[ $? != 0 ]]; then
     pFail
   elif [[ $diff ]]; then
+    echo "$diff"
     pFail "package-lock.json has changed. Please run npm install and commit the diff"
   else
     pOk

jest_ui.config.js

@@ -1,12 +1,10 @@
-const main = require( './jest.config.js' );
+const gutenbergJestUIConfig = require( './gutenberg/packages/react-native-editor/jest_ui.config.js' );
 
 module.exports = {
-	...main,
-	timers: 'real',
-	setupFiles: [],
-	testMatch: [
-		'<rootDir>/__device-tests__/**/*.test.[jt]s?(x)',
-		'<rootDir>/gutenberg/packages/react-native-editor/__device-tests__/**/*.test.[jt]s?(x)',
+	...gutenbergJestUIConfig,
+	setupFilesAfterEnv: [
+		'./gutenberg/packages/react-native-editor/jest_ui_setup_after_env.js',
 	],
-	testPathIgnorePatterns: [ '/node_modules/', '<rootDir>/jetpack/' ],
+	testEnvironment:
+		'./gutenberg/packages/react-native-editor/jest_ui_test_environment.js',
 };