Skip to content

Commit c7c8f38

Browse files
tgxworldtgxworld
committed
Use proper encoding for email fixtures.
1 parent 1446753 commit c7c8f38

File tree

5 files changed

+122
-119
lines changed

5 files changed

+122
-119
lines changed

‎.gitattributes

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
# Set default behaviour, in case users don't have core.autocrlf set.
22
* text=auto
33

4-
# Explicitly declare text files we want to always be normalized and converted
4+
# Treat email fixtures as binary files so CRLF are not converted to LF.
5+
*.eml binary
6+
7+
# Explicitly declare text files we want to always be normalized and converted
58
# to native line endings on checkout.
69
*.yml text
710

8-
# Custom for Visual Studio, very unlikely, but lets keep it
11+
# Custom for Visual Studio, very unlikely, but lets keep it
912
*.cs diff=csharp
1013
*.sln merge=union
1114
*.csproj merge=union

‎spec/fixtures/emails/encoded_display_name.eml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
Return-Path: <[email protected]>
2-
From: =?UTF-8?B?0KHQu9GD0YfQsNC50L3QsNGP?= =?UTF-8?B?INCY0LzRjw==?= <[email protected]>
3-
To: [email protected]
4-
Subject: I need help
5-
Date: Fri, 15 Jan 2016 00:12:43 +0100
6-
Message-ID: <[email protected]>
7-
Mime-Version: 1.0
8-
Content-Type: text/plain; charset=UTF-8
9-
Content-Transfer-Encoding: quoted-printable
10-
11-
Будьте здоровы!
1+
Return-Path: <[email protected]>
2+
From: =?UTF-8?B?0KHQu9GD0YfQsNC50L3QsNGP?= =?UTF-8?B?INCY0LzRjw==?= <[email protected]>
3+
To: [email protected]
4+
Subject: I need help
5+
Date: Fri, 15 Jan 2016 00:12:43 +0100
6+
Message-ID: <[email protected]>
7+
Mime-Version: 1.0
8+
Content-Type: text/plain; charset=UTF-8
9+
Content-Transfer-Encoding: quoted-printable
10+
11+
Будьте здоровы!

‎spec/fixtures/emails/forwarded_email_3.eml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
Message-ID: <[email protected]>
2-
From: Ba Bar <[email protected]>
3-
To: Team <[email protected]>
4-
Date: Mon, 9 Dec 2016 13:37:42 +0100
5-
Subject: Fwd: Ça Discourse ?
6-
7-
@team, can you have a look at this email below?
8-
9-
Objet: Ça Discourse ?
10-
Date: 2017-01-04 11:27
11-
De: Un Français <[email protected]>
12-
À: [email protected]
13-
14-
Bonjour,
15-
16-
Ça Discourse bien aujourd'hui ?
17-
18-
Bises
1+
Message-ID: <[email protected]>
2+
From: Ba Bar <[email protected]>
3+
To: Team <[email protected]>
4+
Date: Mon, 9 Dec 2016 13:37:42 +0100
5+
Subject: Fwd: Ça Discourse ?
6+
7+
@team, can you have a look at this email below?
8+
9+
Objet: Ça Discourse ?
10+
Date: 2017-01-04 11:27
11+
De: Un Français <[email protected]>
12+
À: [email protected]
13+
14+
Bonjour,
15+
16+
Ça Discourse bien aujourd'hui ?
17+
18+
Bises

‎spec/fixtures/emails/inline_image.eml

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
1-
Return-Path: <[email protected]>
2-
From: Foo Bar <[email protected]>
3-
To: [email protected]
4-
Date: Fri, 15 Jan 2016 00:12:43 +0100
5-
Message-ID: <[email protected]>
6-
Mime-Version: 1.0
7-
Content-Type: multipart/related; boundary=001a114b2eccff183a052998ec68
8-
9-
--001a114b2eccff183a052998ec68
10-
Content-Type: multipart/alternative; boundary=001a114b2eccff1836052998ec67
11-
12-
--001a114b2eccff1836052998ec67
13-
Content-Type: text/plain; charset=UTF-8
14-
15-
Before
16-
17-
[image: 内嵌图片 1]
18-
19-
After
20-
21-
--001a114b2eccff1836052998ec67
22-
Content-Type: text/html; charset=UTF-8
23-
24-
<div dir="ltr"><b>Before</b><div><br></div><div><img src="cid:ii_1525434659ddb4cb" alt="内嵌图片 1"><br></div><div><br></div><div><i>After</i>
25-
</div></div>
26-
27-
--001a114b2eccff1836052998ec67--
28-
--001a114b2eccff183a052998ec68
29-
Content-Type: image/png; name="logo.png"
30-
Content-Disposition: inline; filename="logo.png"
31-
Content-Transfer-Encoding: base64
32-
Content-ID: <ii_1525434659ddb4cb>
33-
X-Attachment-Id: ii_1525434659ddb4cb
34-
35-
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
75-
uIDrr6oAAAAASUVORK5CYII=
76-
--001a114b2eccff183a052998ec68--
1+
Return-Path: <[email protected]>
2+
From: Foo Bar <[email protected]>
3+
To: [email protected]
4+
Date: Fri, 15 Jan 2016 00:12:43 +0100
5+
Message-ID: <[email protected]>
6+
Mime-Version: 1.0
7+
Content-Type: multipart/related; boundary=001a114b2eccff183a052998ec68
8+
9+
--001a114b2eccff183a052998ec68
10+
Content-Type: multipart/alternative; boundary=001a114b2eccff1836052998ec67
11+
12+
--001a114b2eccff1836052998ec67
13+
Content-Type: text/plain; charset=UTF-8
14+
15+
Before
16+
17+
[image: 内嵌图片 1]
18+
19+
After
20+
21+
--001a114b2eccff1836052998ec67
22+
Content-Type: text/html; charset=UTF-8
23+
24+
<div dir="ltr"><b>Before</b><div><br></div><div><img src="cid:ii_1525434659ddb4cb" alt="内嵌图片 1"><br></div><div><br></div><div><i>After</i>
25+
</div></div>
26+
27+
--001a114b2eccff1836052998ec67--
28+
--001a114b2eccff183a052998ec68
29+
Content-Type: image/png; name="logo.png"
30+
Content-Disposition: inline; filename="logo.png"
31+
Content-Transfer-Encoding: base64
32+
Content-ID: <ii_1525434659ddb4cb>
33+
X-Attachment-Id: ii_1525434659ddb4cb
34+
35+
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
75+
uIDrr6oAAAAASUVORK5CYII=
76+
--001a114b2eccff183a052998ec68--

‎spec/fixtures/emails/reply_with_8bit_encoding.eml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
Return-Path: <[email protected]>
2-
From: Foo Bar <[email protected]>
3-
To: [email protected]
4-
Date: Fri, 15 Jan 2016 00:12:43 +0100
5-
Message-ID: <[email protected]>
6-
MIME-Version: 1.0
7-
Content-Type: text/plain; charset=iso-8859-1
8-
Content-Disposition: inline
9-
Content-Transfer-Encoding: 8bit
10-
11-
hab vergessen kritische zeichen einzufügen:
12-
äöüÄÖÜß
1+
Return-Path: <[email protected]>
2+
From: Foo Bar <[email protected]>
3+
To: [email protected]
4+
Date: Fri, 15 Jan 2016 00:12:43 +0100
5+
Message-ID: <[email protected]>
6+
MIME-Version: 1.0
7+
Content-Type: text/plain; charset=iso-8859-1
8+
Content-Disposition: inline
9+
Content-Transfer-Encoding: 8bit
10+
11+
hab vergessen kritische zeichen einzufügen:
12+
äöüÄÖÜß

0 commit comments

Comments
 (0)