Merge branch 'develop' into fix/caret-position-after-inline-paste3

README.md

@@ -141,6 +141,8 @@ and for android run,
 
 Note, you might experience problems that seem to be related to the tests starting the Appium server, for example errors that say `Connection Refused`, `Connection Reset` or `The requested environment is not available`. Sorry about that this is still a WIP, you can manually start the Appium server via [appium desktop](https://github.com/appium/appium-desktop) or the cli, then change the port number in the tests while optionally commenting out related code in the `beforeAll` and `afterAll` block. 
 
+For a more detailed outline of the UI tests and how to get started writing one please visit the [Project Wiki](https://github.com/wordpress-mobile/gutenberg-mobile/wiki/Getting-started-with-UI-tests)
+
 ## Static analysis and code style
 
 The project includes a linter (`eslint`) to perform codestyle and static analysis of the code. The configuration used is the same as [the one in the Gutenberg project](https://github.com/WordPress/gutenberg/blob/master/eslint/config.js). To perform the check, run:

RELEASE-NOTES.txt

@@ -1,2 +1,5 @@
 1.6.0
 ------
+* Fixed issue with link settings where “Open in New Tab” was always OFF on open.
+- A new block is available: video block.
+* Added UI to display a warning when a block has invalid content.

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

@@ -0,0 +1,71 @@
+/**
+ * @format
+ * */
+
+/**
+ * Internal dependencies
+ */
+import EditorPage from './pages/editor-page';
+import {
+	setupDriver,
+	isLocalEnvironment,
+	stopDriver,
+	isAndroid,
+} from './helpers/utils';
+import testData from './helpers/test-data';
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 240000;
+
+describe( 'Gutenberg Editor tests', () => {
+	let driver;
+	let editorPage;
+	let allPassed = true;
+
+	// 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 end a List block', async () => {
+		await editorPage.addNewListBlock();
+		const listBlockElement = await editorPage.getListBlockAtPosition( 1 );
+
+		// Click List block on Android to force EditText focus
+		if ( isAndroid() ) {
+			await listBlockElement.click();
+		}
+
+		// Send the first list item text
+		await editorPage.sendTextToListBlock( listBlockElement, testData.listItem1 );
+
+		// send an Enter
+		await editorPage.sendTextToListBlock( listBlockElement, '\n' );
+
+		// send an Enter
+		await editorPage.sendTextToListBlock( listBlockElement, '\n' );
+
+		await editorPage.verifyHtmlContent( testData.listEndedHtml );
+	} );
+
+	afterAll( async () => {
+		if ( ! isLocalEnvironment() ) {
+			driver.sauceJobStatus( allPassed );
+		}
+		await stopDriver( driver );
+	} );
+} );

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

@@ -0,0 +1,72 @@
+/**
+ * @format
+ * */
+
+/**
+ * Internal dependencies
+ */
+import EditorPage from './pages/editor-page';
+import {
+	setupDriver,
+	isLocalEnvironment,
+	stopDriver,
+	isAndroid,
+} from './helpers/utils';
+import testData from './helpers/test-data';
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 240000;
+
+describe( 'Gutenberg Editor tests', () => {
+	let driver;
+	let editorPage;
+	let allPassed = true;
+
+	// 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 new List block', async () => {
+		await editorPage.addNewListBlock();
+		const listBlockElement = await editorPage.getListBlockAtPosition( 1 );
+
+		// Click List block on Android to force EditText focus
+		if ( isAndroid() ) {
+			await listBlockElement.click();
+		}
+
+		// Send the first list item text
+		await editorPage.sendTextToListBlock( listBlockElement, testData.listItem1 );
+
+		// send an Enter
+		await editorPage.sendTextToListBlock( listBlockElement, '\n' );
+
+		// Send the second list item text
+		await editorPage.sendTextToListBlock( listBlockElement, testData.listItem2 );
+
+		// switch to html and verify html
+		await editorPage.verifyHtmlContent( testData.listHtml );
+	} );
+
+	afterAll( async () => {
+		if ( ! isLocalEnvironment() ) {
+			driver.sauceJobStatus( allPassed );
+		}
+		await stopDriver( driver );
+	} );
+} );

__device-tests__/gutenberg-editor.test.js

@@ -6,10 +6,17 @@
  * Internal dependencies
  */
 import EditorPage from './pages/editor-page';
-import ParagraphBlockInteraction from './blocks/paragraph-block-interaction';
-import { setupDriver, isLocalEnvironment, timer, stopDriver } from './helpers/utils';
+import {
+	setupDriver,
+	isLocalEnvironment,
+	clickMiddleOfElement,
+	clickBeginningOfElement,
+	stopDriver,
+	isAndroid,
+} from './helpers/utils';
+import testData from './helpers/test-data';
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000;
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 240000;
 
 describe( 'Gutenberg Editor tests', () => {
 	let driver;
@@ -37,11 +44,79 @@ describe( 'Gutenberg Editor tests', () => {
 	} );
 
 	it( 'should be able to add a new Paragraph block', async () => {
-		const paragraphBlockInteraction = new ParagraphBlockInteraction( driver );
-		await editorPage.addNewBlock( paragraphBlockInteraction );
-		await paragraphBlockInteraction.sendText( 'Hello Gutenberg!' );
-		await timer( 3000 );
-		expect( await paragraphBlockInteraction.getText() ).toBe( 'Hello Gutenberg!' );
+		await editorPage.addNewParagraphBlock();
+		const paragraphBlockElement = await editorPage.getParagraphBlockAtPosition( 1 );
+		if ( isAndroid() ) {
+			await paragraphBlockElement.click();
+		}
+		await editorPage.sendTextToParagraphBlock( paragraphBlockElement, testData.shortText );
+		await editorPage.removeParagraphBlockAtPosition( 1 );
+	} );
+
+	it( 'should be able to split one paragraph block into two', async () => {
+		await editorPage.addNewParagraphBlock();
+		const paragraphBlockElement = await editorPage.getParagraphBlockAtPosition( 1 );
+		if ( isAndroid() ) {
+			await paragraphBlockElement.click();
+		}
+		await editorPage.sendTextToParagraphBlock( paragraphBlockElement, testData.shortText );
+		const textViewElement = await editorPage.getTextViewForParagraphBlock( paragraphBlockElement );
+		await clickMiddleOfElement( driver, textViewElement );
+		await editorPage.sendTextToParagraphBlock( paragraphBlockElement, '\n' );
+		expect( await editorPage.hasParagraphBlockAtPosition( 1 ) && await editorPage.hasParagraphBlockAtPosition( 2 ) )
+			.toBe( true );
+
+		const text0 = await editorPage.getTextForParagraphBlockAtPosition( 1 );
+		const text1 = await editorPage.getTextForParagraphBlockAtPosition( 2 );
+		expect( text0 ).not.toBe( '' );
+		expect( text1 ).not.toBe( '' );
+		expect( testData.shortText ).toMatch( new RegExp( `${ text0 + text1 }|${ text0 } ${ text1 }` ) );
+
+		await editorPage.removeParagraphBlockAtPosition( 2 );
+		await editorPage.removeParagraphBlockAtPosition( 1 );
+	} );
+
+	it( 'should be able to merge 2 paragraph blocks into 1', async () => {
+		await editorPage.addNewParagraphBlock();
+		let paragraphBlockElement = await editorPage.getParagraphBlockAtPosition( 1 );
+		if ( isAndroid() ) {
+			await paragraphBlockElement.click();
+		}
+		await editorPage.sendTextToParagraphBlock( paragraphBlockElement, testData.shortText );
+		let textViewElement = await editorPage.getTextViewForParagraphBlock( paragraphBlockElement );
+		await clickMiddleOfElement( driver, textViewElement );
+		await editorPage.sendTextToParagraphBlock( paragraphBlockElement, '\n' );
+		expect( await editorPage.hasParagraphBlockAtPosition( 1 ) && await editorPage.hasParagraphBlockAtPosition( 2 ) )
+			.toBe( true );
+
+		const text0 = await editorPage.getTextForParagraphBlockAtPosition( 1 );
+		const text1 = await editorPage.getTextForParagraphBlockAtPosition( 2 );
+		paragraphBlockElement = await editorPage.getParagraphBlockAtPosition( 2 );
+		if ( isAndroid() ) {
+			await paragraphBlockElement.click();
+		}
+		textViewElement = await editorPage.getTextViewForParagraphBlock( paragraphBlockElement );
+		await clickBeginningOfElement( driver, textViewElement );
+		await editorPage.sendTextToParagraphBlock( paragraphBlockElement, '\u0008' );
+
+		const text = await editorPage.getTextForParagraphBlockAtPosition( 1 );
+		expect( text0 + text1 ).toMatch( text );
+
+		expect( await editorPage.hasParagraphBlockAtPosition( 2 ) ).toBe( false );
+		await editorPage.removeParagraphBlockAtPosition( 1 );
+	} );
+
+	it( 'should be able to create a post with multiple paragraph blocks', async () => {
+		await editorPage.addNewParagraphBlock();
+		const paragraphBlockElement = await editorPage.getParagraphBlockAtPosition( 1 );
+		if ( isAndroid() ) {
+			await paragraphBlockElement.click();
+		}
+		await editorPage.sendTextToParagraphBlockAtPosition( 1, testData.longText );
+
+		for ( let i = 4; i > 0; i-- ) {
+			await editorPage.removeParagraphBlockAtPosition( i );
+		}
 	} );
 
 	afterAll( async () => {