Fix derived branch name default. (#143)

The previous default didn't work if the variable had an empty String as
value.

Author: bosschaert

test/e2e/utils/env.js

@@ -1,5 +1,8 @@
 function getEnv() {
-  const { GITHUB_HEAD_REF: branch = 'main' } = process.env;
+  let { GITHUB_HEAD_REF: branch } = process.env;
+  if (!branch) {
+    branch = 'main';
+  }
   return branch === 'local' ? 'http://localhost:3000' : `https://${branch}--da-live--adobe.hlx.live`;
 }
 

test/e2e/utils/page.js

@@ -46,10 +46,10 @@ export function getTestSheetURL(testIdentifier, workerInfo) {
  * @returns The age in ms or null if the file name does not match the pattern.
  */
 export function getTestResourceAge(fileName) {
-  const re = /pw-\w+(-t1)*-(\w+)-\w+/;
+  const re = /pw-\w+-(\w+)-\w+/;
   const res = re.exec(fileName);
   if (res) {
-    return parseInt(res[2], 36);
+    return parseInt(res[1], 36);
   }
   return null;
 }