6502
/
8bitworkshop
mirror of https://github.com/sehugg/8bitworkshop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed tests

This commit is contained in:
Steven Hugg 2022-01-24 16:56:44 -06:00
parent c42beda98f
commit 5a39828bf5
4 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
electron.diff
View File

@ -39,13 +39,13 @@
- -
-<!-- Sentry error reporting --> -<!-- Sentry error reporting -->
-<script -<script
- src="https://browser.sentry-cdn.com/5.20.1/bundle.min.js" - src="https://browser.sentry-cdn.com/6.4.1/bundle.min.js"
- integrity="sha384-O8HdAJg1h8RARFowXd2J/r5fIWuinSBtjhwQoPesfVILeXzGpJxvyY/77OaPPXUo" - integrity="sha384-THoc7rflwZFKTdZNgv6jLFFDn299Uv3t1SW5B4yGLvLiCRTYP9ys6vXZcMl95TQF"
- crossorigin="anonymous"></script> - crossorigin="anonymous"></script>
-<script> -<script>
-if (window.location.host.endsWith('8bitworkshop.com')) { -if (window.location.host.endsWith('8bitworkshop.com')) {
- Sentry.init({ - Sentry.init({
- dsn: 'https://bf329df3d1b34afa9f5b5e8ecd80ad11@sentry.io/1813925', - dsn: 'https://bf329df3d1b34afa9f5b5e8ecd80ad11@o320878.ingest.sentry.io/1813925',
- beforeBreadcrumb(breadcrumb, hint) { - beforeBreadcrumb(breadcrumb, hint) {
- if (breadcrumb.category === 'xhr' && typeof breadcrumb.data.url === 'string') { - if (breadcrumb.category === 'xhr' && typeof breadcrumb.data.url === 'string') {
- if (breadcrumb.data.url.startsWith('http')) return null; // discard external scripts - if (breadcrumb.data.url.startsWith('http')) return null; // discard external scripts
@ -54,7 +54,7 @@
- }, - },
- beforeSend(event, hint) { - beforeSend(event, hint) {
- const error = hint.originalException; - const error = hint.originalException;
- if (error instanceof EmuHalt) return null; // ignore EmuHalt - if (error && error.hasOwnProperty('$loc')) return null; // ignore EmuHalt
- return event; - return event;
- }, - },
- }); - });

27
electron.html
View File

@ -105,6 +105,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
<li><a class="dropdown-item" href="?platform=apple2">Apple ][+</a></li> <li><a class="dropdown-item" href="?platform=apple2">Apple ][+</a></li>
<li><a class="dropdown-item" href="?platform=zx">ZX Spectrum</a></li> <li><a class="dropdown-item" href="?platform=zx">ZX Spectrum</a></li>
<li><a class="dropdown-item" href="?platform=x86">x86 (FreeDOS)</a></li> <li><a class="dropdown-item" href="?platform=x86">x86 (FreeDOS)</a></li>
<li><a class="dropdown-item" href="?platform=cpc.6128">Amstrad CPC6128</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown dropdown-submenu"> <li class="dropdown dropdown-submenu">
@ -135,11 +136,12 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
</ul> </ul>
</li> </li>
<li class="dropdown dropdown-submenu"> <li class="dropdown dropdown-submenu">
<a tabindex="-1" href="#">MAME Emulators</a> <a tabindex="-1" href="#">MAME/Other</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a class="dropdown-item" href="?platform=atari8-800xl.mame">Atari 800XL (MAME)</a></li> <li><a class="dropdown-item" href="?platform=atari8-800xl.mame">Atari 800XL (MAME)</a></li>
<li><a class="dropdown-item" href="?platform=atari8-5200.mame">Atari 5200 (MAME)</a></li> <li><a class="dropdown-item" href="?platform=atari8-5200.mame">Atari 5200 (MAME)</a></li>
<hr> <hr>
<li><a class="dropdown-item" href="?platform=vcs.stellerator">Atari 2600 (Stellerator)</a></li>
<li><a class="dropdown-item" href="?platform=vcs.mame">Atari 2600 (MAME)</a></li> <li><a class="dropdown-item" href="?platform=vcs.mame">Atari 2600 (MAME)</a></li>
<li><a class="dropdown-item" href="?platform=coleco.mame">ColecoVision (MAME)</a></li> <li><a class="dropdown-item" href="?platform=coleco.mame">ColecoVision (MAME)</a></li>
<li><a class="dropdown-item" href="?platform=nes.mame">NES (MAME)</a></li> <li><a class="dropdown-item" href="?platform=nes.mame">NES (MAME)</a></li>
@ -431,5 +433,28 @@ $( ".dropdown-submenu" ).click(function(event) {
}); });
</script> </script>
<!-- Sentry error reporting -->
<script
src="https://browser.sentry-cdn.com/6.4.1/bundle.min.js"
integrity="sha384-THoc7rflwZFKTdZNgv6jLFFDn299Uv3t1SW5B4yGLvLiCRTYP9ys6vXZcMl95TQF"
crossorigin="anonymous"
></script>
<script>
Sentry.init({
dsn: 'https://bf329df3d1b34afa9f5b5e8ecd80ad11@o320878.ingest.sentry.io/1813925',
beforeBreadcrumb(breadcrumb, hint) {
if (breadcrumb.category === 'xhr' && typeof breadcrumb.data.url === 'string') {
if (breadcrumb.data.url.startsWith('http')) return null; // discard external scripts
}
return breadcrumb;
},
beforeSend(event, hint) {
const error = hint.originalException;
if (error && error.hasOwnProperty('$loc')) return null; // ignore EmuHalt
return event;
},
});
</script>
</body> </body>
</html> </html>

37
meta/electron.diff
View File

@ -1,5 +1,5 @@
--- index.html 2021-08-06 18:05:46.000000000 -0500 --- index.html 2022-01-22 20:17:39.000000000 -0600
+++ electron.html 2021-08-09 12:01:41.000000000 -0500 +++ electron.html 2022-01-24 15:54:13.000000000 -0600
@@ -3,18 +3,7 @@ @@ -3,18 +3,7 @@
<head> <head>
@ -92,7 +92,7 @@
</ul> </ul>
</span> </span>
@@ -277,24 +214,21 @@ @@ -279,24 +216,21 @@
<div class="emulator disable-select" id="emulator"> <div class="emulator disable-select" id="emulator">
<!-- replay slider --> <!-- replay slider -->
<div id="replaydiv" class="replaydiv" style="display:none;color:#ccc;text-align:left"> <div id="replaydiv" class="replaydiv" style="display:none;color:#ccc;text-align:left">
@ -119,7 +119,7 @@
<button id="clock_fwd" class="btn" title="Forward one step"><span class="glyphicon glyphicon-forward" aria-hidden="true"></span></button> <button id="clock_fwd" class="btn" title="Forward one step"><span class="glyphicon glyphicon-forward" aria-hidden="true"></span></button>
</div> </div>
</div> </div>
@@ -449,73 +383,6 @@ @@ -451,73 +385,6 @@
</div> </div>
</div> </div>
</div> </div>
@ -193,32 +193,3 @@
<script src="jquery/jquery.min.js"></script> <script src="jquery/jquery.min.js"></script>
@@ -564,28 +431,5 @@
});
</script>
-<!-- Sentry error reporting -->
-<script
- src="https://browser.sentry-cdn.com/6.4.1/bundle.min.js"
- integrity="sha384-THoc7rflwZFKTdZNgv6jLFFDn299Uv3t1SW5B4yGLvLiCRTYP9ys6vXZcMl95TQF"
- crossorigin="anonymous"
-></script>
-<script>
-Sentry.init({
- dsn: 'https://bf329df3d1b34afa9f5b5e8ecd80ad11@o320878.ingest.sentry.io/1813925',
- beforeBreadcrumb(breadcrumb, hint) {
- if (breadcrumb.category === 'xhr' && typeof breadcrumb.data.url === 'string') {
- if (breadcrumb.data.url.startsWith('http')) return null; // discard external scripts
- }
- return breadcrumb;
- },
- beforeSend(event, hint) {
- const error = hint.originalException;
- if (error instanceof EmuHalt) return null; // ignore EmuHalt
- return event;
- },
-});
-</script>
-
</body>
</html>

1
test/cli/workertestutils.js
View File

@ -16,6 +16,7 @@ global.path = require('path');
global.btoa = require('btoa'); global.btoa = require('btoa');
global.atob = require('atob'); global.atob = require('atob');
global.navigator = global; // for mousetrap :P global.navigator = global; // for mousetrap :P
global.ResizeObserver = class { observe() { } }
global.includeInThisContext = function(path) { global.includeInThisContext = function(path) {
var code = fs.readFileSync(path); var code = fs.readFileSync(path);