Chromium Code Reviews| 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..86a9f5e4ca49d20ceecc6ebffa794f4952ff2249 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,52 @@ cache_test(function(cache) { |
| }); |
| }, 'Cache.delete with a non-existent entry'); |
| -var cache_entries = { |
| - a: { |
| - request: new Request('http://example.com/abc'), |
| - 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 }); |
| + }) |
| + .then(function(result) { |
| + return cache.matchAll(entries.a_with_query.request, |
| + { ignoreSearch: true }); |
| + }) |
| + .then(function(result) { |
| + assert_response_array_equivalent(result, []); |
| + }); |
| }, |
| + 'Cache.delete with ignoreSearch option (request with search parameters)'); |
| - 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 |
| + ]); |
| + // If cache.delete() takes "ignoreSearch: false" explicitly, the |
| + // method has the same behavior when not taking ignoreSearch option. |
|
jkarlin
2016/02/16 14:54:37
Perhaps:
// cache.delete()'s behavior should be th
zino
2016/02/18 08:12:47
Done.
|
| + return cache.delete(entries.a_with_query.request, |
| + { ignoreSearch: false }); |
| + }) |
| + .then(function(result) { |
| + return cache.matchAll(entries.a_with_query.request, |
| + { ignoreSearch: true }); |
| + }) |
| + .then(function(result) { |
| + assert_response_array_equivalent(result, [ entries.a.response ]); |
| + }); |
| }, |
| - |
| - a_with_query: { |
| - request: new Request('http://example.com/abc?q=r'), |
| - response: new Response('') |
| - } |
| -}; |
| - |
| -function prepopulated_cache_test(test_function, description) { |
| - 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 (when is specified as false)'); |
|
jkarlin
2016/02/16 14:54:37
s/when is/when it is/
zino
2016/02/18 08:12:47
Done.
|
| done(); |