fix: fixed ci due to build differences on ubuntu vs mac

forwardemail · Oct 19, 2023 · 2f3ba39 · 2f3ba39
1 parent 53cdd3e
commit 2f3ba39
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 18 deletions.
diff --git a/app/views/layout.pug b/app/views/layout.pug
@@ -306,20 +306,34 @@ html.h-100.no-js(
 
       if isBot(ctx.get('User-Agent'))
         //- lazyload only support for bots
-        script(
-          defer,
-          src=manifest("js/lazyload.js"),
-          integrity=manifest("js/lazyload.js", "integrity"),
-          crossorigin="anonymous"
-        )
+        if config.env === 'test'
+          script(
+            defer,
+            src=`${config.urls.web}/js/lazyload.js`,
+            crossorigin="anonymous"
+          )
+        else
+          script(
+            defer,
+            src=manifest("js/lazyload.js"),
+            integrity=manifest("js/lazyload.js", "integrity"),
+            crossorigin="anonymous"
+          )
       else
         //- build
-        script(
-          defer,
-          src=manifest("js/build.js"),
-          integrity=manifest("js/build.js", "integrity"),
-          crossorigin="anonymous"
-        )
+        if config.env === 'test'
+          script(
+            defer,
+            src=`${config.urls.web}/js/build.js`,
+            crossorigin="anonymous"
+          )
+        else
+          script(
+            defer,
+            src=manifest("js/build.js"),
+            integrity=manifest("js/build.js", "integrity"),
+            crossorigin="anonymous"
+          )
 
         //- TODO: remove plausible and migrate to our own
         //- analytics via plausible.io

diff --git a/test/web/snapshots/index.js.md b/test/web/snapshots/index.js.md
@@ -41,7 +41,7 @@ Generated by [AVA](https://avajs.dev).
     window._confirmPromptHTML = "Please confirm if you wish to continue.";␊
     </script><script defer="defer">window.LOCALE = "en";␊
     </script><script defer="defer">window.API_URL = "http://localhost:4000";␊
-    </script><script defer="defer" src="http://example.com:3000/js/build.4e66e47c.js" integrity="sha256-aE0ityWCt0hTm5e7FfWAsNu7XXSfSq+Iv9WSuXf49pA=" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
+    </script><script defer="defer" src="http://example.com:3000/js/build.js" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
 
 ## returns Spanish homepage
 
@@ -80,7 +80,7 @@ Generated by [AVA](https://avajs.dev).
     window._confirmPromptHTML = "Por favor confirme si desea continuar.";␊
     </script><script defer="defer">window.LOCALE = "es";␊
     </script><script defer="defer">window.API_URL = "http://localhost:4000";␊
-    </script><script defer="defer" src="http://example.com:3000/js/build.4e66e47c.js" integrity="sha256-aE0ityWCt0hTm5e7FfWAsNu7XXSfSq+Iv9WSuXf49pA=" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
+    </script><script defer="defer" src="http://example.com:3000/js/build.js" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
 
 ## returns English ToS
 
@@ -233,7 +233,7 @@ Generated by [AVA](https://avajs.dev).
     window._confirmPromptHTML = "Please confirm if you wish to continue.";␊
     </script><script defer="defer">window.LOCALE = "en";␊
     </script><script defer="defer">window.API_URL = "http://localhost:4000";␊
-    </script><script defer="defer" src="http://example.com:3000/js/build.4e66e47c.js" integrity="sha256-aE0ityWCt0hTm5e7FfWAsNu7XXSfSq+Iv9WSuXf49pA=" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
+    </script><script defer="defer" src="http://example.com:3000/js/build.js" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
 
 ## returns Spanish ToS
 
@@ -364,4 +364,4 @@ Generated by [AVA](https://avajs.dev).
     window._confirmPromptHTML = "Por favor confirme si desea continuar.";␊
     </script><script defer="defer">window.LOCALE = "es";␊
     </script><script defer="defer">window.API_URL = "http://localhost:4000";␊
-    </script><script defer="defer" src="http://example.com:3000/js/build.4e66e47c.js" integrity="sha256-aE0ityWCt0hTm5e7FfWAsNu7XXSfSq+Iv9WSuXf49pA=" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
+    </script><script defer="defer" src="http://example.com:3000/js/build.js" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
diff --git a/test/web/snapshots/index.js.snap b/test/web/snapshots/index.js.snap
diff --git a/test/web/snapshots/otp.js.md b/test/web/snapshots/otp.js.md
@@ -27,7 +27,7 @@ Generated by [AVA](https://avajs.dev).
     window._confirmPromptHTML = "Please confirm if you wish to continue.";␊
     </script><script defer="defer">window.LOCALE = "en";␊
     </script><script defer="defer">window.API_URL = "http://localhost:4000";␊
-    </script><script defer="defer" src="http://example.com:3000/js/build.4e66e47c.js" integrity="sha256-aE0ityWCt0hTm5e7FfWAsNu7XXSfSq+Iv9WSuXf49pA=" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
+    </script><script defer="defer" src="http://example.com:3000/js/build.js" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
 
 ## GET otp/keys > successful
 
@@ -52,4 +52,4 @@ Generated by [AVA](https://avajs.dev).
     window._confirmPromptHTML = "Please confirm if you wish to continue.";␊
     </script><script defer="defer">window.LOCALE = "en";␊
     </script><script defer="defer">window.API_URL = "http://localhost:4000";␊
-    </script><script defer="defer" src="http://example.com:3000/js/build.4e66e47c.js" integrity="sha256-aE0ityWCt0hTm5e7FfWAsNu7XXSfSq+Iv9WSuXf49pA=" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
+    </script><script defer="defer" src="http://example.com:3000/js/build.js" crossorigin="anonymous"></script><script defer="defer" data-domain="forwardemail.net" src="https://plausible.io/js/plausible.js"></script></body></html>`
diff --git a/test/web/snapshots/otp.js.snap b/test/web/snapshots/otp.js.snap