Add dedicated with* options methods in favour over withOptions

Author: WyriHaximus

src/Browser.php

@@ -327,6 +327,8 @@ public function withoutBase()
      *
      * @param array $options
      * @return self
+     *
+     * @deprecated Since 2.8.0 use withTimeout, withoutTimeout, withFollowRedirects, withMaxRedirects, or withObeySuccessCode instead.
      */
     public function withOptions(array $options)
     {
@@ -335,4 +337,54 @@ public function withOptions(array $options)
 
         return $browser;
     }
+
+    public function withTimeout($timeout)
+    {
+        $browser = clone $this;
+        $browser->transaction = $this->transaction->withOptions(array(
+            'timeout' => $timeout,
+        ));
+
+        return $browser;
+    }
+
+    public function withoutTimeout()
+    {
+        $browser = clone $this;
+        $browser->transaction = $this->transaction->withOptions(array(
+            'timeout' => null,
+        ));
+
+        return $browser;
+    }
+
+    public function withFollowRedirects($followRedirects)
+    {
+        $browser = clone $this;
+        $browser->transaction = $this->transaction->withOptions(array(
+            'followRedirects' => $followRedirects,
+        ));
+
+        return $browser;
+    }
+
+    public function withMaxRedirects($maxRedirects)
+    {
+        $browser = clone $this;
+        $browser->transaction = $this->transaction->withOptions(array(
+            'maxRedirects' => $maxRedirects,
+        ));
+
+        return $browser;
+    }
+
+    public function withObeySuccessCode($obeySuccessCode)
+    {
+        $browser = clone $this;
+        $browser->transaction = $this->transaction->withOptions(array(
+            'obeySuccessCode' => $obeySuccessCode,
+        ));
+
+        return $browser;
+    }
 }

tests/FunctionalBrowserTest.php

@@ -124,7 +124,7 @@ public function testCancelRedirectedRequestShouldReject()
      */
     public function testTimeoutDelayedResponseShouldReject()
     {
-        $promise = $this->browser->withOptions(array('timeout' => 0.1))->get($this->base . 'delay/10');
+        $promise = $this->browser->withTimeout(0.1)->get($this->base . 'delay/10');
 
         Block\await($promise, $this->loop);
     }
@@ -137,7 +137,7 @@ public function testTimeoutDelayedResponseShouldReject()
     public function testTimeoutDelayedResponseAfterStreamingRequestShouldReject()
     {
         $stream = new ThroughStream();
-        $promise = $this->browser->withOptions(array('timeout' => 0.1))->post($this->base . 'delay/10', array(), $stream);
+        $promise = $this->browser->withTimeout(0.1)->post($this->base . 'delay/10', array(), $stream);
         $stream->end();
 
         Block\await($promise, $this->loop);
@@ -149,7 +149,7 @@ public function testTimeoutDelayedResponseAfterStreamingRequestShouldReject()
      */
     public function testTimeoutNegativeShouldResolveSuccessfully()
     {
-        Block\await($this->browser->withOptions(array('timeout' => -1))->get($this->base . 'get'), $this->loop);
+        Block\await($this->browser->withTimeout(-1)->get($this->base . 'get'), $this->loop);
     }
 
     /**
@@ -176,7 +176,7 @@ public function testRedirectRequestAbsolute()
      */
     public function testNotFollowingRedirectsResolvesWithRedirectResult()
     {
-        $browser = $this->browser->withOptions(array('followRedirects' => false));
+        $browser = $this->browser->withFollowRedirects(false);
 
         Block\await($browser->get($this->base . 'redirect/3'), $this->loop);
     }
@@ -187,7 +187,7 @@ public function testNotFollowingRedirectsResolvesWithRedirectResult()
      */
     public function testRejectingRedirectsRejects()
     {
-        $browser = $this->browser->withOptions(array('maxRedirects' => 0));
+        $browser = $this->browser->withMaxRedirects(0);
 
         Block\await($browser->get($this->base . 'redirect/3'), $this->loop);
     }