Merge branch 'release/0.18' into wdtk

4 files changed, 14 insertions, 0 deletions

diff --git a/spec/fixtures/files/attachment_to_html/alternative_template.html.erb b/spec/fixtures/files/attachment_to_html/alternative_template.html.erb
new file mode 100644
index 000000000..024565d5a
--- /dev/null
+++ b/spec/fixtures/files/attachment_to_html/alternative_template.html.erb
@@ -0,0 +1,2 @@
+<h1><%= @title %></h1>
+<div><%= @body %></div>
\ No newline at end of file
diff --git a/spec/fixtures/files/empty.rtf b/spec/fixtures/files/empty.rtf
new file mode 100644
index 000000000..82dd2964a
--- /dev/null
+++ b/spec/fixtures/files/empty.rtf
@@ -0,0 +1,5 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
+{\fonttbl}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+}
\ No newline at end of file
diff --git a/spec/fixtures/files/empty.txt b/spec/fixtures/files/empty.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/spec/fixtures/files/empty.txt
diff --git a/spec/fixtures/files/interesting.rtf b/spec/fixtures/files/interesting.rtf
new file mode 100644
index 000000000..fa95b53b5
--- /dev/null
+++ b/spec/fixtures/files/interesting.rtf
@@ -0,0 +1,7 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
+
+\f0\fs24 \cf0 thisisthebody}
\ No newline at end of file