Merge branch 'master' of https://github.com/wordpress-mobile/gutenber…

…g-mobile into try/introduce-split-on-enter-basic-logic
WordPress · Sep 20, 2018 · b2b0528 · b2b0528
2 parents 50105f4 + 403d389
commit b2b0528
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/gutenberg b/gutenberg
diff --git a/jest.config.js b/jest.config.js
@@ -15,7 +15,12 @@ module.exports = {
 	verbose: true,
 	preset: 'jest-react-native',
 	testEnvironment: 'jsdom',
-	testPathIgnorePatterns: [ '/node_modules/', '/gutenberg/test/', '/gutenberg/packages/' ],
+	testPathIgnorePatterns: [
+		'/node_modules/',
+		'/gutenberg/gutenberg-mobile/',
+		'/gutenberg/test/',
+		'/gutenberg/packages/',
+	],
 	moduleFileExtensions: [
 		'native.js',
 		'android.js',
@@ -31,6 +36,7 @@ module.exports = {
 		'jsx',
 		'node',
 	],
+	modulePathIgnorePatterns: [ '<rootDir>/gutenberg/gutenberg-mobile' ],
 	moduleNameMapper: {
 		'@wordpress\\/(block-serialization-default-parser|blocks|data|element|deprecated|editor|block-library|components|keycodes|url|a11y|viewport|core-data|api-fetch|nux)$':
 			'<rootDir>/gutenberg/packages/$1/src/index',

diff --git a/rn-cli.config.js b/rn-cli.config.js
@@ -10,6 +10,7 @@ module.exports = {
 		// are automagically resolved by Metro so, there is no list of them anywhere.
 		return blacklist( [
 			/gutenberg\/packages\/(autop|compose|deprecated|hooks|i18n|is-shallow-equal|blob|redux-routine)\/.*/,
+			/gutenberg\/gutenberg-mobile\/.*/,
 		] );
 	},
 	getTransformModulePath() {
+3 −0		packages/block-library/src/code/edit.native.js
+3 −2		packages/block-library/src/more/edit.native.js
+22 −9		packages/editor/src/components/inner-blocks/index.js
+25 −0		test/e2e/specs/__snapshots__/inner-blocks-templates.test.js.snap
+54 −0		test/e2e/specs/inner-blocks-templates.test.js
+22 −0		test/e2e/test-plugins/inner-blocks-templates.php
+48 −0		test/e2e/test-plugins/inner-blocks-templates/index.js