From e2defe5fb9811b0cdfebe50b9ca37c4ac7331a73 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Thu, 12 Sep 2019 20:41:51 -0400 Subject: [PATCH 01/23] Fix store crash with gutenberg master --- gutenberg | 2 +- src/index.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gutenberg b/gutenberg index 264b178ef9..c9b5a6e041 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 264b178ef9bd94d4e0539c1271fb92b5b4490efa +Subproject commit c9b5a6e041b5e27f221b27f10b3030899e26926c diff --git a/src/index.js b/src/index.js index 21de01c7f5..56272faa78 100644 --- a/src/index.js +++ b/src/index.js @@ -26,9 +26,6 @@ const gutenbergSetup = () => { const apiFetch = require( '@wordpress/api-fetch' ).default; const wpData = require( '@wordpress/data' ); - // wp-api-fetch - apiFetch.use( apiFetch.createRootURLMiddleware( 'https://public-api.wordpress.com/' ) ); - // wp-data const userId = 1; const storageKey = 'WP_DATA_USER_' + userId; From 4433387d5d2290ac1b37261e3f79ba4d2fe9043f Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Thu, 12 Sep 2019 21:57:16 -0400 Subject: [PATCH 02/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index c9b5a6e041..7db63d2766 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit c9b5a6e041b5e27f221b27f10b3030899e26926c +Subproject commit 7db63d27663e5b161d76250c9f61f94d732bc8f5 From a652cccb9b153fcfd46d1e9145deb4c5d752b7d6 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Thu, 19 Sep 2019 14:14:05 +0200 Subject: [PATCH 03/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 7db63d2766..4d262b5429 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 7db63d27663e5b161d76250c9f61f94d732bc8f5 +Subproject commit 4d262b5429b96ffecd5fe188ec609edd738fd637 From 8ab38d5db3d1bcd4cefd8d6f640680f1fa8f040b Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 20 Sep 2019 18:48:10 +0200 Subject: [PATCH 04/23] Remove unused require --- src/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/index.js b/src/index.js index 56272faa78..ed0694467e 100644 --- a/src/index.js +++ b/src/index.js @@ -23,7 +23,6 @@ import { getTranslation } from '../i18n-cache'; import initialHtml from './initial-html'; const gutenbergSetup = () => { - const apiFetch = require( '@wordpress/api-fetch' ).default; const wpData = require( '@wordpress/data' ); // wp-data From fb33f0cbfb9a24247a6a4b0b74ec645315865f79 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 20 Sep 2019 19:47:24 +0200 Subject: [PATCH 05/23] Fix tests --- gutenberg | 2 +- jest.config.js | 1 + src/index.test.js | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gutenberg b/gutenberg index 4d262b5429..1c51f25f8f 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 4d262b5429b96ffecd5fe188ec609edd738fd637 +Subproject commit 1c51f25f8f1b028ca3ea8213934399792eab15c8 diff --git a/jest.config.js b/jest.config.js index 4cc35422c2..17a3ded332 100644 --- a/jest.config.js +++ b/jest.config.js @@ -15,6 +15,7 @@ module.exports = { verbose: true, // Automatically clear mock calls and instances between every test clearMocks: true, + timers: 'fake', preset: 'react-native', setupFiles: [ '/gutenberg/test/native/setup.js', diff --git a/src/index.test.js b/src/index.test.js index 3947ff9d21..991ef98bfe 100644 --- a/src/index.test.js +++ b/src/index.test.js @@ -22,6 +22,9 @@ describe( 'RootComponent', () => { it( 'renders without crashing', () => { const app = renderer.create( ); + renderer.act( () => { + jest.runAllTicks(); + } ); const rendered = app.toJSON(); expect( rendered ).toBeTruthy(); app.unmount(); @@ -29,10 +32,10 @@ describe( 'RootComponent', () => { it( 'renders without crashing with a block focused', () => { const app = renderer.create( ); - const blocks = select( 'core/block-editor' ).getBlocks(); - - // Methods that modify state are required to be called inside `act` renderer.act( () => { + jest.runAllTicks(); + const blocks = select( 'core/block-editor' ).getBlocks(); + // Methods that modify state are required to be called inside `act` dispatch( 'core/block-editor' ).selectBlock( blocks[ 0 ].clientId ); } ); From 8c2c4778d070be3447bbe63483547893a36553b0 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 20 Sep 2019 20:03:08 +0200 Subject: [PATCH 06/23] Add missing @wordpress/block-directory package in symlinked-packages --- symlinked-packages/@wordpress/block-directory | 1 + 1 file changed, 1 insertion(+) create mode 120000 symlinked-packages/@wordpress/block-directory diff --git a/symlinked-packages/@wordpress/block-directory b/symlinked-packages/@wordpress/block-directory new file mode 120000 index 0000000000..980baf1f8c --- /dev/null +++ b/symlinked-packages/@wordpress/block-directory @@ -0,0 +1 @@ +../../gutenberg/packages/block-directory/src \ No newline at end of file From 08caa7cfd637e73f07b8584ade3a53955ca295ef Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 20 Sep 2019 20:28:44 +0200 Subject: [PATCH 07/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 22a011989c..5acbd464b9 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 22a011989c297a40385fa2101772f70113ddd48b +Subproject commit 5acbd464b9e7e12952d360877d5f470ceac7a424 From 1e0ad56bde67bf7900efabd8042c7290fe0225ed Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Tue, 24 Sep 2019 13:02:19 +0200 Subject: [PATCH 08/23] Use real timers for e2e tests --- gutenberg | 2 +- jest_ui.config.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 5acbd464b9..75963fbad9 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 5acbd464b9e7e12952d360877d5f470ceac7a424 +Subproject commit 75963fbad9c5db94a701a0a0050aec7750f82028 diff --git a/jest_ui.config.js b/jest_ui.config.js index 39d086316c..adf98100cd 100644 --- a/jest_ui.config.js +++ b/jest_ui.config.js @@ -5,6 +5,7 @@ const main = require( './jest.config.js' ); module.exports = { ...main, + timers: 'real', setupFiles: [], testMatch: [ '**/__device-tests__/**/*.test.[jt]s?(x)' ], testPathIgnorePatterns: [ From 97da943e341c3307884457c6316214e88b477e88 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Wed, 25 Sep 2019 00:37:51 +0200 Subject: [PATCH 09/23] Use fake timers in unit tests not config --- gutenberg | 2 +- jest.config.js | 1 - src/index.test.js | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gutenberg b/gutenberg index 75963fbad9..2e5c9c15f2 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 75963fbad9c5db94a701a0a0050aec7750f82028 +Subproject commit 2e5c9c15f2177fdd3b5e4437d19c5dd54e20de45 diff --git a/jest.config.js b/jest.config.js index 17a3ded332..4cc35422c2 100644 --- a/jest.config.js +++ b/jest.config.js @@ -15,7 +15,6 @@ module.exports = { verbose: true, // Automatically clear mock calls and instances between every test clearMocks: true, - timers: 'fake', preset: 'react-native', setupFiles: [ '/gutenberg/test/native/setup.js', diff --git a/src/index.test.js b/src/index.test.js index 991ef98bfe..17c597ef02 100644 --- a/src/index.test.js +++ b/src/index.test.js @@ -21,6 +21,7 @@ describe( 'RootComponent', () => { beforeAll( initializeEditor ); it( 'renders without crashing', () => { + jest.useFakeTimers(); const app = renderer.create( ); renderer.act( () => { jest.runAllTicks(); From 03cc901c8f3eaea462fdbb455be2b414d3645909 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Thu, 26 Sep 2019 10:48:37 +0200 Subject: [PATCH 10/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 2e5c9c15f2..25c7fcc700 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 2e5c9c15f2177fdd3b5e4437d19c5dd54e20de45 +Subproject commit 25c7fcc70099126df3a73fd220240c38f357c5e9 From 47ed605a14e6c58a28f626c35b28e0e69c137a27 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Thu, 26 Sep 2019 11:32:53 +0200 Subject: [PATCH 11/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 25c7fcc700..8fd916a661 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 25c7fcc70099126df3a73fd220240c38f357c5e9 +Subproject commit 8fd916a661667de1ade2a3ddd73fe7223b2d1521 From 79009b1fc6d0513f77238d0b6c100253059a33fe Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Thu, 26 Sep 2019 11:47:44 +0200 Subject: [PATCH 12/23] Add comment explaining why we need to call jest.runAllTicks(); --- src/index.test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/index.test.js b/src/index.test.js index 17c597ef02..0ca3779032 100644 --- a/src/index.test.js +++ b/src/index.test.js @@ -23,6 +23,9 @@ describe( 'RootComponent', () => { it( 'renders without crashing', () => { jest.useFakeTimers(); const app = renderer.create( ); + // Gutenberg store currently has some asynchronous parts in the store setup + // Need to run all ticks so `isReady` is true in the editor store + // See: https://github.com/wordpress-mobile/gutenberg-mobile/pull/1366#discussion_r326813061 renderer.act( () => { jest.runAllTicks(); } ); From b651fbe176615e9a09c9d2b3dfd21f25c55c1c79 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Thu, 26 Sep 2019 13:12:32 +0200 Subject: [PATCH 13/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 7d2f2972de..ea43258634 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 7d2f2972de891972645542a90c9b2606b2ffade0 +Subproject commit ea4325863456d568e89a7d8a7e041af019db2eef From 20a565c6f513b1d47899bb21b9f0fae9ab5cfb6e Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 12:06:06 +0200 Subject: [PATCH 14/23] Increase the number of workers so tests don't get queued when calling driver.init to saucelabs --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index bceb4f96ac..bac07487cd 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "test": "cross-env NODE_ENV=test jest --verbose --config jest.config.js", "test:inside-gb": "cross-env NODE_ENV=test jest --verbose --config jest_gb.config.js", "test:debug": "cross-env NODE_ENV=test node --inspect-brk jest --runInBand --verbose --config jest.config.js", - "device-tests": "cross-env NODE_ENV=test jest --no-cache --maxWorkers=3 --reporters=default --reporters=jest-junit --verbose --config jest_ui.config.js", + "device-tests": "cross-env NODE_ENV=test jest --no-cache --maxWorkers=8 --reporters=default --reporters=jest-junit --verbose --config jest_ui.config.js", "device-tests:local": "cross-env NODE_ENV=test jest --runInBand --reporters=default --reporters=jest-junit --detectOpenHandles --verbose --config jest_ui.config.js", "device-tests:debug": "cross-env NODE_ENV=test node $NODE_DEBUG_OPTION --inspect-brk node_modules/jest/bin/jest --runInBand --reporters=default --reporters=jest-junit --detectOpenHandles --verbose --config jest_ui.config.js", "test:e2e": "yarn test:e2e:android && yarn test:e2e:ios", @@ -147,8 +147,8 @@ "node-libs-react-native": "^1.0.2", "node-sass": "^4.12.0", "react": "16.8.6", - "react-native": "jtreanor/react-native#v0.60.0-patched", - "react-native-dark-mode": "git+https://github.com/wordpress-mobile/react-native-dark-mode.git#f09bf1480e7b34536413ab3300f29e4375edb2c6", + "react-native": "jtreanor/react-native#v0.60.0-patched", + "react-native-dark-mode": "git+https://github.com/wordpress-mobile/react-native-dark-mode.git#f09bf1480e7b34536413ab3300f29e4375edb2c6", "react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3", "react-native-keyboard-aware-scroll-view": "git+https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git#gb-v0.8.7", "react-native-modal": "^6.5.0", From 3b5577fbb6dcb25ed878c1f8160c6eedf28ab56e Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 12:07:52 +0200 Subject: [PATCH 15/23] Reenable disabled e2e tests --- __device-tests__/gutenberg-editor-lists.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__device-tests__/gutenberg-editor-lists.test.js b/__device-tests__/gutenberg-editor-lists.test.js index 19d2f43a1c..d7eb91934a 100644 --- a/__device-tests__/gutenberg-editor-lists.test.js +++ b/__device-tests__/gutenberg-editor-lists.test.js @@ -16,7 +16,7 @@ import testData from './helpers/test-data'; jasmine.DEFAULT_TIMEOUT_INTERVAL = 400000; -xdescribe( 'Gutenberg Editor tests for List block', () => { +describe( 'Gutenberg Editor tests for List block', () => { let driver; let editorPage; let allPassed = true; From 6c757680d7a30ac86695f48b2ac39672b3c146a0 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 12:34:06 +0200 Subject: [PATCH 16/23] Reenable disabled e2e tests --- __device-tests__/gutenberg-editor-rotatation.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__device-tests__/gutenberg-editor-rotatation.test.js b/__device-tests__/gutenberg-editor-rotatation.test.js index 251d3a5680..071d6a9903 100644 --- a/__device-tests__/gutenberg-editor-rotatation.test.js +++ b/__device-tests__/gutenberg-editor-rotatation.test.js @@ -17,7 +17,7 @@ import testData from './helpers/test-data'; jasmine.DEFAULT_TIMEOUT_INTERVAL = 300000; -xdescribe( 'Gutenberg Editor tests', () => { +describe( 'Gutenberg Editor tests', () => { let driver; let editorPage; let allPassed = true; From 8c9f4cba6e3ff9924d2074e2621e77508a8ad21b Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 12:34:25 +0200 Subject: [PATCH 17/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index ea43258634..c0312ff457 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit ea4325863456d568e89a7d8a7e041af019db2eef +Subproject commit c0312ff4577aa3b7cc2210b9f88cbb5a863921a7 From 81168f53ab8f4656ad55bc9f9cc99bc8211818c9 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 14:46:54 +0200 Subject: [PATCH 18/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index c0312ff457..d62ead0498 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit c0312ff4577aa3b7cc2210b9f88cbb5a863921a7 +Subproject commit d62ead04984d4da2cfdb4b4ef2bcd4ff5a0d285a From fb6db571f796adef5eeaaa310e3d0c4ec88b1028 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 15:54:48 +0200 Subject: [PATCH 19/23] Disable warning notices --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index ed0694467e..fb38dd1f04 100644 --- a/src/index.js +++ b/src/index.js @@ -78,8 +78,8 @@ export class RootComponent extends React.Component { } export function registerApp() { - // Disable require circle warnings showing up in the app (they will still be visible in the console) - YellowBox.ignoreWarnings( [ 'Require cycle:' ] ); + // Disable warnings as they disrupt the user experience in dev mode + console.disableYellowBox = true; gutenbergSetup(); From 561f27e6a44ed62be936b6aeb4412a1d0615a432 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 15:58:11 +0200 Subject: [PATCH 20/23] Disable warning notices, fix lint --- src/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index fb38dd1f04..0abf7c80ec 100644 --- a/src/index.js +++ b/src/index.js @@ -7,7 +7,7 @@ /** * External dependencies */ -import { AppRegistry, I18nManager, YellowBox } from 'react-native'; +import { AppRegistry, I18nManager } from 'react-native'; import React from 'react'; /** @@ -79,6 +79,7 @@ export class RootComponent extends React.Component { export function registerApp() { // Disable warnings as they disrupt the user experience in dev mode + // eslint-disable-next-line no-console console.disableYellowBox = true; gutenbergSetup(); From 0081ee889ee7813caabfa7a8acd1b51f2e3196b8 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 16:04:43 +0200 Subject: [PATCH 21/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index d62ead0498..df3a3562d6 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit d62ead04984d4da2cfdb4b4ef2bcd4ff5a0d285a +Subproject commit df3a3562d62e19670830788b8203129ae81966a9 From be87adf8fc43e8a6f60883457fb82ecb494f6546 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 16:42:00 +0200 Subject: [PATCH 22/23] Revert max workers to 3 and increase timeout in tests for now --- __device-tests__/gutenberg-editor-block-insertion.test.js | 2 +- __device-tests__/gutenberg-editor-heading.test.js | 2 +- __device-tests__/gutenberg-editor-image.test.js | 2 +- __device-tests__/gutenberg-editor-lists-end.test.js | 2 +- __device-tests__/gutenberg-editor-lists.test.js | 2 +- __device-tests__/gutenberg-editor-paragraph.test.js | 2 +- __device-tests__/gutenberg-editor-paste.test.js | 2 +- __device-tests__/gutenberg-editor-rotatation.test.js | 2 +- package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/__device-tests__/gutenberg-editor-block-insertion.test.js b/__device-tests__/gutenberg-editor-block-insertion.test.js index 2e6c1c20e5..1622915183 100644 --- a/__device-tests__/gutenberg-editor-block-insertion.test.js +++ b/__device-tests__/gutenberg-editor-block-insertion.test.js @@ -15,7 +15,7 @@ import { } from './helpers/utils'; import testData from './helpers/test-data'; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 400000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000; describe( 'Gutenberg Editor tests for Block insertion', () => { let driver; diff --git a/__device-tests__/gutenberg-editor-heading.test.js b/__device-tests__/gutenberg-editor-heading.test.js index 50f0cd0b72..c3d62168c4 100644 --- a/__device-tests__/gutenberg-editor-heading.test.js +++ b/__device-tests__/gutenberg-editor-heading.test.js @@ -14,7 +14,7 @@ import { } from './helpers/utils'; import testData from './helpers/test-data'; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 400000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000; describe( 'Gutenberg Editor tests', () => { let driver; diff --git a/__device-tests__/gutenberg-editor-image.test.js b/__device-tests__/gutenberg-editor-image.test.js index 9613271d94..e504807156 100644 --- a/__device-tests__/gutenberg-editor-image.test.js +++ b/__device-tests__/gutenberg-editor-image.test.js @@ -16,7 +16,7 @@ import { } from './helpers/utils'; import testData from './helpers/test-data'; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 400000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000; describe( 'Gutenberg Editor Image Block tests', () => { let driver; diff --git a/__device-tests__/gutenberg-editor-lists-end.test.js b/__device-tests__/gutenberg-editor-lists-end.test.js index 2c626c9e02..ad6cc22372 100644 --- a/__device-tests__/gutenberg-editor-lists-end.test.js +++ b/__device-tests__/gutenberg-editor-lists-end.test.js @@ -14,7 +14,7 @@ import { } from './helpers/utils'; import testData from './helpers/test-data'; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 400000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000; describe( 'Gutenberg Editor tests for List block (end)', () => { let driver; diff --git a/__device-tests__/gutenberg-editor-lists.test.js b/__device-tests__/gutenberg-editor-lists.test.js index d7eb91934a..ad708491e1 100644 --- a/__device-tests__/gutenberg-editor-lists.test.js +++ b/__device-tests__/gutenberg-editor-lists.test.js @@ -14,7 +14,7 @@ import { } from './helpers/utils'; import testData from './helpers/test-data'; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 400000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000; describe( 'Gutenberg Editor tests for List block', () => { let driver; diff --git a/__device-tests__/gutenberg-editor-paragraph.test.js b/__device-tests__/gutenberg-editor-paragraph.test.js index fa402e75c1..770b0368d3 100644 --- a/__device-tests__/gutenberg-editor-paragraph.test.js +++ b/__device-tests__/gutenberg-editor-paragraph.test.js @@ -16,7 +16,7 @@ import { } from './helpers/utils'; import testData from './helpers/test-data'; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 400000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000; describe( 'Gutenberg Editor tests for Paragraph Block', () => { let driver; diff --git a/__device-tests__/gutenberg-editor-paste.test.js b/__device-tests__/gutenberg-editor-paste.test.js index 40220def41..4b5926bd64 100644 --- a/__device-tests__/gutenberg-editor-paste.test.js +++ b/__device-tests__/gutenberg-editor-paste.test.js @@ -18,7 +18,7 @@ import { } from './helpers/utils'; import testData from './helpers/test-data'; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 400000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000; describe( 'Gutenberg Editor paste tests', () => { // skip iOS for now diff --git a/__device-tests__/gutenberg-editor-rotatation.test.js b/__device-tests__/gutenberg-editor-rotatation.test.js index 071d6a9903..11e1c6495d 100644 --- a/__device-tests__/gutenberg-editor-rotatation.test.js +++ b/__device-tests__/gutenberg-editor-rotatation.test.js @@ -15,7 +15,7 @@ import { } from './helpers/utils'; import testData from './helpers/test-data'; -jasmine.DEFAULT_TIMEOUT_INTERVAL = 300000; +jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000000; describe( 'Gutenberg Editor tests', () => { let driver; diff --git a/package.json b/package.json index bac07487cd..93b4789ace 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "test": "cross-env NODE_ENV=test jest --verbose --config jest.config.js", "test:inside-gb": "cross-env NODE_ENV=test jest --verbose --config jest_gb.config.js", "test:debug": "cross-env NODE_ENV=test node --inspect-brk jest --runInBand --verbose --config jest.config.js", - "device-tests": "cross-env NODE_ENV=test jest --no-cache --maxWorkers=8 --reporters=default --reporters=jest-junit --verbose --config jest_ui.config.js", + "device-tests": "cross-env NODE_ENV=test jest --no-cache --maxWorkers=3 --reporters=default --reporters=jest-junit --verbose --config jest_ui.config.js", "device-tests:local": "cross-env NODE_ENV=test jest --runInBand --reporters=default --reporters=jest-junit --detectOpenHandles --verbose --config jest_ui.config.js", "device-tests:debug": "cross-env NODE_ENV=test node $NODE_DEBUG_OPTION --inspect-brk node_modules/jest/bin/jest --runInBand --reporters=default --reporters=jest-junit --detectOpenHandles --verbose --config jest_ui.config.js", "test:e2e": "yarn test:e2e:android && yarn test:e2e:ios", From b55f55d8d585196722bb9e4b2f331e48129132d3 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Fri, 27 Sep 2019 16:42:38 +0200 Subject: [PATCH 23/23] Update gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index df3a3562d6..fea63772b6 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit df3a3562d62e19670830788b8203129ae81966a9 +Subproject commit fea63772b6e2f71e7422c999e436c44bd3914021