chore: update Windows skipped tests. (#6133)

The headful one I'm permanently skipping as I don't know what the issue is and I can't debug without getting my hands on a Windows machine. If anyone has one or is able to help, that'd be great!

The other I'm deferring another month and will ping the FF folks :)

test/headful.spec.ts

@@ -22,7 +22,7 @@ import expect from 'expect';
 import {
   getTestState,
   describeChromeOnly,
-  itFailsWindowsUntilDate,
+  itFailsWindows,
 } from './mocha-utils';
 import rimraf from 'rimraf';
 
@@ -91,15 +91,10 @@ describeChromeOnly('headful tests', function () {
       expect(pages).toEqual(['about:blank']);
       await browser.close();
     });
-    itFailsWindowsUntilDate(
+    itFailsWindows(
-      /* We have deferred fixing this test on Windows in favour of
-       * getting all other Windows tests running on CI. Putting this
-       * date in to force us to come back and debug properly in the
-       * future.
-       */
-      new Date('2020-07-01'),
       'headless should be able to read cookies written by headful',
       async () => {
+        /* Needs investigation into why but this fails consistently on Windows CI. */
         const { server, puppeteer } = getTestState();
 
         const userDataDir = await mkdtempAsync(TMP_FOLDER);

test/launcher.spec.ts

@@ -472,7 +472,7 @@ describe('Launcher specs', function () {
        * properly with help from the Mozilla folks.
        */
       itFailsWindowsUntilDate(
-        new Date('2020-07-01'),
+        new Date('2020-07-30'),
         'should be able to launch Firefox',
         async () => {
           const { puppeteer } = getTestState();

test/mocha-utils.ts

@@ -170,6 +170,13 @@ export const itFailsWindowsUntilDate = (
   return it(description, body);
 };
 
+export const itFailsWindows = (description: string, body: Mocha.Func) => {
+  if (os.platform() === 'win32') {
+    return xit(description, body);
+  }
+  return it(description, body);
+};
+
 export const describeFailsFirefox = (
   description: string,
   body: (this: Mocha.Suite) => void