| Index: chrome/test/data/extensions/api_test/file_manager_browsertest/test_cases.js
|
| diff --git a/chrome/test/data/extensions/api_test/file_manager_browsertest/test_cases.js b/chrome/test/data/extensions/api_test/file_manager_browsertest/test_cases.js
|
| index ef150544aa016d73b1b603ce00464a14ab186baa..b7d14c8a996c41da79e42e46fa0146131e7d247f 100644
|
| --- a/chrome/test/data/extensions/api_test/file_manager_browsertest/test_cases.js
|
| +++ b/chrome/test/data/extensions/api_test/file_manager_browsertest/test_cases.js
|
| @@ -369,8 +369,9 @@ testcase.intermediate.keyboardCopy = function(path, callback) {
|
| // Verify the result.
|
| function(fileList) {
|
| chrome.test.assertTrue(isCopyPresent(filename, fileList));
|
| - checkIfNoErrorsOccured(chrome.test.succeed);
|
| - }
|
| + checkIfNoErrorsOccured(steps.shift());
|
| + },
|
| + function() {}
|
| ];
|
| steps = steps.map(function(f) { return chrome.test.callbackPass(f); });
|
| steps.shift()();
|
| @@ -391,6 +392,7 @@ testcase.intermediate.keyboardDelete = function(path) {
|
| }
|
|
|
| var filename = 'world.ogv';
|
| + var directoryName = 'photos';
|
| var appId, fileListBefore;
|
| var steps = [
|
| // Set up File Manager.
|
| @@ -414,11 +416,29 @@ testcase.intermediate.keyboardDelete = function(path) {
|
| callRemoteTestUtil('waitForFileListChange', appId,
|
| [fileListBefore.length], steps.shift());
|
| },
|
| - // Verify the result.
|
| + // Delete the directory.
|
| function(fileList) {
|
| + fileListBefore = fileList;
|
| chrome.test.assertFalse(isFilePresent(filename, fileList));
|
| - checkIfNoErrorsOccured(chrome.test.succeed);
|
| - }
|
| + chrome.test.assertTrue(isFilePresent(directoryName, fileList));
|
| + callRemoteTestUtil('deleteFile', appId, [directoryName], steps.shift());
|
| + },
|
| + // Reply to a dialog.
|
| + function(result) {
|
| + chrome.test.assertTrue(result);
|
| + callRemoteTestUtil('waitAndAcceptDialog', appId, [], steps.shift());
|
| + },
|
| + // Wait for a file list change.
|
| + function() {
|
| + callRemoteTestUtil('waitForFileListChange', appId,
|
| + [fileListBefore.length], steps.shift());
|
| + },
|
| + // Verify the result.
|
| + function(fileList) {
|
| + chrome.test.assertFalse(isFilePresent(directoryName, fileList));
|
| + checkIfNoErrorsOccured(steps.shift());
|
| + },
|
| + function() {}
|
| ];
|
| steps = steps.map(function(f) { return chrome.test.callbackPass(f); });
|
| steps.shift()();
|
|
|