Merge pull request #18 from samrap/dev

Fix #17

Author: Sam Rapaport

_config.yml

@@ -157,6 +157,8 @@ public function escape($func = 'esc_html')
     public function shortcodes()
     {
         $this->shortcodes = true;
+
+        return $this;
     }
 
     /*

src/Fluent/Builder.php

@@ -26,8 +26,9 @@ public function setExpect()
     {
         $builder = new Builder(new RunnerMock);
 
-        $builder->expect('string');
+        $return = $builder->expect('string');
 
+        $this->assertSame($builder, $return);
         $this->assertEquals('string', $builder->expect);
     }
 
@@ -36,8 +37,9 @@ public function setDefault()
     {
         $builder = new Builder(new RunnerMock);
 
-        $builder->default('bar');
+        $return = $builder->default('bar');
 
+        $this->assertSame($builder, $return);
         $this->assertEquals('bar', $builder->default);
     }
 
@@ -46,8 +48,9 @@ public function setEscape()
     {
         $builder = new Builder(new RunnerMock);
 
-        $builder->escape();
+        $return = $builder->escape();
 
+        $this->assertSame($builder, $return);
         $this->assertEquals('esc_html', $builder->escape);
     }
 
@@ -56,8 +59,9 @@ public function setEscapeAllowsCustomFunction()
     {
         $builder = new Builder(new RunnerMock);
 
-        $builder->escape('htmlentities');
+        $return = $builder->escape('htmlentities');
 
+        $this->assertSame($builder, $return);
         $this->assertEquals('htmlentities', $builder->escape);
     }
 
@@ -66,8 +70,9 @@ public function setId()
     {
         $builder = new Builder(new RunnerMock);
 
-        $builder->id(2);
+        $return = $builder->id(2);
 
+        $this->assertSame($builder, $return);
         $this->assertEquals(2, $builder->id);
     }
 
@@ -76,8 +81,9 @@ public function setShortcodes()
     {
         $builder = new Builder(new RunnerMock);
 
-        $builder->shortcodes();
+        $return = $builder->shortcodes();
 
+        $this->assertSame($builder, $return);
         $this->assertTrue($builder->shortcodes);
     }
 
@@ -86,29 +92,12 @@ public function setRaw()
     {
         $builder = new Builder(new RunnerMock);
 
-        $builder->raw();
+        $return = $builder->raw();
 
+        $this->assertSame($builder, $return);
         $this->assertTrue($builder->raw);
     }
 
-    /** @test */
-    public function fluentBuilder()
-    {
-        $builder = new Builder(new RunnerMock);
-
-        $builder
-            ->field('foo')
-            ->id(2)
-            ->expect('string')
-            ->default('bar')
-            ->escape();
-
-        $this->assertEquals('foo', $builder->field);
-        $this->assertEquals('string', $builder->expect);
-        $this->assertEquals('bar', $builder->default);
-        $this->assertEquals('esc_html', $builder->escape);
-    }
-
     /** @test */
     public function builderGet()
     {