Merge branch 'yob-yob/8.x' into 8.x

Author: taylorotwell

src/Illuminate/Foundation/Testing/Concerns/InteractsWithViews.php

@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\View as ViewFacade;
 use Illuminate\Support\MessageBag;
 use Illuminate\Support\ViewErrorBag;
+use Illuminate\Testing\TestComponent;
 use Illuminate\Testing\TestView;
 use Illuminate\View\View;
 
@@ -51,17 +52,19 @@ protected function blade(string $template, array $data = [])
      *
      * @param  string  $componentClass
      * @param  \Illuminate\Contracts\Support\Arrayable|array  $data
-     * @return \Illuminate\Testing\TestView
+     * @return \Illuminate\Testing\TestComponent
      */
     protected function component(string $componentClass, array $data = [])
     {
         $component = $this->app->make($componentClass, $data);
 
         $view = value($component->resolveView(), $data);
 
-        return $view instanceof View
-                ? new TestView($view->with($component->data()))
-                : new TestView(view($view, $component->data()));
+        $view = $view instanceof View
+            ? $view->with($component->data())
+            : view($view, $component->data());
+
+        return new TestComponent($component, $view);
     }
 
     /**

src/Illuminate/Testing/TestComponent.php

@@ -0,0 +1,167 @@
+<?php
+
+namespace Illuminate\Testing;
+
+use Illuminate\Testing\Assert as PHPUnit;
+use Illuminate\Testing\Constraints\SeeInOrder;
+use Illuminate\View\Component;
+
+class TestComponent
+{
+    /**
+    * The original component.
+    *
+    * @var \Illuminate\View\Component
+    */
+    public $component;
+
+    /**
+    * The rendered component contents.
+    *
+    * @var string
+    */
+    protected $rendered;
+
+    /**
+    * Create a new test component instance.
+    *
+    * @param  \Illuminate\View\Component  $component
+    * @param  \Illuminate\View\View  $view
+    * @return void
+    */
+    public function __construct($component, $view)
+    {
+        $this->component = $component;
+
+        $this->rendered = $view->render();
+    }
+
+    /**
+    * Assert that the given string is contained within the rendered component.
+    *
+    * @param  string  $value
+    * @param  bool  $escape
+    * @return $this
+    */
+    public function assertSee($value, $escape = true)
+    {
+        $value = $escape ? e($value) : $value;
+
+        PHPUnit::assertStringContainsString((string) $value, $this->rendered);
+
+        return $this;
+    }
+
+    /**
+    * Assert that the given strings are contained in order within the rendered component.
+    *
+    * @param  array  $values
+    * @param  bool  $escape
+    * @return $this
+    */
+    public function assertSeeInOrder(array $values, $escape = true)
+    {
+        $values = $escape ? array_map('e', ($values)) : $values;
+
+        PHPUnit::assertThat($values, new SeeInOrder($this->rendered));
+
+        return $this;
+    }
+
+    /**
+    * Assert that the given string is contained within the rendered component text.
+    *
+    * @param  string  $value
+    * @param  bool  $escape
+    * @return $this
+    */
+    public function assertSeeText($value, $escape = true)
+    {
+        $value = $escape ? e($value) : $value;
+
+        PHPUnit::assertStringContainsString((string) $value, strip_tags($this->rendered));
+
+        return $this;
+    }
+
+    /**
+    * Assert that the given strings are contained in order within the rendered component text.
+    *
+    * @param  array  $values
+    * @param  bool  $escape
+    * @return $this
+    */
+    public function assertSeeTextInOrder(array $values, $escape = true)
+    {
+        $values = $escape ? array_map('e', ($values)) : $values;
+
+        PHPUnit::assertThat($values, new SeeInOrder(strip_tags($this->rendered)));
+
+        return $this;
+    }
+
+    /**
+    * Assert that the given string is not contained within the rendered component.
+    *
+    * @param  string  $value
+    * @param  bool  $escape
+    * @return $this
+    */
+    public function assertDontSee($value, $escape = true)
+    {
+        $value = $escape ? e($value) : $value;
+
+        PHPUnit::assertStringNotContainsString((string) $value, $this->rendered);
+
+        return $this;
+    }
+
+    /**
+    * Assert that the given string is not contained within the rendered component text.
+    *
+    * @param  string  $value
+    * @param  bool  $escape
+    * @return $this
+    */
+    public function assertDontSeeText($value, $escape = true)
+    {
+        $value = $escape ? e($value) : $value;
+
+        PHPUnit::assertStringNotContainsString((string) $value, strip_tags($this->rendered));
+
+        return $this;
+    }
+
+    /**
+    * Get the string contents of the rendered component.
+    *
+    * @return string
+    */
+    public function __toString()
+    {
+        return $this->rendered;
+    }
+
+    /**
+     * Dynamically access properties on the underlying component.
+     *
+     * @param  string  $attribute
+     * @return mixed
+     */
+    public function __get($attribute)
+    {
+        return $this->component->{$attribute};
+    }
+
+    /**
+     * Dynamically call methods on the underlying component.
+     *
+     * @param  string  $method
+     * @param  array  $parameters
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        return $this->component->{$method}(...$parameters);
+    }
+}

tests/Foundation/Testing/Concerns/InteractsWithViewsTest.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Tests\Foundation\Testing\Concerns;
 
 use Illuminate\Foundation\Testing\Concerns\InteractsWithViews;
+use Illuminate\View\Component;
 use Orchestra\Testbench\TestCase;
 
 class InteractsWithViewsTest extends TestCase
@@ -15,4 +16,26 @@ public function testBladeCorrectlyRendersString()
 
         $this->assertEquals('test ', $string);
     }
+
+    public function testComponentCanAccessPublicProperties()
+    {
+        $exampleComponent = new class extends Component
+        {
+            public $foo = 'bar';
+            public function speak()
+            {
+                return 'hello';
+            }
+            public function render()
+            {
+                return 'rendered content';
+            }
+        };
+
+        $component = $this->component(get_class($exampleComponent));
+
+        $this->assertEquals('bar', $component->foo);
+        $this->assertEquals('hello', $component->speak());
+        $component->assertSee('content');
+    }
 }