From 8095c8ee4e6c8b45fbb02d1189f7e0bcd4703d8c Mon Sep 17 00:00:00 2001
From: Raphael Saunier <raphael.saunier@gmail.com>
Date: Mon, 11 Jul 2016 19:53:24 +0200
Subject: [PATCH 1/4] seeIsSelected for <option> tags without value attribute

---
 .../Testing/Constraints/IsSelected.php        | 17 ++++++++++++--
 .../FoundationInteractsWithPagesTest.php      | 22 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php b/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
index a9324cabd8d..a05811de5db 100644
--- a/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
+++ b/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
@@ -60,17 +60,30 @@ protected function getSelectedValueFromSelect(Crawler $select)
             if ($option->nodeName === 'optgroup') {
                 foreach ($option->childNodes as $child) {
                     if ($child->hasAttribute('selected')) {
-                        $selected[] = $child->getAttribute('value');
+                        $selected[] = $this->getOptionValue($child);
                     }
                 }
             } elseif ($option->hasAttribute('selected')) {
-                $selected[] = $option->getAttribute('value');
+                $selected[] = $this->getOptionValue($option);
             }
         }
 
         return $selected;
     }
 
+    /**
+     * Get the selected value from an option element.
+     *
+     * @return string
+     */
+    protected function getOptionValue(\DOMElement $option)
+    {
+        if($option->hasAttribute('value')){
+            return $option->getAttribute('value');
+        }
+        return $option->textContent;
+    }
+
     /**
      * Get the checked value from a radio group.
      *
diff --git a/tests/Foundation/FoundationInteractsWithPagesTest.php b/tests/Foundation/FoundationInteractsWithPagesTest.php
index 81119a9cf5d..74debdf27a6 100644
--- a/tests/Foundation/FoundationInteractsWithPagesTest.php
+++ b/tests/Foundation/FoundationInteractsWithPagesTest.php
@@ -215,6 +215,28 @@ public function testDontSeeOptionIsSelected()
         $this->dontSeeIsSelected('availability', 'partial_time');
     }
 
+    protected function getSelectHtmlWithoutValueAttribute()
+    {
+        return
+            '<select name="size">
+              <option>S</option>
+              <option selected>M</option>
+              <option>L</option>
+          </select>';
+    }
+
+    public function testSeeOptionWithoutValueIsSelected()
+    {
+        $this->setCrawler($this->getSelectHtmlWithoutValueAttribute());
+        $this->seeIsSelected('size', 'M');
+    }
+
+    public function testDontSeeOptionWithoutValueIsSelected()
+    {
+        $this->setCrawler($this->getSelectHtmlWithoutValueAttribute());
+        $this->dontSeeIsSelected('size', 'S');
+    }
+
     protected function getEmptySelectHtml()
     {
         return

From 137a20729aead7eeb0e783d2867ac6f6d4f8010c Mon Sep 17 00:00:00 2001
From: Raphael Saunier <raphael.saunier@gmail.com>
Date: Mon, 11 Jul 2016 20:08:22 +0200
Subject: [PATCH 2/4] PHPDoc

---
 src/Illuminate/Foundation/Testing/Constraints/IsSelected.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php b/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
index a05811de5db..ed055e5b6f7 100644
--- a/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
+++ b/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
@@ -74,6 +74,7 @@ protected function getSelectedValueFromSelect(Crawler $select)
     /**
      * Get the selected value from an option element.
      *
+     * @param \DOMElement $option
      * @return string
      */
     protected function getOptionValue(\DOMElement $option)

From 307f5bfa5b6242720d3e6e0c16023045f265aa81 Mon Sep 17 00:00:00 2001
From: Raphael Saunier <raphael.saunier@gmail.com>
Date: Mon, 11 Jul 2016 20:19:47 +0200
Subject: [PATCH 3/4] Fix imports & StyleCI

---
 .../Foundation/Testing/Constraints/IsSelected.php          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php b/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
index ed055e5b6f7..a1aa16dcecd 100644
--- a/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
+++ b/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Foundation\Testing\Constraints;
 
+use DOMElement;
 use Symfony\Component\DomCrawler\Crawler;
 
 class IsSelected extends FormFieldConstraint
@@ -74,12 +75,12 @@ protected function getSelectedValueFromSelect(Crawler $select)
     /**
      * Get the selected value from an option element.
      *
-     * @param \DOMElement $option
+     * @param DOMElement $option
      * @return string
      */
-    protected function getOptionValue(\DOMElement $option)
+    protected function getOptionValue(DOMElement $option)
     {
-        if($option->hasAttribute('value')){
+        if ($option->hasAttribute('value')) {
             return $option->getAttribute('value');
         }
         return $option->textContent;

From e0402651d6ef8d6fa0a9d2c0737b01bed1389e74 Mon Sep 17 00:00:00 2001
From: Raphael Saunier <raphael.saunier@gmail.com>
Date: Mon, 11 Jul 2016 20:30:31 +0200
Subject: [PATCH 4/4] Style fixes

---
 src/Illuminate/Foundation/Testing/Constraints/IsSelected.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php b/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
index a1aa16dcecd..9cd5a51a424 100644
--- a/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
+++ b/src/Illuminate/Foundation/Testing/Constraints/IsSelected.php
@@ -75,7 +75,7 @@ protected function getSelectedValueFromSelect(Crawler $select)
     /**
      * Get the selected value from an option element.
      *
-     * @param DOMElement $option
+     * @param \DOMElement $option
      * @return string
      */
     protected function getOptionValue(DOMElement $option)
@@ -83,6 +83,7 @@ protected function getOptionValue(DOMElement $option)
         if ($option->hasAttribute('value')) {
             return $option->getAttribute('value');
         }
+        
         return $option->textContent;
     }