这是indexloc提供的服务,不要输入任何密码
Skip to content

Commit b70cec5

Browse files
authored
Merge 4f5325c into 026fff8
2 parents 026fff8 + 4f5325c commit b70cec5

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

static/client.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ <h1 id="title">Karma - starting</h1>
109109

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

112-
<script src="socket.io/socket.io.js"></script>
112+
<script src="socket.io/socket.io.min.js"></script>
113113
<script src="karma.js"></script>
114114
</body>
115115
</html>

static/client_with_context.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<div id="banner" class="offline">
105105
<h1 id="title">Karma - starting</h1>
106106
</div>
107-
<script src="socket.io/socket.io.js"></script>
107+
<script src="socket.io/socket.io.min.js"></script>
108108
<script src="karma.js"></script>
109109
<script src="context.js"></script>
110110
<!-- The scripts need to be at the end of body, so that some test running frameworks

test/client/karma.conf.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ const launchers = {
2727
browser_version: '11.0',
2828
os: 'Windows',
2929
os_version: '10'
30+
},
31+
bs_ie9: {
32+
base: 'BrowserStack',
33+
browser: 'IE',
34+
browser_version: '9.0',
35+
os: 'Windows',
36+
os_version: '7'
3037
}
3138
}
3239

0 commit comments

Comments
 (0)