From 25bd9b2d9f8ace3e2e40a5017fbc9c5354f95cef Mon Sep 17 00:00:00 2001 From: Joel Dean Date: Tue, 2 Feb 2021 14:32:43 -0500 Subject: [PATCH 1/7] Added audio block test data to support UI tests. --- .../react-native-editor/__device-tests__/helpers/test-data.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/react-native-editor/__device-tests__/helpers/test-data.js b/packages/react-native-editor/__device-tests__/helpers/test-data.js index 3dbec89152c6b..b625fc3eea006 100644 --- a/packages/react-native-editor/__device-tests__/helpers/test-data.js +++ b/packages/react-native-editor/__device-tests__/helpers/test-data.js @@ -133,3 +133,7 @@ exports.coverHeightWithRemUnit = `
WordPress.zipDownload
`; + +exports.audioBlockPlaceholder = ` +
+`; From 2da49c063bf507376c313a65a873f983a663a7c6 Mon Sep 17 00:00:00 2001 From: Joel Dean Date: Tue, 2 Feb 2021 14:35:55 -0500 Subject: [PATCH 2/7] Added the audio block to the blockNames used to add blocks --- .../react-native-editor/__device-tests__/pages/editor-page.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-native-editor/__device-tests__/pages/editor-page.js b/packages/react-native-editor/__device-tests__/pages/editor-page.js index 10d401e70163d..8fd19373bba37 100644 --- a/packages/react-native-editor/__device-tests__/pages/editor-page.js +++ b/packages/react-native-editor/__device-tests__/pages/editor-page.js @@ -588,6 +588,7 @@ const blockNames = { spacer: 'Spacer', verse: 'Verse', file: 'File', + audio: 'Audio', }; module.exports = { initializeEditorPage, blockNames }; From b8217cf07951522af8fcb5c4ebd8b563cde16865 Mon Sep 17 00:00:00 2001 From: Joel Dean Date: Tue, 2 Feb 2021 14:40:04 -0500 Subject: [PATCH 3/7] Added two UI tests for the Audio Block. --- .../gutenberg-editor-audio.test.js | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js new file mode 100644 index 0000000000000..0652fa2687df7 --- /dev/null +++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js @@ -0,0 +1,33 @@ +/** + * Internal dependencies + */ +import { blockNames } from './pages/editor-page'; +import testData from './helpers/test-data'; +import { isAndroid } from './helpers/utils'; + +describe( 'Gutenberg Editor Audio Block tests', () => { + it( 'should be able to add an audio block', async () => { + await editorPage.addNewBlock( blockNames.audio ); + const block = await editorPage.getFirstBlockVisible(); + await expect( block ).toBeTruthy(); + } ); + + it( 'should add an audio file to the block', async () => { + const block = await editorPage.getFirstBlockVisible(); + + block.click(); + + if ( isAndroid ) { + await editorPage.driver.sleep( 5000 ); + } else { + await editorPage.driver.sleep( 1000 ); + } + + await editorPage.chooseMediaLibrary(); + + const html = await editorPage.getHtmlContent(); + expect( testData.audioBlockPlaceholder.toLowerCase() ).toBe( + html.toLowerCase() + ); + } ); +} ); From 56f6c82f1f4fa0883cde1514c7c62064863dadf0 Mon Sep 17 00:00:00 2001 From: Joel Dean Date: Tue, 2 Feb 2021 17:27:36 -0500 Subject: [PATCH 4/7] bumped audio block id to see if the full test suite on iOS will pass. --- .../react-native-editor/__device-tests__/helpers/test-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native-editor/__device-tests__/helpers/test-data.js b/packages/react-native-editor/__device-tests__/helpers/test-data.js index b625fc3eea006..00135400a5dce 100644 --- a/packages/react-native-editor/__device-tests__/helpers/test-data.js +++ b/packages/react-native-editor/__device-tests__/helpers/test-data.js @@ -134,6 +134,6 @@ exports.fileBlockPlaceholder = ``; -exports.audioBlockPlaceholder = ` +exports.audioBlockPlaceholder = `
`; From a1ed719a70d14db7b168184c77238bf9c756b7a8 Mon Sep 17 00:00:00 2001 From: Joel Dean Date: Thu, 4 Feb 2021 22:34:06 -0500 Subject: [PATCH 5/7] isAndroid is not a variable, it is a property so that was corrected. --- .../__device-tests__/gutenberg-editor-audio.test.js | 2 +- .../__device-tests__/gutenberg-editor-file-@canary.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js index 0652fa2687df7..9aa08c1bdf192 100644 --- a/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js +++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js @@ -17,7 +17,7 @@ describe( 'Gutenberg Editor Audio Block tests', () => { block.click(); - if ( isAndroid ) { + if ( isAndroid() ) { await editorPage.driver.sleep( 5000 ); } else { await editorPage.driver.sleep( 1000 ); diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-file-@canary.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-file-@canary.test.js index 8f6857f493625..f459a43b256e1 100644 --- a/packages/react-native-editor/__device-tests__/gutenberg-editor-file-@canary.test.js +++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-file-@canary.test.js @@ -17,7 +17,7 @@ describe( 'Gutenberg Editor File Block tests', () => { block.click(); - if ( isAndroid ) { + if ( isAndroid() ) { await editorPage.driver.sleep( 5000 ); } else { await editorPage.driver.sleep( 1000 ); From c69bdf8dd9f3660397315ca3f403c0f0df557d55 Mon Sep 17 00:00:00 2001 From: Joel Dean Date: Thu, 4 Feb 2021 22:40:23 -0500 Subject: [PATCH 6/7] inverted the expected assertion content for the File and Audio block. --- .../__device-tests__/gutenberg-editor-audio.test.js | 5 +++-- .../__device-tests__/gutenberg-editor-file-@canary.test.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js index 9aa08c1bdf192..ea0bd53e56242 100644 --- a/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js +++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-audio.test.js @@ -26,8 +26,9 @@ describe( 'Gutenberg Editor Audio Block tests', () => { await editorPage.chooseMediaLibrary(); const html = await editorPage.getHtmlContent(); - expect( testData.audioBlockPlaceholder.toLowerCase() ).toBe( - html.toLowerCase() + + expect( html.toLowerCase() ).toBe( + testData.audioBlockPlaceholder.toLowerCase() ); } ); } ); diff --git a/packages/react-native-editor/__device-tests__/gutenberg-editor-file-@canary.test.js b/packages/react-native-editor/__device-tests__/gutenberg-editor-file-@canary.test.js index f459a43b256e1..c208fdbcdfdd3 100644 --- a/packages/react-native-editor/__device-tests__/gutenberg-editor-file-@canary.test.js +++ b/packages/react-native-editor/__device-tests__/gutenberg-editor-file-@canary.test.js @@ -26,8 +26,9 @@ describe( 'Gutenberg Editor File Block tests', () => { await editorPage.chooseMediaLibrary(); const html = await editorPage.getHtmlContent(); - expect( testData.fileBlockPlaceholder.toLowerCase() ).toBe( - html.toLowerCase() + + expect( html.toLowerCase() ).toBe( + testData.fileBlockPlaceholder.toLowerCase() ); } ); } ); From 68f47abd502d8f3b3810c9cfdf84f9f0ae69465b Mon Sep 17 00:00:00 2001 From: Joel Dean Date: Thu, 4 Feb 2021 22:55:13 -0500 Subject: [PATCH 7/7] Updated the id of the media item that is returned from the test WP Media --- .../app/src/main/java/com/gutenberg/MainApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java index dd9519b4ba2cd..62f9fd4c89bf2 100644 --- a/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java +++ b/packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainApplication.java @@ -85,7 +85,7 @@ public void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelected rnMediaList.add(new Media(3, "https://wordpress.org/latest.zip", "zip", "WordPress latest version", "WordPress.zip")); break; case AUDIO: - rnMediaList.add(new Media(4, "https://cldup.com/59IrU0WJtq.mp3", "audio", "Summer presto", "")); + rnMediaList.add(new Media(5, "https://cldup.com/59IrU0WJtq.mp3", "audio", "Summer presto", "")); break; } mediaSelectedCallback.onMediaFileSelected(rnMediaList);