Merge pull request #2354 from chyndman/eex-test-crlf-newlines

EEx tests aware of CR+LF newline on Windows

Author: José Valim

lib/eex/test/eex_test.exs

@@ -303,13 +303,13 @@ foo
   test "evaluates the source from a given file" do
     filename = Path.join(__DIR__, "fixtures/eex_template.eex")
     result = EEx.eval_file(filename)
-    assert result == "foo bar.\n"
+    assert result == "foo bar." <> os_newline
   end
 
   test "evaluates the source from a given file with bindings" do
     filename = Path.join(__DIR__, "fixtures/eex_template_with_bindings.eex")
     result = EEx.eval_file(filename, [bar: 1])
-    assert result == "foo 1\n"
+    assert result == "foo 1" <> os_newline
   end
 
   test "raises an Exception when there's an error with the given file" do
@@ -324,7 +324,7 @@ foo
   end
 
   test "defined from file" do
-    assert EExText.Compiled.file_sample(1) == "foo 1\n"
+    assert EExText.Compiled.file_sample(1) == "foo 1" <> os_newline
   end
 
   test "defined from file do not affect backtrace" do
@@ -356,6 +356,13 @@ foo
      }
   end
 
+  defp os_newline do
+    case :os.type do
+      {:win32, _} -> "\r\n"
+      _ -> "\n"
+    end
+  end
+
   defmodule TestEngine do
     @behaviour EEx.Engine