Merge pull request zendframework#5523 in master

EvanDotPro · Feb 23, 2014 · 4179c4a · 4179c4a
2 parents 8dfcaa0 + 58d2e2f
commit 4179c4a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/tests/TestConfiguration.php.dist b/tests/TestConfiguration.php.dist
@@ -241,7 +241,7 @@ defined('TESTS_ZEND_FORM_RECAPTCHA_PRIVATE_KEY') || define('TESTS_ZEND_FORM_RECA
  * Zend\Http\Client tests
  *
  * To enable the dynamic Zend\Http\Client tests, you will need to symbolically
- * link or copy the files in tests/Zend/Http/Client/_files to a directory
+ * link or copy the files in tests/ZendTest/Http/Client/_files to a directory
  * under your web server(s) document root and set this constant to point to the
  * URL of this directory.
  */

diff --git a/tests/TestConfiguration.php.travis b/tests/TestConfiguration.php.travis
@@ -37,6 +37,12 @@ defined('TESTS_ZEND_FORM_ANNOTATION_SUPPORT') || define('TESTS_ZEND_FORM_ANNOTAT
  */
 defined('TESTS_ZEND_FILTER_COMPRESS_ZIP_ENABLED') || define('TESTS_ZEND_FILTER_COMPRESS_ZIP_ENABLED', false);
 
+/**
+ * Zend\Http
+ */
+/* Online Tests */
+defined('TESTS_ZEND_HTTP_CLIENT_ONLINE') || define('TESTS_ZEND_HTTP_CLIENT_ONLINE', true);
+
 /**
  * Zend\Cache\Storage\Adapter
  */

diff --git a/tests/ZendTest/Http/Client/SocketTest.php b/tests/ZendTest/Http/Client/SocketTest.php
@@ -86,7 +86,7 @@ public function testConnectingViaSslEnforcesDefaultSslOptionsOnContext()
     }
 
     /**
-     * Test that a Zend_Config object can be used to set configuration
+     * Test that a Zend\Config object can be used to set configuration
      *
      * @link http://framework.zend.com/issues/browse/ZF-5577
      */
@@ -116,7 +116,7 @@ public function testSetConfigInvalidConfig($config)
     {
         $this->setExpectedException(
             'Zend\Http\Client\Adapter\Exception\InvalidArgumentException',
-            'Array or Zend_Config object expected');
+            'Array or Zend\Config object expected');
 
         $this->_adapter->setOptions($config);
     }

diff --git a/tests/ZendTest/Http/Client/StaticTest.php b/tests/ZendTest/Http/Client/StaticTest.php
@@ -350,7 +350,7 @@ public function testSocketErrorException()
         }
         $this->setExpectedException(
             'Zend\Http\Client\Adapter\Exception\RuntimeException',
-            'Unable to Connect to tcp://255.255.255.255:80');
+            'Unable to connect to 255.255.255.255:80');
 
         // Try to connect to an invalid host
         $this->_client->setUri('http://255.255.255.255');

diff --git a/tests/ZendTest/Http/Client/_files/ZF7038-multipartarrayrequest.txt b/tests/ZendTest/Http/Client/_files/ZF7038-multipartarrayrequest.txt
@@ -1,7 +1,7 @@
 POST \/ HTTP\/1\.1
 Host: example\.com
 Connection: close
-Accept-encoding: gzip, deflate
+Accept-Encoding: gzip, deflate
 User-Agent: Zend_Http_Client
 Content-Type: multipart\/form-data; boundary=---ZENDHTTPCLIENT-\w+
 Content-Length: \d+