Bug 1140658 - Part 2: Merge test_cache.js and test_cache_frame.html; r=bkelly

dom/cache/test/mochitest/mochitest.ini

@@ -2,7 +2,6 @@
 support-files =
   test_cache.js
   test_cache_add.js
-  test_cache_frame.html
   test_cache_quick_close.js
   worker_driver.js
   worker_wrapper.js

dom/cache/test/mochitest/test_cache.js

@@ -1,3 +1,7 @@
+var c = null
+var request = "http://example.com/hmm?q=foobar";
+var response = new Response("This is some Response!");
+
 ok(!!caches, 'caches object should be available on global');
 caches.open('snafu').then(function(openCache) {
   ok(openCache instanceof Cache, 'cache object should be resolved from caches.open');
@@ -26,7 +30,9 @@ caches.open('snafu').then(function(openCache) {
 }).then(function(snafu) {
   var req = './cachekey';
   var res = new Response("Hello world");
-  return snafu.put('ftp://invalid', res).catch(function (err) {
+  return snafu.put('ftp://invalid', res).then(function() {
+    ok(false, 'This should fail');
+  }).catch(function (err) {
     is(err.name, 'TypeError', 'put() should throw TypeError for invalid scheme');
     return snafu.put(req, res);
   }).then(function(v) {
@@ -55,6 +61,67 @@ caches.open('snafu').then(function(openCache) {
   return response.text().then(function(v) {
     is(v, "Hello world", "Response body should match original");
   });
+}).then(function() {
+  // FIXME(nsm): Can't use a Request object for now since the operations
+  // consume it's 'body'. See
+  // https://github.com/slightlyoff/ServiceWorker/issues/510.
+  return caches.open("foobar");
+}).then(function(openCache) {
+  c = openCache;
+  return c.put(request, response);
+}).then(function(putResponse) {
+  is(putResponse, undefined, 'The promise should resolve to undefined');
+  return c.keys(request);
+}).then(function(keys) {
+  ok(keys, 'Valid keys object expected');
+  is(keys.length, 1, 'Only one key is expected');
+  return c.keys();
+}).then(function(keys) {
+  ok(keys, 'Valid keys object expected');
+  is(keys.length, 1, 'Only one key is expected');
+  return c.matchAll(request);
+}).then(function(matchAllResponses) {
+  ok(matchAllResponses, 'matchAll should succeed');
+  is(matchAllResponses.length, 1, 'Only one match is expected');
+  return c.match(request);
+}).then(function(matchResponse) {
+  ok(matchResponse, 'match should succeed');
+  return caches.match(request);
+}).then(function(storageMatchResponse) {
+  ok(storageMatchResponse, 'storage match should succeed');
+  return caches.match(request, {cacheName:"foobar"});
+}).then(function(storageMatchResponse) {
+  ok(storageMatchResponse, 'storage match should succeed');
+  var request2 = new Request("http://example.com/hmm?q=snafu");
+  return c.match(request2, {ignoreSearch:true});
+}).then(function(match2Response) {
+  ok(match2Response, 'match should succeed');
+  return c.delete(request);
+}).then(function(deleteResult) {
+  ok(deleteResult, 'delete should succeed');
+  return c.keys();
+}).then(function(keys) {
+  ok(keys, 'Valid keys object expected');
+  is(keys.length, 0, 'Zero keys is expected');
+  return c.matchAll(request);
+}).then(function(matchAll2Responses) {
+  ok(matchAll2Responses, 'matchAll should succeed');
+  is(matchAll2Responses.length, 0, 'Zero matches is expected');
+  return caches.has("foobar");
+}).then(function(hasResult) {
+  ok(hasResult, 'has should succeed');
+  return caches.keys();
+}).then(function(keys) {
+  ok(keys, 'Valid keys object expected');
+  is(keys.length, 2, 'Two keys are expected');
+  is(keys.indexOf("snafu"), 0, 'snafu should be the first key');
+  is(keys.indexOf("foobar"), 1, 'foobar should be the second key');
+  return caches.delete("foobar");
+}).then(function(deleteResult) {
+  ok(deleteResult, 'delete should succeed');
+  return caches.has("foobar");
+}).then(function(hasMissingCache) {
+  ok(!hasMissingCache, 'has should have a result');
 }).then(function() {
   workerTestDone();
 })

dom/cache/test/mochitest/test_cache_frame.html

@@ -1,87 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Test for SharedWorker</title>
-</head>
-<body>
-<script type="text/javascript">
-  "use strict";
-  addEventListener("message", function messageListener(evt) {
-    removeEventListener("message", messageListener);
-    var success = true;
-    var c = null
-    // FIXME(nsm): Can't use a Request object for now since the operations
-    // consume it's 'body'. See
-    // https://github.com/slightlyoff/ServiceWorker/issues/510.
-    var request = "http://example.com/hmm?q=foobar";
-    var response = new Response("This is some Response!");
-    success = success && !!caches;
-    caches.open("foobar").then(function(openCache) {
-      success = success && (openCache instanceof Cache);
-      c = openCache;
-      return c.put(request, response);
-    }).then(function(putResponse) {
-      success = success && putResponse === undefined;
-      return c.keys(request);
-    }).then(function(keys) {
-      success = success && !!keys;
-      success = success && keys.length === 1;
-      return c.keys();
-    }).then(function(keys) {
-      success = success && !!keys;
-      success = success && keys.length === 1;
-      return c.matchAll(request);
-    }).then(function(matchAllResponses) {
-      success = success && !!matchAllResponses &&
-                matchAllResponses.length === 1;
-      return c.match(request);
-    }).then(function(matchResponse) {
-      success = success && !!matchResponse;
-      return caches.match(request);
-    }).then(function(storageMatchResponse) {
-      success = success && !!storageMatchResponse;
-      return caches.match(request, {cacheName:"foobar"});
-    }).then(function(storageMatchResponse) {
-      success = success && !!storageMatchResponse;
-      var request2 = new Request("http://example.com/hmm?q=snafu");
-      return c.match(request2, {ignoreSearch:true});
-    }).then(function(match2Response) {
-      success = success && !!match2Response;
-      return c.delete(request);
-    }).then(function(deleteResult) {
-      success = success && deleteResult;
-      return c.keys();
-    }).then(function(keys) {
-      success = success && !!keys;
-      success = success && keys.length === 0;
-      return c.matchAll(request);
-    }).then(function(matchAll2Responses) {
-      success = success && !!matchAll2Responses &&
-                matchAll2Responses.length === 0;
-      return caches.has("foobar");
-    }).then(function(hasResult) {
-      success = success && hasResult;
-      return caches.keys();
-    }).then(function(keys) {
-      success = success && !!keys;
-      success = success && keys.length === 1;
-      success = success && keys.indexOf("foobar") === 0;
-      return caches.delete("foobar");
-    }).then(function(deleteResult) {
-      success = success && deleteResult;
-      return caches.has("foobar");
-    }).then(function(hasMissingCache) {
-      success = success && !hasMissingCache;
-      parent.postMessage({
-        type: "result",
-        success: success
-      }, "*");
-    });
-  });
-</script>
-</body>
-</html>