commit c973e65e8b77314db88e9df567bec89681ce926b
Author: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date:   Wed Jul 16 22:07:23 2014 +1000

    Fix fails after removing setClientOptions

diff --git a/core/modules/simpletest/src/BrowserTestBase.php b/core/modules/simpletest/src/BrowserTestBase.php
index 71a2dcc..83626c7 100644
--- a/core/modules/simpletest/src/BrowserTestBase.php
+++ b/core/modules/simpletest/src/BrowserTestBase.php
@@ -1384,9 +1384,6 @@ protected function curlExec($curl_options, $redirect = FALSE) {
       }
     }
 
-    // Set client options on Goutte's Guzzle client.
-    $this->setClientOptions($this->additionalCurlOptions + $curl_options);
-
     if (!$redirect) {
       // Reset headers, the session ID and the redirect counter.
       $this->session_id = NULL;
@@ -3180,7 +3177,8 @@ protected function prepareRequestForGenerator($clean_urls = TRUE, $override_serv
     $server = array_merge($server, $override_server_vars);
 
     $request = Request::create($request_path, 'GET', array(), array(), array(), $server);
-    $generator->setRequest($request);
+    $this->container->get('request_stack')->push($request);
+    $generator->updateFromRequest();
     return $request;
   }
 
diff --git a/core/modules/simpletest/src/Tests/MinkNodeElementDecoratorTest.php b/core/modules/simpletest/src/Tests/MinkNodeElementDecoratorTest.php
index 6502bdd..909201e 100644
--- a/core/modules/simpletest/src/Tests/MinkNodeElementDecoratorTest.php
+++ b/core/modules/simpletest/src/Tests/MinkNodeElementDecoratorTest.php
@@ -13,8 +13,6 @@
 /**
  * Tests helper methods provided by the Mink node decorator.
  *
- * @coversDefaultClass \Drupal\simpletest\MinkNodeElementDecorator
- * @group Drupal
  * @group simpletest
  */
 class MinkNodeElementDecoratorTest extends BrowserTestBase {
@@ -26,18 +24,8 @@ class MinkNodeElementDecoratorTest extends BrowserTestBase {
    */
   public static $modules = array('mink_test');
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Mink node element decorator',
-      'description' => 'Test Mink node element decorator logic.',
-      'group' => 'Simpletest',
-    );
-  }
-
   /**
    * Test decorator.
-   *
-   * @covers MinkNodeElementDecorator::__get
    */
   public function testDecorator() {
     $this->drupalGet("/mink-test-1");
@@ -45,11 +33,6 @@ public function testDecorator() {
     $container = $element->find("css", "#test-lists-1");
     $container = new MinkNodeElementDecorator($container);
 
-    // Ensure we are not working all the way down the tree every time we do a
-    // find. We want to make sure it's working in a jQuery like fashion so we
-    // don't end up with weird results.
-    // @todo, @nick_schuch, for laters.
-
     // Look for a multiple lists on the page. Should return an array of objects
     // since that list has children (list items).
     $this->assertTrue(count($container->ul) > 1, "Array of objects found.");