Skip to content

Commit fc9e701

Browse files
committed
Fix base component to trim trailing slash from the URL
1 parent 239435e commit fc9e701

File tree

3 files changed

+43
-2
lines changed

3 files changed

+43
-2
lines changed

src/Google/Http/Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function getBaseComponent()
8383
*/
8484
public function setBaseComponent($baseComponent)
8585
{
86-
$this->baseComponent = $baseComponent;
86+
$this->baseComponent = rtrim($baseComponent, '/');
8787
}
8888

8989
/**

tests/general/Http/BatchTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
class BatchTest extends PHPUnit_Framework_TestCase
18+
class Google_Http_BatchTest extends PHPUnit_Framework_TestCase
1919
{
2020

2121
public function setUp()

tests/general/Http/RequestTest.php

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?php
2+
/*
3+
* Copyright 2011 Google Inc.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
class Google_Http_RequestTest extends PHPUnit_Framework_TestCase
19+
{
20+
21+
public function testBaseComponentDefault()
22+
{
23+
$request = new Google_Http_Request("https://api.example.com/base");
24+
$this->assertEquals("https://api.example.com", $request->getBaseComponent());
25+
}
26+
27+
public function testBaseComponentExplicitStripsSlashes()
28+
{
29+
$request = new Google_Http_Request("https://api.example.com/base");
30+
$request->setBaseComponent("https://other.example.com/");
31+
$this->assertEquals("https://other.example.com", $request->getBaseComponent());
32+
}
33+
34+
public function testBaseComponentWithPathExplicitStripsSlashes()
35+
{
36+
$request = new Google_Http_Request("https://api.example.com/base");
37+
$request->setBaseComponent("https://other.example.com/path/");
38+
$this->assertEquals("https://other.example.com/path", $request->getBaseComponent());
39+
}
40+
41+
}

0 commit comments

Comments
 (0)