Index: third_party/WebKit/LayoutTests/http/tests/cachestorage/script-tests/cache-delete.js |
diff --git a/third_party/WebKit/LayoutTests/http/tests/cachestorage/script-tests/cache-delete.js b/third_party/WebKit/LayoutTests/http/tests/cachestorage/script-tests/cache-delete.js |
index 5bdc782c6bfa2e3d4d1bc25732dd60151ea08864..b2ca5b388a6b15850ea13f5d587175a849cb2ca3 100644 |
--- a/third_party/WebKit/LayoutTests/http/tests/cachestorage/script-tests/cache-delete.js |
+++ b/third_party/WebKit/LayoutTests/http/tests/cachestorage/script-tests/cache-delete.js |
@@ -64,33 +64,27 @@ cache_test(function(cache) { |
}); |
}, 'Cache.delete with a non-existent entry'); |
-var cache_entries = { |
zino
2016/02/16 06:45:44
I'm not sure but these codes looks unnecessary.
nhiroki
2016/02/16 08:47:23
Acknowledged.
|
- a: { |
- request: new Request('http://example.com/abc'), |
- response: new Response('') |
- }, |
- |
- b: { |
- request: new Request('http://example.com/b'), |
- response: new Response('') |
+prepopulated_cache_test(simple_entries, function(cache, entries) { |
+ return cache.matchAll(entries.a_with_query.request, |
+ { ignoreSearch: true }) |
+ .then(function(result) { |
+ assert_response_array_equivalent( |
+ result, |
+ [ |
+ entries.a.response, |
+ entries.a_with_query.response |
+ ]); |
+ return cache.delete(entries.a_with_query.request, |
+ { ignoreSearch: true }); |
nhiroki
2016/02/16 08:47:23
Can you add a test for the case where 'ignoreSearc
zino
2016/02/16 09:23:09
Done.
|
+ }) |
+ .then(function(result) { |
+ return cache.matchAll(entries.a_with_query.request, |
+ { ignoreSearch: true }); |
+ }) |
+ .then(function(result) { |
+ assert_response_array_equivalent(result, []); |
+ }); |
}, |
- |
- a_with_query: { |
- request: new Request('http://example.com/abc?q=r'), |
- response: new Response('') |
- } |
-}; |
- |
-function prepopulated_cache_test(test_function, description) { |
zino
2016/02/16 06:45:44
This test doesn't run actually. So, I removed it.
nhiroki
2016/02/16 08:47:23
Acknowledged.
|
- cache_test(function(cache) { |
- return Promise.all(Object.keys(cache_entries).map(function(k) { |
- return cache.put(cache_entries[k].request.clone(), |
- cache_entries[k].response.clone()); |
- })) |
- .then(function() { |
- return test_function(cache); |
- }); |
- }, description); |
-} |
+ 'Cache.delete with ignoreSearch option (request with search parameters)'); |
done(); |