fix unexpected output. flush expections

laravel · Nov 11, 2020 · c90fc5f · c90fc5f
1 parent 091509b
commit c90fc5f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithConsole.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithConsole.php
@@ -23,11 +23,11 @@ trait InteractsWithConsole
     public $expectedOutput = [];
 
     /**
-     * All of the output lines that are expected to never be output.
+     * All of the output lines that aren't expected to be displayed.
      *
      * @var array
      */
-    public $expectedOutputNever = [];
+    public $unexpectedOutput = [];
 
     /**
      * All of the expected ouput tables.

diff --git a/src/Illuminate/Testing/PendingCommand.php b/src/Illuminate/Testing/PendingCommand.php
@@ -139,9 +139,9 @@ public function expectsOutput($output)
      * @param  string  $output
      * @return $this
      */
-    public function expectsOutputNever($output)
+    public function doesntExpectOutput($output)
     {
-        $this->test->expectedOutputNever[$output] = false;
+        $this->test->unexpectedOutput[$output] = false;
 
         return $this;
     }
@@ -221,6 +221,7 @@ public function run()
         }
 
         $this->verifyExpectations();
+        $this->flushExpectations();
 
         return $exitCode;
     }
@@ -252,7 +253,7 @@ protected function verifyExpectations()
             $this->test->fail('Output "'.Arr::first($this->test->expectedOutput).'" was not printed.');
         }
 
-        if ($output = array_search(true, $this->test->expectedOutputNever)) {
+        if ($output = array_search(true, $this->test->unexpectedOutput)) {
             $this->test->fail('Output "'.$output.'" was printed.');
         }
     }
@@ -316,13 +317,13 @@ private function createABufferedOutputMock()
                 });
         }
 
-        foreach ($this->test->expectedOutputNever as $output => $displayed) {
+        foreach ($this->test->unexpectedOutput as $output => $displayed) {
             $mock->shouldReceive('doWrite')
                 ->once()
                 ->ordered()
                 ->with($output, Mockery::any())
                 ->andReturnUsing(function () use ($output) {
-                    $this->test->expectedOutputNever[$output] = true;
+                    $this->test->unexpectedOutput[$output] = true;
                 });
         }
 
@@ -359,6 +360,20 @@ private function applyTableOutputExpectations($mock)
         }
     }
 
+    /**
+     * Flush the expectations from the test case.
+     *
+     * @return void
+     */
+    protected function flushExpectations()
+    {
+        $this->test->expectedOutput = [];
+        $this->test->unexpectedOutput = [];
+        $this->test->expectedTables = [];
+        $this->test->expectedQuestions = [];
+        $this->test->expectedChoices = [];
+    }
+
     /**
      * Handle the object's destruction.
      *