| Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| index 08333701e8ac700ed0a0c316c51e7bf7076b0548..7ed70f7cf4bc690fd7ee01e4e34a258d858f5d19 100644
|
| --- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| +++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| @@ -92,17 +92,22 @@
|
|
|
| /** Tests feedback once a page loads. */
|
| TEST_F('BackgroundTest', 'InitialFeedback', function() {
|
| - cvox.ChromeVox.tts.expectSpeech('start', testDone);
|
| -
|
| - this.runWithTab(function() {/*!
|
| + cvox.ChromeVox.tts.expectSpeech('start', function() {
|
| + global.backgroundObj.onGotCommand('nextLine');
|
| + }, true);
|
| + cvox.ChromeVox.tts.expectSpeech('end', testDone, true);
|
| +
|
| + this.runWithDocument(function() {/*!
|
| <p>start
|
| <p>end
|
| - */});
|
| + */},
|
| + function() {});
|
| });
|
|
|
| /** Tests consistency of navigating forward and backward. */
|
| TEST_F('BackgroundTest', 'ForwardBackwardNavigation', function() {
|
| - this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
|
| + cvox.ChromeVox.tts.expectSpeech('start', null, true);
|
| + this.runWithDocument(this.linksAndHeadingsDoc, function() {
|
| var doCmd = this.doCmd.bind(this);
|
| var expectAfter =
|
| cvox.ChromeVox.tts.expectSpeechAfter.bind(cvox.ChromeVox.tts);
|
| @@ -132,7 +137,8 @@
|
| });
|
|
|
| TEST_F('BackgroundTest', 'CaretNavigation', function() {
|
| - this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
|
| + cvox.ChromeVox.tts.expectSpeech('start', null, true);
|
| + this.runWithDocument(this.linksAndHeadingsDoc, function() {
|
| var doCmd = this.doCmd.bind(this);
|
| var expectAfter =
|
| cvox.ChromeVox.tts.expectSpeechAfter.bind(cvox.ChromeVox.tts);
|
| @@ -162,7 +168,7 @@
|
|
|
| // Flaky: http://crbug.com/451362
|
| TEST_F('BackgroundTest', 'DISABLED_SelectSingleBasic', function() {
|
| - this.runWithLoadedTree(this.formsDoc, function(tabId) {
|
| + this.runWithDocument(this.formsDoc, function(tabId) {
|
| var sendDownToSelect =
|
| this.sendKeyToElement.bind(this, tabId, 'Down', '#fruitSelect');
|
| var expect = cvox.ChromeVox.tts.expectSpeech.bind(cvox.ChromeVox.tts);
|
| @@ -174,7 +180,8 @@
|
| });
|
|
|
| TEST_F('BackgroundTest', 'ContinuousRead', function() {
|
| - this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
|
| + cvox.ChromeVox.tts.expectSpeech('start', null, true);
|
| + this.runWithDocument(this.linksAndHeadingsDoc, function() {
|
| var doCmd = this.doCmd.bind(this);
|
| var expect =
|
| cvox.ChromeVox.tts.expectSpeechAfter.bind(cvox.ChromeVox.tts);
|
|
|