Skip to content

Commit 9d05258

Browse files
committed
Update ANSI tests
1 parent 245287a commit 9d05258

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

notebook/static/base/js/utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ define([
288288
}
289289
var chunk = str.substring(start, match.index);
290290
if (chunk) {
291-
if (bold && 0 <= fg && fg < 8) {
291+
if (bold && typeof fg === "number" && 0 <= fg && fg < 8) {
292292
fg += 8; // Bold text uses "intense" colors
293293
}
294294
var classes = [];

notebook/tests/base/utils.js

+11-7
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,21 @@ casper.notebook_test(function () {
88
"\033[0m[\033[31merror\033[0m] \033[0m\teven more text\033[0m",
99
"\u001b[?25hBuilding wheels for collected packages: scipy",
1010
"\x1b[38;5;28;01mtry\x1b[39;00m",
11-
"\033[0m[\033[31merror\033[0m] \033[0m\t\tand more more text\033[0m"].join("\n");
11+
"\033[0m[\033[31merror\033[0m] \033[0m\t\tand more more text\033[0m",
12+
"normal\x1b[43myellowbg\x1b[35mmagentafg\x1b[1mbold\x1b[49mdefaultbg\x1b[39mdefaultfg\x1b[22mnormal",
13+
].join("\n");
1214

1315
var output = [
1416
"[info] text",
15-
"[<span class=\"ansiyellow\">warn</span>] \tmore text",
16-
"[<span class=\"ansiyellow\">warn</span>] https://some/url/to/a/file.ext",
17-
"[<span class=\"ansired\">error</span>] ",
18-
"[<span class=\"ansired\">error</span>] \teven more text",
17+
'[<span class="ansi-yellow-fg">warn</span>] \tmore text',
18+
'[<span class="ansi-yellow-fg">warn</span>] https://some/url/to/a/file.ext',
19+
'[<span class="ansi-red-fg">error</span>] ',
20+
'[<span class="ansi-red-fg">error</span>] \teven more text',
1921
"Building wheels for collected packages: scipy",
20-
'<span style="color: rgb(0,102,0);" class="ansibold">try</span>',
21-
"[<span class=\"ansired\">error</span>] \t\tand more more text"].join("\n");
22+
'<span class="ansi-bold" style="color: rgb(0,135,0)">try</span>',
23+
'[<span class="ansi-red-fg">error</span>] \t\tand more more text',
24+
'normal<span class="ansi-yellow-bg">yellowbg</span><span class="ansi-magenta-fg ansi-yellow-bg">magentafg</span><span class="ansi-magenta-intense-fg ansi-yellow-bg ansi-bold">bold</span><span class="ansi-magenta-intense-fg ansi-bold">defaultbg</span><span class="ansi-bold">defaultfg</span>normal',
25+
].join("\n");
2226

2327
var result = this.evaluate(function (input) {
2428
return IPython.utils.fixConsole(input);

0 commit comments

Comments
 (0)