From c05df43217936429cb5d0d4db58c7dc79c5e2ada Mon Sep 17 00:00:00 2001
From: Dimitrios Karvounaris <dimitrios.karvounaris@innovacy.com>
Date: Tue, 2 Jun 2020 18:29:50 +0200
Subject: [PATCH] Compare lines without involving linebreaks

Fixes tests failing under Windows environments
for any linebreak character differences
---
 .../DirectoryWithTests/ExampleTest.php        |  2 +-
 tests/Fixtures/ExampleTest.php                |  2 +-
 tests/Visual/SingleTestOrDirectory.php        | 43 +++++++------------
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/tests/Fixtures/DirectoryWithTests/ExampleTest.php b/tests/Fixtures/DirectoryWithTests/ExampleTest.php
index 8553ad34..81ce02ff 100644
--- a/tests/Fixtures/DirectoryWithTests/ExampleTest.php
+++ b/tests/Fixtures/DirectoryWithTests/ExampleTest.php
@@ -1,3 +1,3 @@
 <?php
 
-it('example')->assertTrue(true);
+it('example 1')->assertTrue(true);
diff --git a/tests/Fixtures/ExampleTest.php b/tests/Fixtures/ExampleTest.php
index 8553ad34..a2704020 100644
--- a/tests/Fixtures/ExampleTest.php
+++ b/tests/Fixtures/ExampleTest.php
@@ -1,3 +1,3 @@
 <?php
 
-it('example')->assertTrue(true);
+it('example 2')->assertTrue(true);
diff --git a/tests/Visual/SingleTestOrDirectory.php b/tests/Visual/SingleTestOrDirectory.php
index 5cf1e6f3..40ab399c 100644
--- a/tests/Visual/SingleTestOrDirectory.php
+++ b/tests/Visual/SingleTestOrDirectory.php
@@ -11,24 +11,19 @@ $run = function (string $target) {
 };
 
 test('allows to run a single test', function () use ($run) {
-    assertStringContainsString(<<<EOF
-   PASS  Tests\Fixtures\DirectoryWithTests\ExampleTest
-  ✓ it example
-
-  Tests:  1 passed
-EOF, $run('tests/Fixtures/DirectoryWithTests/ExampleTest.php'));
+    $output = $run('tests/Fixtures/DirectoryWithTests/ExampleTest.php');
+    assertStringContainsString('  PASS  Tests\Fixtures\DirectoryWithTests\ExampleTest', $output);
+    assertStringContainsString('  ✓ it example 1', $output);
+    assertStringContainsString('  Tests:  1 passed', $output);
 });
 
 test('allows to run a directory', function () use ($run) {
-    assertStringContainsString(<<<EOF
-   PASS  Tests\Fixtures\DirectoryWithTests\ExampleTest
-  ✓ it example
-
-   PASS  Tests\Fixtures\ExampleTest
-  ✓ it example
-
-  Tests:  2 passed
-EOF, $run('tests/Fixtures'));
+    $output = $run('tests/Fixtures');
+    assertStringContainsString('  PASS  Tests\Fixtures\DirectoryWithTests\ExampleTest', $output);
+    assertStringContainsString('  ✓ it example 1', $output);
+    assertStringContainsString('  PASS  Tests\Fixtures\ExampleTest', $output);
+    assertStringContainsString('  ✓ it example 2', $output);
+    assertStringContainsString('  Tests:  2 passed', $output);
 });
 
 it('has ascii chars (decorated printer)', function () {
@@ -40,12 +35,9 @@ it('has ascii chars (decorated printer)', function () {
 
     $process->run();
     $output = $process->getOutput();
-    assertStringContainsString(<<<EOF
-  \e[30;42;1m PASS \e[39;49;22m\e[39m Tests\Fixtures\DirectoryWithTests\ExampleTest\e[39m
-  \e[32;1m✓\e[39;22m\e[39m \e[2mit example\e[22m\e[39m
-
-  \e[37;1mTests:  \e[39;22m\e[32;1m1 passed\e[39;22m
-EOF, $output);
+    assertStringContainsString("  \e[30;42;1m PASS \e[39;49;22m\e[39m Tests\Fixtures\DirectoryWithTests\ExampleTest\e[39m", $output);
+    assertStringContainsString("  \e[32;1m✓\e[39;22m\e[39m \e[2mit example 1\e[22m\e[39m", $output);
+    assertStringContainsString("  \e[37;1mTests:  \e[39;22m\e[32;1m1 passed\e[39;22m", $output);
 });
 
 it('disable decorating printer when colors is set to never', function () {
@@ -58,10 +50,7 @@ it('disable decorating printer when colors is set to never', function () {
     $process->run();
     $output = $process->getOutput();
 
-    assertStringContainsString(<<<EOF
-   PASS  Tests\Fixtures\DirectoryWithTests\ExampleTest
-  ✓ \e[2mit example\e[22m
-
-  Tests:  1 passed
-EOF, $output);
+    assertStringContainsString('  PASS  Tests\Fixtures\DirectoryWithTests\ExampleTest', $output);
+    assertStringContainsString("  ✓ \e[2mit example 1\e[22m", $output);
+    assertStringContainsString('  Tests:  1 passed', $output);
 });