| Index: chrome/test/data/extensions/platform_apps/web_view/edit_commands_no_menu/embedder.js
|
| diff --git a/chrome/test/data/extensions/platform_apps/web_view/edit_commands/embedder.js b/chrome/test/data/extensions/platform_apps/web_view/edit_commands_no_menu/embedder.js
|
| similarity index 60%
|
| copy from chrome/test/data/extensions/platform_apps/web_view/edit_commands/embedder.js
|
| copy to chrome/test/data/extensions/platform_apps/web_view/edit_commands_no_menu/embedder.js
|
| index 506dd649372aafc536a9b716e51b13c8b9100a3a..123cb40fda9584b081bd7ab75f1f5f201313c549 100644
|
| --- a/chrome/test/data/extensions/platform_apps/web_view/edit_commands/embedder.js
|
| +++ b/chrome/test/data/extensions/platform_apps/web_view/edit_commands_no_menu/embedder.js
|
| @@ -10,7 +10,7 @@ embedder.guestURL = '';
|
| embedder.setUp = function(config) {
|
| embedder.baseGuestURL = 'http://localhost:' + config.testServer.port;
|
| embedder.guestURL = embedder.baseGuestURL +
|
| - '/files/extensions/platform_apps/web_view/edit_commands' +
|
| + '/files/extensions/platform_apps/web_view/edit_commands_no_menu' +
|
| '/guest.html';
|
| chrome.test.log('Guest url is: ' + embedder.guestURL);
|
| };
|
| @@ -37,19 +37,17 @@ embedder.waitForResponseFromGuest_ =
|
| var data = JSON.parse(e.data);
|
| var response = data[0];
|
| if (response == 'channel-created') {
|
| - channelCreationCallback(webview);
|
| + channelCreationCallback();
|
| chrome.test.sendMessage('connected');
|
| return;
|
| }
|
| - if (response == 'selected-all') {
|
| - chrome.test.sendMessage('selected-all');
|
| - return;
|
| - }
|
| + console.log('response: ' + response);
|
| var name = data[1];
|
| if ((response != expectedResponse) || (name != testName)) {
|
| return;
|
| }
|
| responseCallback();
|
| + window.removeEventListener('message', onPostMessageReceived);
|
| };
|
| window.addEventListener('message', onPostMessageReceived);
|
|
|
| @@ -57,6 +55,7 @@ embedder.waitForResponseFromGuest_ =
|
| // This creates a communication channel with the guest.
|
| webview.contentWindow.postMessage(
|
| JSON.stringify(['create-channel', testName]), '*');
|
| + webview.removeEventListener('loadstop', onWebViewLoadStop);
|
| };
|
| webview.addEventListener('loadstop', onWebViewLoadStop);
|
| webview.setAttribute('src', embedder.guestURL);
|
| @@ -64,36 +63,20 @@ embedder.waitForResponseFromGuest_ =
|
|
|
| // Tests begin.
|
|
|
| -// The embedder has to initiate a post message so that the guest can get a
|
| -// reference to embedder to send the reply back.
|
| -
|
| -embedder.testEditCommands_ = function(testName,
|
| - channelCreationCallback,
|
| - expectedResponse,
|
| - responseCallback) {
|
| - var webview = embedder.setUpGuest_();
|
| -
|
| - embedder.waitForResponseFromGuest_(webview,
|
| - testName,
|
| - channelCreationCallback,
|
| - expectedResponse,
|
| - responseCallback);
|
| -};
|
| -
|
| -embedder.tests.testEditCommandsWhenFocused =
|
| - function testEditCommandsWhenFocused() {
|
| - embedder.testEditCommands_('testEditCommandsWhenFocused', function(webview) {
|
| - // Focus the <webview> and select all the text when a communicaton channel
|
| - // has been established.
|
| +embedder.tests.testStartOfLineWhenFocused =
|
| + function testStartOfLineWhenFocused(webview) {
|
| + embedder.waitForResponseFromGuest_(webview, 'testStartOfLineWhenFocused',
|
| + function() {
|
| webview.focus();
|
| - webview.contentWindow.postMessage(JSON.stringify(['select-all']), '*');
|
| - }, 'copy', function() {
|
| - chrome.test.sendMessage('copy');
|
| + webview.contentWindow.postMessage(JSON.stringify(['end-of-line']), '*');
|
| + }, 'caret-position-0', function() {
|
| + chrome.test.sendMessage('StartOfLine');
|
| });
|
| - }
|
| +}
|
|
|
| embedder.startTests = function startTests() {
|
| - embedder.tests.testEditCommandsWhenFocused();
|
| + var webview = embedder.setUpGuest_();
|
| + embedder.tests.testStartOfLineWhenFocused(webview);
|
| };
|
|
|
| onload = function() {
|
|
|