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

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

Issue 881463003: Files.app: Add a deduplication step to avoid importing duplicate media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to master; fix Banners test. 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
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 d58e5deb553bef311dafa8abbc7756476b88f642..01dbc351e1a0d0f5c700ef366f4dd54fe2e5529f 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
@@ -23,25 +23,22 @@ var destinationVolume;
/** @type {!TestCallRecorder} */
var commandUpdateRecorder;
-function setUp() {
- // Set up string assets.
- loadTimeData.data = {
- CLOUD_IMPORT_BUTTON_LABEL: 'Import it!',
- CLOUD_IMPORT_INSUFFICIENT_SPACE_BUTTON_LABEL: 'Not enough space!',
- CLOUD_IMPORT_SCANNING_BUTTON_LABEL: 'Scanning... ...!'
- };
+// Set up string assets.
+loadTimeData.data = {
+ CLOUD_IMPORT_BUTTON_LABEL: 'Import it!',
+ CLOUD_IMPORT_EMPTY_SCAN_BUTTON_LABEL: 'No new media',
+ CLOUD_IMPORT_INSUFFICIENT_SPACE_BUTTON_LABEL: 'Not enough space!',
+ CLOUD_IMPORT_SCANNING_BUTTON_LABEL: 'Scanning... ...!',
+ DRIVE_DIRECTORY_LABEL: 'My Drive',
+ DOWNLOADS_DIRECTORY_LABEL: 'Downloads'
+};
+function setUp() {
// Stub out metrics support.
metrics = {
recordEnum: function() {}
};
- // Set up string assets.
- loadTimeData.data = {
- DRIVE_DIRECTORY_LABEL: 'My Drive',
- DOWNLOADS_DIRECTORY_LABEL: 'Downloads'
- };
-
commandUpdateRecorder = new TestCallRecorder();
volumeManager = new MockVolumeManager();
@@ -175,8 +172,9 @@ function testGetCommandUpdate_CanExecuteAfterScanIsFinalized() {
],
'/DCIM');
+ var fileSystem = new MockFileSystem('testFs');
mediaScanner.fileEntries.push(
- new MockFileEntry(null, '/DCIM/photos0/IMG00001.jpg', {size: 0}));
+ new MockFileEntry(fileSystem, '/DCIM/photos0/IMG00001.jpg', {size: 0}));
controller.getCommandUpdate();
mediaScanner.finalizeScans();

Powered by Google App Engine
This is Rietveld 408576698