diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-10 23:57:01 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-03-10 23:57:01 +0100 |
| commit | f97db66038968542deefbf9817a3dd49b67b1904 (patch) | |
| tree | 6995f5bfd7017999a743c327474afc7b9514d94f /_test/tests/inc/httpclient_http_proxy.test.php | |
| parent | 6384941886832589f7bb3c13bc18115499cf9369 (diff) | |
| parent | 9f12fc1cc9e916c3172a0cf8953ed70fd18f2ec1 (diff) | |
| download | rpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.gz rpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into userlink
Conflicts:
inc/parser/renderer.php
inc/template.php
Diffstat (limited to '_test/tests/inc/httpclient_http_proxy.test.php')
| -rw-r--r-- | _test/tests/inc/httpclient_http_proxy.test.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/_test/tests/inc/httpclient_http_proxy.test.php b/_test/tests/inc/httpclient_http_proxy.test.php index 4aa039fcc..c44dc7ed7 100644 --- a/_test/tests/inc/httpclient_http_proxy.test.php +++ b/_test/tests/inc/httpclient_http_proxy.test.php @@ -1,5 +1,7 @@ <?php +require_once (__DIR__ . '/httpclient_mock.php'); + class httpclient_http_proxy_test extends DokuWikiTest { protected $url = 'http://test.dokuwiki.org/README'; @@ -7,7 +9,7 @@ class httpclient_http_proxy_test extends DokuWikiTest { * @group internet */ function test_simpleget(){ - $http = new HTTPClient(); + $http = new HTTPMockClient(); // proxy provided by Andrwe Lord Weber <dokuwiki@andrwe.org> $http->proxy_host = 'proxy.andrwe.org'; $http->proxy_port = 8080; @@ -16,5 +18,4 @@ class httpclient_http_proxy_test extends DokuWikiTest { $this->assertFalse($data === false, 'HTTP response '.$http->error); $this->assertTrue(strpos($data,'DokuWiki') !== false, 'response content'); } - }
\ No newline at end of file |