Skip to content

Commit

Permalink
Merge 4f5325c into 026fff8
Browse files Browse the repository at this point in the history
  • Loading branch information
devoto13 authored Mar 28, 2021
2 parents 026fff8 + 4f5325c commit b70cec5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion static/client.html
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ <h1 id="title">Karma - starting</h1>

<iframe id="context" src="about:blank" width="100%" height="100%"></iframe>

<script src="socket.io/socket.io.js"></script>
<script src="socket.io/socket.io.min.js"></script>
<script src="karma.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion static/client_with_context.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<div id="banner" class="offline">
<h1 id="title">Karma - starting</h1>
</div>
<script src="socket.io/socket.io.js"></script>
<script src="socket.io/socket.io.min.js"></script>
<script src="karma.js"></script>
<script src="context.js"></script>
<!-- The scripts need to be at the end of body, so that some test running frameworks
Expand Down
7 changes: 7 additions & 0 deletions test/client/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ const launchers = {
browser_version: '11.0',
os: 'Windows',
os_version: '10'
},
bs_ie9: {
base: 'BrowserStack',
browser: 'IE',
browser_version: '9.0',
os: 'Windows',
os_version: '7'
}
}

Expand Down

0 comments on commit b70cec5

Please # to comment.