Skip to content

Commit 7ca7ac3

Browse files
zachborboazachborboa
committed
Use request-line header and effectiveUrl for assertions
1 parent a7b9042 commit 7ca7ac3

File tree

3 files changed

+44
-41
lines changed

3 files changed

+44
-41
lines changed

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ Curl::getCookie($key)
194194
Curl::getInfo($opt)
195195
Curl::getOpt($option)
196196
Curl::getResponseCookie($key)
197-
Curl::getResponseCookies()
198197
Curl::head($url, $data = array())
199198
Curl::headerCallback($ch, $header)
200199
Curl::options($url, $data = array())

‎tests/PHPCurlClass/PHPCurlClassTest.php

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -201,53 +201,46 @@ public function testSetUrl()
201201
$data = array('key' => 'value');
202202

203203
$curl = new Curl();
204-
$curl->setHeader('X-DEBUG-TEST', 'get');
205204
$curl->setUrl(Test::TEST_URL);
206205
$curl->delete($data);
207-
$this->assertEquals(Test::TEST_URL, $curl->baseUrl);
208-
$this->assertEquals('key=value', $curl->response);
206+
$this->assertEquals('DELETE /?key=value HTTP/1.1', $curl->requestHeaders['Request-Line']);
207+
$this->assertEquals(Test::TEST_URL . '?key=value', $curl->effectiveUrl);
209208

210209
$curl = new Curl();
211-
$curl->setHeader('X-DEBUG-TEST', 'get');
212210
$curl->setUrl(Test::TEST_URL);
213211
$curl->get($data);
214-
$this->assertEquals(Test::TEST_URL, $curl->baseUrl);
215-
$this->assertEquals('key=value', $curl->response);
212+
$this->assertEquals('GET /?key=value HTTP/1.1', $curl->requestHeaders['Request-Line']);
213+
$this->assertEquals(Test::TEST_URL . '?key=value', $curl->effectiveUrl);
216214

217215
$curl = new Curl();
218-
$curl->setHeader('X-DEBUG-TEST', 'get');
219216
$curl->setUrl(Test::TEST_URL);
220217
$curl->head($data);
221-
$this->assertEquals(Test::TEST_URL, $curl->baseUrl);
222218
$this->assertEquals('HEAD /?key=value HTTP/1.1', $curl->requestHeaders['Request-Line']);
219+
$this->assertEquals(Test::TEST_URL . '?key=value', $curl->effectiveUrl);
223220

224221
$curl = new Curl();
225-
$curl->setHeader('X-DEBUG-TEST', 'get');
226222
$curl->setUrl(Test::TEST_URL);
227223
$curl->options($data);
228-
$this->assertEquals(Test::TEST_URL, $curl->baseUrl);
229-
$this->assertEquals('key=value', $curl->response);
224+
$this->assertEquals('OPTIONS /?key=value HTTP/1.1', $curl->requestHeaders['Request-Line']);
225+
$this->assertEquals(Test::TEST_URL . '?key=value', $curl->effectiveUrl);
230226

231227
$curl = new Curl();
232-
$curl->setHeader('X-DEBUG-TEST', 'request_method');
233228
$curl->setUrl(Test::TEST_URL);
234229
$curl->patch($data);
235-
$this->assertEquals(Test::TEST_URL, $curl->baseUrl);
236-
$this->assertEquals('PATCH', $curl->response);
230+
$this->assertEquals('PATCH / HTTP/1.1', $curl->requestHeaders['Request-Line']);
231+
$this->assertEquals(Test::TEST_URL, $curl->effectiveUrl);
237232

238233
$curl = new Curl();
239-
$curl->setHeader('X-DEBUG-TEST', 'post');
240234
$curl->setUrl(Test::TEST_URL);
241235
$curl->post($data);
242-
$this->assertEquals(Test::TEST_URL, $curl->baseUrl);
243-
$this->assertEquals('key=value', $curl->response);
236+
$this->assertEquals('POST / HTTP/1.1', $curl->requestHeaders['Request-Line']);
237+
$this->assertEquals(Test::TEST_URL, $curl->effectiveUrl);
244238

245239
$curl = new Curl();
246-
$curl->setHeader('X-DEBUG-TEST', 'put');
247240
$curl->setUrl(Test::TEST_URL);
248241
$curl->put($data);
249-
$this->assertEquals(Test::TEST_URL, $curl->baseUrl);
250-
$this->assertEquals('key=value', $curl->response);
242+
$this->assertEquals('PUT / HTTP/1.1', $curl->requestHeaders['Request-Line']);
243+
$this->assertEquals(Test::TEST_URL, $curl->effectiveUrl);
251244
}
252245

253246
public function testEffectiveUrl()

‎tests/PHPCurlClass/PHPMultiCurlClassTest.php

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2230,65 +2230,76 @@ public function testSetUrl()
22302230
$data = array('key' => 'value');
22312231

22322232
$multi_curl = new MultiCurl();
2233-
$multi_curl->setHeader('X-DEBUG-TEST', 'get');
22342233
$multi_curl->setUrl(Test::TEST_URL);
22352234
$multi_curl->addDelete($data)->complete(function ($instance) {
2236-
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl);
2237-
PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response);
2235+
PHPUnit_Framework_Assert::assertEquals(
2236+
'DELETE /?key=value HTTP/1.1',
2237+
$instance->requestHeaders['Request-Line']
2238+
);
2239+
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL . '?key=value', $instance->effectiveUrl);
22382240
});
22392241
$multi_curl->start();
22402242

22412243
$multi_curl = new MultiCurl();
2242-
$multi_curl->setHeader('X-DEBUG-TEST', 'get');
22432244
$multi_curl->setUrl(Test::TEST_URL);
22442245
$multi_curl->addGet($data)->complete(function ($instance) {
2245-
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl);
2246-
PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response);
2246+
PHPUnit_Framework_Assert::assertEquals(
2247+
'GET /?key=value HTTP/1.1',
2248+
$instance->requestHeaders['Request-Line']
2249+
);
2250+
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL . '?key=value', $instance->effectiveUrl);
22472251
});
22482252
$multi_curl->start();
22492253

22502254
$multi_curl = new MultiCurl();
2251-
$multi_curl->setHeader('X-DEBUG-TEST', 'get');
22522255
$multi_curl->setUrl(Test::TEST_URL);
22532256
$multi_curl->addHead($data)->complete(function ($instance) {
2254-
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl);
22552257
PHPUnit_Framework_Assert::assertEquals(
22562258
'HEAD /?key=value HTTP/1.1',
22572259
$instance->requestHeaders['Request-Line']
22582260
);
2261+
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL . '?key=value', $instance->effectiveUrl);
22592262
});
22602263
$multi_curl->start();
22612264

22622265
$multi_curl = new MultiCurl();
2263-
$multi_curl->setHeader('X-DEBUG-TEST', 'get');
22642266
$multi_curl->setUrl(Test::TEST_URL);
22652267
$multi_curl->addOptions($data)->complete(function ($instance) {
2266-
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl);
2267-
PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response);
2268+
PHPUnit_Framework_Assert::assertEquals(
2269+
'OPTIONS /?key=value HTTP/1.1',
2270+
$instance->requestHeaders['Request-Line']
2271+
);
2272+
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL . '?key=value', $instance->effectiveUrl);
22682273
});
22692274

22702275
$multi_curl = new MultiCurl();
2271-
$multi_curl->setHeader('X-DEBUG-TEST', 'request_method');
22722276
$multi_curl->setUrl(Test::TEST_URL);
22732277
$multi_curl->addPatch($data)->complete(function ($instance) {
2274-
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl);
2275-
PHPUnit_Framework_Assert::assertEquals('PATCH', $instance->response);
2278+
PHPUnit_Framework_Assert::assertEquals(
2279+
'PATCH / HTTP/1.1',
2280+
$instance->requestHeaders['Request-Line']
2281+
);
2282+
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl);
22762283
});
22772284

22782285
$multi_curl = new MultiCurl();
2279-
$multi_curl->setHeader('X-DEBUG-TEST', 'post');
22802286
$multi_curl->setUrl(Test::TEST_URL);
22812287
$multi_curl->addPost($data)->complete(function ($instance) {
2282-
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl);
2283-
PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response);
2288+
PHPUnit_Framework_Assert::assertEquals(
2289+
'POST / HTTP/1.1',
2290+
$instance->requestHeaders['Request-Line']
2291+
);
2292+
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl);
22842293
});
22852294

22862295
$multi_curl = new MultiCurl();
2287-
$multi_curl->setHeader('X-DEBUG-TEST', 'put');
22882296
$multi_curl->setUrl(Test::TEST_URL);
22892297
$multi_curl->addPut($data)->complete(function ($instance) {
2290-
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->baseUrl);
2291-
PHPUnit_Framework_Assert::assertEquals('key=value', $instance->response);
2298+
PHPUnit_Framework_Assert::assertEquals(
2299+
'PUT / HTTP/1.1',
2300+
$instance->requestHeaders['Request-Line']
2301+
);
2302+
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->effectiveUrl);
22922303
});
22932304
}
22942305

0 commit comments

Comments
 (0)