Skip to content

Commit 432ca75

Browse files
committed
Fix tests for from header parsing
1 parent c072f2f commit 432ca75

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lib/Parser.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ const QUOTE_HEADERS_REGEX = [
3737
/^(20[0-9]{2}\..+\s:)$/m, // DATE TIME NAME 작성:
3838
/^(20[0-9]{2}\/.+:)$/m, // DATE TIME、NAME のメッセージ:
3939
/^(.+\s<.+>\sschrieb:)$/m, // NAME <EMAIL> schrieb:
40-
/^\s*(From\s?:[\S\s]+\s?(\[|<).+(\]|>))/mu, // "From: NAME <EMAIL>" OR "From : NAME <EMAIL>" OR "From : NAME<EMAIL>"(With support whitespace before start and before <)
41-
/^\s*(De\s?:[\S\s]+\s?(\[|<).+(\]|>))/mu, // "De: NAME <EMAIL>" OR "De : NAME <EMAIL>" OR "De : NAME<EMAIL>" (With support whitespace before start and before <)
42-
/^\s*(Van\s?:[\S\s]+\s?(\[|<).+(\]|>))/mu, // "Van: NAME <EMAIL>" OR "Van : NAME <EMAIL>" OR "Van : NAME<EMAIL>" (With support whitespace before start and before <)
43-
/^\s*(Da\s?:[\S\s]+\s?(\[|<).+(\]|>))/mu, // "Da: NAME <EMAIL>" OR "Da : NAME <EMAIL>" OR "Da : NAME<EMAIL>" (With support whitespace before start and before <)
40+
/^\s*(From\s?:.+\s?(\[|<).+(\]|>))/mu, // "From: NAME <EMAIL>" OR "From : NAME <EMAIL>" OR "From : NAME<EMAIL>"(With support whitespace before start and before <)
41+
/^\s*(De\s?:.+\s?(\[|<).+(\]|>))/mu, // "De: NAME <EMAIL>" OR "De : NAME <EMAIL>" OR "De : NAME<EMAIL>" (With support whitespace before start and before <)
42+
/^\s*(Van\s?:.+\s?(\[|<).+(\]|>))/mu, // "Van: NAME <EMAIL>" OR "Van : NAME <EMAIL>" OR "Van : NAME<EMAIL>" (With support whitespace before start and before <)
43+
/^\s*(Da\s?:.+\s?(\[|<).+(\]|>))/mu, // "Da: NAME <EMAIL>" OR "Da : NAME <EMAIL>" OR "Da : NAME<EMAIL>" (With support whitespace before start and before <)
4444
/^(20[0-9]{2}-(?:0?[1-9]|1[012])-(?:0?[0-9]|[1-2][0-9]|3[01]|[1-9])\s[0-2]?[0-9]:\d{2}\s[\S\s]+?:)$/m, // 20YY-MM-DD HH:II GMT+01:00 NAME <EMAIL>:
4545
/^\s*([a-z]{3,4}\.[\s\S]+\sskrev[\s\S]+:)$/m, // DATE skrev NAME <EMAIL>:
4646
];

test/ParserTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ describe('the Parser', function () {
474474
var email = parser.parse(fixture);
475475
var fragments = email.getFragments();
476476

477-
assert.equal(fragments[1].getContent(), from + "\r \r My email is <[email protected]>", "From header not correctly matched");
477+
assert.equal(fragments[1].getContent(), from + "\n\nMy email is <[email protected]>", "From header not correctly matched");
478478
});
479479
}
480480

0 commit comments

Comments
 (0)