From 146e2027303e633f8636e43522334765efaa18e5 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 17 Mar 2015 16:38:59 -0400
Subject: [PATCH] Bug 1144337 - Add tests to ensure that cacheName is only
 honored on CacheStorage, and not Cache; r=bkelly

---
 .../mochitest/test_cache_matchAll_request.js  | 21 +++++++++++++------
 .../mochitest/test_cache_match_request.js     |  5 +++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/dom/cache/test/mochitest/test_cache_matchAll_request.js b/dom/cache/test/mochitest/test_cache_matchAll_request.js
index 8c8e7f4c2508..0ad2c93b69d0 100644
--- a/dom/cache/test/mochitest/test_cache_matchAll_request.js
+++ b/dom/cache/test/mochitest/test_cache_matchAll_request.js
@@ -101,7 +101,7 @@ function testRequest(request1, request2, request3, unknownRequest,
     return checkResponse(r[0], response1, response1Text);
   }).then(function() {
     return c.matchAll(requestWithAlternateQueryString,
-                      {ignoreSearch: true, cacheName: name});
+                      {ignoreSearch: true});
   }).then(function(r) {
     is(r.length, 2, "Should find 2 items");
     return Promise.all([
@@ -122,16 +122,25 @@ function testRequest(request1, request2, request3, unknownRequest,
       checkResponse(r[1], response3, response3Text)
     ]);
   }).then(function() {
-    return c.matchAll({cacheName: name + "mambojambo"});
-  }).then(function(r) {
-    is(r.length, 0, "Searching in the wrong cache should not succeed");
+    return caches.match(request1, {cacheName: name + "mambojambo"})
+      .then(function() {
+        ok(false, "Promise should be rejected");
+      }, function(err) {
+        is(err.name, "NotFoundError", "Searching in the wrong cache should not succeed");
+      });
   }).then(function() {
     return c.matchAll(unknownRequest);
   }).then(function(r) {
     is(r.length, 0, "Searching for an unknown request should not succeed");
-    return c.matchAll(unknownRequest, {cacheName: name});
+    return caches.match(unknownRequest, {cacheName: name});
   }).then(function(r) {
-    is(r.length, 0, "Searching for an unknown request should not succeed");
+    is(typeof r, "undefined", "Searching for an unknown request should not succeed");
+    // Make sure that cacheName is ignored on Cache
+    return c.matchAll(request1, {cacheName: name + "mambojambo"});
+  }).then(function(r) {
+    is(r.length, 1, "Should only find 1 item");
+    return checkResponse(r[0], response1, response1Text);
+  }).then(function() {
     return caches.delete(name);
   }).then(function(success) {
     ok(success, "We should be able to delete the cache successfully");
diff --git a/dom/cache/test/mochitest/test_cache_match_request.js b/dom/cache/test/mochitest/test_cache_match_request.js
index 9d32a56a8acf..2843cb0d90f1 100644
--- a/dom/cache/test/mochitest/test_cache_match_request.js
+++ b/dom/cache/test/mochitest/test_cache_match_request.js
@@ -102,6 +102,11 @@ function testRequest(request, unknownRequest, requestWithAlternateQueryString,
       }, function(err) {
         is(err.name, "NotFoundError", "Searching in the wrong cache should not succeed");
       });
+  }).then(function() {
+    // Make sure that cacheName is ignored on Cache
+    return c.match(request, {cacheName: name + "mambojambo"});
+  }).then(function(r) {
+    return checkResponse(r);
   }).then(function() {
     return c.match(unknownRequest);
   }).then(function(r) {