From 64ba17ee7517be6a1adc3a437aa7e8ac02d3af0a Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Sun, 29 Mar 2020 16:20:51 +0800
Subject: [PATCH] Drop assertContains calls in OctoberEnv test

---
 tests/unit/system/console/OctoberEnvTest.php | 57 ++++++--------------
 1 file changed, 15 insertions(+), 42 deletions(-)

diff --git a/tests/unit/system/console/OctoberEnvTest.php b/tests/unit/system/console/OctoberEnvTest.php
index c075fe857..184c3e68d 100644
--- a/tests/unit/system/console/OctoberEnvTest.php
+++ b/tests/unit/system/console/OctoberEnvTest.php
@@ -30,56 +30,29 @@ class OctoberEnvTest extends TestCase
         // Check environment file
         $envFile = file_get_contents(base_path('.env'));
 
-        // Forward compatible assertions
-        // @TODO: Use only `assertStringContainsString` after L6 upgrade
-
-        if (method_exists($this, 'assertStringContainsString')) {
-            $this->assertStringContainsString('APP_DEBUG=true', $envFile);
-            $this->assertStringContainsString('APP_URL=https://localhost', $envFile);
-            $this->assertStringContainsString('DB_CONNECTION=mysql', $envFile);
-            $this->assertStringContainsString('DB_DATABASE="data#base"', $envFile);
-            $this->assertStringContainsString('DB_USERNAME="teal\'c"', $envFile);
-            $this->assertStringContainsString('DB_PASSWORD="test\\"quotes\'test"', $envFile);
-            $this->assertStringContainsString('DB_PORT=3306', $envFile);
-        } else {
-            $this->assertContains('APP_DEBUG=true', $envFile);
-            $this->assertContains('APP_URL=https://localhost', $envFile);
-            $this->assertContains('DB_CONNECTION=mysql', $envFile);
-            $this->assertContains('DB_DATABASE="data#base"', $envFile);
-            $this->assertContains('DB_USERNAME="teal\'c"', $envFile);
-            $this->assertContains('DB_PASSWORD="test\\"quotes\'test"', $envFile);
-            $this->assertContains('DB_PORT=3306', $envFile);
-        }
+        $this->assertStringContainsString('APP_DEBUG=true', $envFile);
+        $this->assertStringContainsString('APP_URL=https://localhost', $envFile);
+        $this->assertStringContainsString('DB_CONNECTION=mysql', $envFile);
+        $this->assertStringContainsString('DB_DATABASE="data#base"', $envFile);
+        $this->assertStringContainsString('DB_USERNAME="teal\'c"', $envFile);
+        $this->assertStringContainsString('DB_PASSWORD="test\\"quotes\'test"', $envFile);
+        $this->assertStringContainsString('DB_PORT=3306', $envFile);
 
         // Check app.php config file
         $appConfigFile = file_get_contents(storage_path('temp/tests/config/app.php'));
 
-        if (method_exists($this, 'assertStringContainsString')) {
-            $this->assertStringContainsString('\'debug\' => env(\'APP_DEBUG\', true),', $appConfigFile);
-            $this->assertStringContainsString('\'url\' => env(\'APP_URL\', \'https://localhost\'),', $appConfigFile);
-        } else {
-            $this->assertContains('\'debug\' => env(\'APP_DEBUG\', true),', $appConfigFile);
-            $this->assertContains('\'url\' => env(\'APP_URL\', \'https://localhost\'),', $appConfigFile);
-        }
+        $this->assertStringContainsString('\'debug\' => env(\'APP_DEBUG\', true),', $appConfigFile);
+        $this->assertStringContainsString('\'url\' => env(\'APP_URL\', \'https://localhost\'),', $appConfigFile);
 
         // Check database.php config file
         $appConfigFile = file_get_contents(storage_path('temp/tests/config/database.php'));
 
-        if (method_exists($this, 'assertStringContainsString')) {
-            $this->assertStringContainsString('\'default\' => env(\'DB_CONNECTION\', \'mysql\')', $appConfigFile);
-            $this->assertStringContainsString('\'port\' => env(\'DB_PORT\', 3306),', $appConfigFile);
-            // Both the following configurations had values in the original config, they should be stripped out once
-            // the .env file is generated.
-            $this->assertStringContainsString('\'username\' => env(\'DB_USERNAME\', \'\'),', $appConfigFile);
-            $this->assertStringContainsString('\'password\' => env(\'DB_PASSWORD\', \'\'),', $appConfigFile);
-        } else {
-            $this->assertContains('\'default\' => env(\'DB_CONNECTION\', \'mysql\')', $appConfigFile);
-            $this->assertContains('\'port\' => env(\'DB_PORT\', 3306),', $appConfigFile);
-            // Both the following configurations had values in the original config, they should be stripped out once
-            // the .env file is generated.
-            $this->assertContains('\'username\' => env(\'DB_USERNAME\', \'\'),', $appConfigFile);
-            $this->assertContains('\'password\' => env(\'DB_PASSWORD\', \'\'),', $appConfigFile);
-        }
+        $this->assertStringContainsString('\'default\' => env(\'DB_CONNECTION\', \'mysql\')', $appConfigFile);
+        $this->assertStringContainsString('\'port\' => env(\'DB_PORT\', 3306),', $appConfigFile);
+        // Both the following configurations had values in the original config, they should be stripped out once
+        // the .env file is generated.
+        $this->assertStringContainsString('\'username\' => env(\'DB_USERNAME\', \'\'),', $appConfigFile);
+        $this->assertStringContainsString('\'password\' => env(\'DB_PASSWORD\', \'\'),', $appConfigFile);
     }
 
     protected function tearDown(): void