Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: exclude \u000d so new line won't convert to text (fixes #12027) #12031

Merged
merged 4 commits into from Sep 29, 2019
Merged

Fix: exclude \u000d so new line won't convert to text (fixes #12027) #12031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34342a5
Fix: exclude `\u000d` so new line won't convert to text (fixes #12027)
Jul 27, 2019
ea22f78
Fix: exclude `\u000d` so new line won't convert to text (fixes #12027)
Jul 28, 2019
e12a2df
Merge branch 'issue12027' of github.com:zamboney/eslint into issue12027
Jul 28, 2019
c4105ed
revert mistake
Jul 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/rule-tester/rule-tester.js
View file
Open in desktop
Expand Up @@ -130,7 +130,7 @@ function freezeDeeply(x) {
*/
function sanitize(text) {
return text.replace(
/[\u0000-\u001f]/gu, // eslint-disable-line no-control-regex
/[\u0000-\u0009|\u000b-\u001a]/gu, // eslint-disable-line no-control-regex
c => `\\u${c.codePointAt(0).toString(16).padStart(4, "0")}`
);
}
Expand Down
54 changes: 53 additions & 1 deletion tests/lib/rule-tester/rule-tester.js
View file
Open in desktop
Expand Up @@ -324,7 +324,11 @@ describe("RuleTester", () => {
"bar = baz;"
],
invalid: [
{ code: "var foo = bar; var qux = boop;", output: null, errors: 2 }
{
code: "var foo = bar; var qux = boop;",
output: null,
errors: 2
}
]
});
}, /Expected no autofixes to be suggested/u);
Expand Down Expand Up @@ -1072,4 +1076,52 @@ describe("RuleTester", () => {
);
}, /A fatal parsing error occurred in autofix/u);
});

describe("sanitize test cases", () => {
let originalRuleTesterIt;
let spyRuleTesterIt;

before(() => {
originalRuleTesterIt = RuleTester.it;
spyRuleTesterIt = sinon.spy();
RuleTester.it = spyRuleTesterIt;
});
after(() => {
RuleTester.it = originalRuleTesterIt;
});
beforeEach(() => {
spyRuleTesterIt.resetHistory();
ruleTester = new RuleTester();
});
it("should present newline when using back-tick as new line", () => {
const code = `
var foo = bar;`;

ruleTester.run("no-var", require("../../fixtures/testers/rule-tester/no-var"), {
valid: [],
invalid: [
{
code,
errors: [/^Bad var/u]
}
]
});
sinon.assert.calledWith(spyRuleTesterIt, code);
});
it("should present \\u0000 as a string", () => {
const code = "\u0000";

ruleTester.run("no-var", require("../../fixtures/testers/rule-tester/no-var"), {
valid: [],
invalid: [
{
code,
errors: [/^Bad var/u]
}
]
});
sinon.assert.calledWith(spyRuleTesterIt, "\\u0000");
});

});
});