Avoid hardcoded newline tests

Add `new_line` helper to avoid usage of hardcoded newline evaluation in tests. Correct tests that presented this issue.
jimweirich · Sep 2, 2011 · b9234a1 · b9234a1
1 parent 47c6d8a
commit b9234a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/test/helper.rb b/test/helper.rb
@@ -81,6 +81,10 @@ def ignore_deprecations
     Rake.application.options.ignore_deprecate = false
   end
 
+  def new_line
+    Rake.application.windows? ? "\r\n" : "\n"
+  end
+
   def rake_system_dir
     @system_dir = 'system'
 

diff --git a/test/test_rake_file_list.rb b/test/test_rake_file_list.rb
@@ -342,7 +342,7 @@ def test_egrep_with_output
       files.egrep(/XYZZY/)
     end
 
-    assert_equal "xyzzy.txt:2:XYZZY\n", out
+    assert_equal "xyzzy.txt:2:XYZZY#{new_line}", out
   end
 
   def test_egrep_with_block
@@ -353,7 +353,7 @@ def test_egrep_with_block
       found = [fn, ln, line]
     end
 
-    assert_equal ["xyzzy.txt", 2, "XYZZY\n"], found
+    assert_equal ["xyzzy.txt", 2, "XYZZY#{new_line}"], found
   end
 
   def test_egrep_with_error