[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

abarth at webkit.org abarth at webkit.org
Wed Dec 22 12:48:19 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit dd3d617e53abc9544c5801ac67280626f0669370
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 21:26:00 2010 +0000

    2010-08-30  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Update LayoutTest for file inputs to show "pass" for fakepath
            https://bugs.webkit.org/show_bug.cgi?id=44882
    
            As requested by Alexey.
    
            * editing/pasteboard/file-input-files-access-expected.txt:
            * editing/pasteboard/script-tests/file-input-files-access.js:
            (draggingPathsShouldResultInFiles):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66409 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d4316d0..b3bae46 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-30  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Update LayoutTest for file inputs to show "pass" for fakepath
+        https://bugs.webkit.org/show_bug.cgi?id=44882
+
+        As requested by Alexey.
+
+        * editing/pasteboard/file-input-files-access-expected.txt:
+        * editing/pasteboard/script-tests/file-input-files-access.js:
+        (draggingPathsShouldResultInFiles):
+
 2010-08-30  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt b/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt
index ffdfcbe..1e013a3 100644
--- a/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt
+++ b/LayoutTests/editing/pasteboard/file-input-files-access-expected.txt
@@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Dragging a single (non-existant) file to a file input control:
-FAIL fileInput.value should be DRTFakeFile. Was C:\fakepath\DRTFakeFile.
+PASS fileInput.value is "C:\\fakepath\\DRTFakeFile"
 PASS fileInput.files.length is 1
 PASS fileInput.files[0].name is "DRTFakeFile"
 PASS fileInput.files[0].type is ""
@@ -12,7 +12,7 @@ PASS fileInput.files[0].size is 0
 PASS fileInput.files[0].fileName is "DRTFakeFile"
 PASS fileInput.files[0].fileSize is 0
 Dragging a real file to a file input control:
-FAIL fileInput.value should be apple.gif. Was C:\fakepath\apple.gif.
+PASS fileInput.value is "C:\\fakepath\\apple.gif"
 PASS fileInput.files.length is 1
 PASS fileInput.files[0].name is "apple.gif"
 PASS fileInput.files[0].type is "image/gif"
@@ -34,7 +34,7 @@ Dragging a directory and a file onto a single-file input control:
 FAIL fileInput.value should be . Was C:\fakepath\directory-for-dragging.
 FAIL fileInput.files.length should be 0. Was 1.
 Dragging two files to a multi-file input control:
-FAIL fileInput.value should be apple.gif. Was C:\fakepath\apple.gif.
+PASS fileInput.value is "C:\\fakepath\\apple.gif"
 PASS fileInput.files.length is 2
 PASS fileInput.files[0].name is "apple.gif"
 PASS fileInput.files[0].type is "image/gif"
diff --git a/LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js b/LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js
index 4ed18d1..6fbe405 100644
--- a/LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js
+++ b/LayoutTests/editing/pasteboard/script-tests/file-input-files-access.js
@@ -45,7 +45,7 @@ function draggingPathsShouldResultInFiles(pathsArray, filesArray)
 {
     dragFilesOntoInput(pathsArray);
     // WebKit seems to always take the first file in the dragged list as .value:
-    shouldBeEqualToString("fileInput.value", filesArray[0] ? filesArray[0]['name'] : '');
+    shouldBeEqualToString("fileInput.value", filesArray[0] ? "C:\\fakepath\\" + filesArray[0]['name'] : '');
     filesShouldBe(filesArray);
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list