Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: ui/file_manager/file_manager/foreground/js/import_controller_unittest.js

Issue 876203003: Don't navigate to destination on import. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/file_manager/file_manager/foreground/js/import_controller.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/file_manager/file_manager/foreground/js/import_controller_unittest.js
diff --git a/ui/file_manager/file_manager/foreground/js/import_controller_unittest.js b/ui/file_manager/file_manager/foreground/js/import_controller_unittest.js
index 01dbc351e1a0d0f5c700ef366f4dd54fe2e5529f..2fbf059317dd31265886be2ef25881524270d762 100644
--- a/ui/file_manager/file_manager/foreground/js/import_controller_unittest.js
+++ b/ui/file_manager/file_manager/foreground/js/import_controller_unittest.js
@@ -228,64 +228,6 @@ function testExecute_StartsImport() {
mediaImporter.assertImportsStarted(1);
}
-function testExecute_opensDestination(callback) {
- var controller = createController(
- VolumeManagerCommon.VolumeType.MTP,
- 'mtp-volume',
- [
- '/DCIM/',
- '/DCIM/photos0/',
- '/DCIM/photos0/IMG00001.jpg',
- '/DCIM/photos0/IMG00002.jpg',
- '/DCIM/photos1/',
- '/DCIM/photos1/IMG00001.jpg',
- '/DCIM/photos1/IMG00003.jpg'
- ],
- '/DCIM');
-
- /**
- * Sets up an import destination.
- * @return {!Promise<!DirectoryEntry>}
- */
- var makeDestination = function() {
- return new Promise(function(resolve, reject) {
- window.webkitRequestFileSystem(
- TEMPORARY,
- 1024*1024,
- function(fs) {
- fs.root.getDirectory(
- 'foo',
- {create:true},
- function(directoryEntry) {
- resolve(directoryEntry);
- },
- reject);
- },
- reject);
- });
- };
-
- reportPromise(
- makeDestination().then(
- // Kicks off an import to the given destination, then verifies that
- // the import controller moved the user to the correct location.
- function(destination) {
- mediaImporter.setDestination(destination);
-
- controller.getCommandUpdate();
- mediaScanner.finalizeScans();
- controller.getCommandUpdate();
- controller.execute();
-
- return environment.whenCurrentDirectoryIsSet().then(
- function(directory) {
- assertEquals(destination, directory);
- });
- }),
- callback);
-
-}
-
/**
* A stub that just provides interfaces from ImportTask that are required by
* these tests.
« no previous file with comments | « ui/file_manager/file_manager/foreground/js/import_controller.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698