Update tests

test/functional/test-cache-sw-core.js

@@ -464,28 +464,24 @@ runner.run('Cache SW', () => {
  });
  });
 
- describe('with multiple parallel requests', () => {
- it('forces uniform RTV version of winner', () => {
- const timer = timerFor(window);
- // First call will resolve after the first.
+ describe('with cached files', () => {
+ beforeEach(() => {
  cache.cached.push([prevRequest, responseFromRequest(prevRequest)]);
+ });
 
- return Promise.all([
- sw.handleFetch(request, clientId),
- sw.handleFetch(compRequest, clientId),
- ]).then(responses => {
- expect(sw.rtvVersion(responses[0].url)).to.equal(
+ describe('with multiple parallel requests', () => {
+ it('forces uniform RTV version of winner', () => {
+ return Promise.all([
+ sw.handleFetch(request, clientId),
+ sw.handleFetch(compRequest, clientId),
+ ]).then(responses => {
+ expect(sw.rtvVersion(responses[0].url)).to.equal(
  sw.rtvVersion(prevRequest.url));
- expect(sw.rtvVersion(responses[1].url)).to.equal(
+  expect(sw.rtvVersion(responses[1].url)).to.equal(
  sw.rtvVersion(prevRequest.url));
+ });
  });
  });
- });
-
- describe('with cached files', () => {
- beforeEach(() => {
- cache.cached.push([prevRequest, responseFromRequest(prevRequest)]);
- });
 
  it('fulfills with cached version', () => {
  return sw.handleFetch(compRequest, clientId).then(resp => {
@@ -547,6 +543,22 @@ runner.run('Cache SW', () => {
  });
  });
  });
+
+ describe('without cached files', () => {
+ describe('with multiple parallel requests', () => {
+ it('forces uniform RTV version of winner', () => {
+ return Promise.all([
+ sw.handleFetch(request, clientId),
+ sw.handleFetch(prevRequest, clientId),
+ ]).then(responses => {
+ expect(sw.rtvVersion(responses[0].url)).to.equal(
+ sw.rtvVersion(request.url));
+ expect(sw.rtvVersion(responses[1].url)).to.equal(
+ sw.rtvVersion(request.url));
+ });
+ });
+ });
+ });
  });
  });
 });