Skip to content

Commit

Permalink
Fix base component to trim trailing slash from the URL
Browse files Browse the repository at this point in the history
  • Loading branch information
ircmaxell committed Jul 6, 2015
1 parent 239435e commit fc9e701
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Google/Http/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function getBaseComponent()
*/
public function setBaseComponent($baseComponent)
{
$this->baseComponent = $baseComponent;
$this->baseComponent = rtrim($baseComponent, '/');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/general/Http/BatchTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

class BatchTest extends PHPUnit_Framework_TestCase
class Google_Http_BatchTest extends PHPUnit_Framework_TestCase
{

public function setUp()
Expand Down
41 changes: 41 additions & 0 deletions tests/general/Http/RequestTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php
/*
* Copyright 2011 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

class Google_Http_RequestTest extends PHPUnit_Framework_TestCase
{

public function testBaseComponentDefault()
{
$request = new Google_Http_Request("https://api.example.com/base");
$this->assertEquals("https://api.example.com", $request->getBaseComponent());
}

public function testBaseComponentExplicitStripsSlashes()
{
$request = new Google_Http_Request("https://api.example.com/base");
$request->setBaseComponent("https://other.example.com/");
$this->assertEquals("https://other.example.com", $request->getBaseComponent());
}

public function testBaseComponentWithPathExplicitStripsSlashes()
{
$request = new Google_Http_Request("https://api.example.com/base");
$request->setBaseComponent("https://other.example.com/path/");
$this->assertEquals("https://other.example.com/path", $request->getBaseComponent());
}

}

0 comments on commit fc9e701

Please sign in to comment.