[Fixes #35655999] Gem does not strip "/" from target url

Change-Id: I73c62f5b0f35ad577f47269820416543027d1b45
cloudfoundry · Sep 7, 2012 · 0ed4e81 · 0ed4e81
1 parent ae74e32
commit 0ed4e81
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/gem/lib/cli/common.rb b/gem/lib/cli/common.rb
@@ -161,6 +161,10 @@ def config_pp(tgt = nil, ctx = nil)
   end
 
   def normalize_url(url, scheme = nil)
+    url.strip!
+    while url.end_with? "/"
+        url.chomp! "/"
+    end
     raise ArgumentError, "invalid whitespace in target url" if url =~ /\s/
     unless url =~ /^https?:\/\//
       return unless scheme

diff --git a/gem/spec/cli_spec.rb b/gem/spec/cli_spec.rb
@@ -73,6 +73,12 @@ module CF::UAA
     Config.yaml.should match "https://example.com"
   end
 
+  it "should strip trailing / from target" do
+    Cli.run("target example.com/uaa/ --force")
+    Config.yaml.should match "https://example.com/uaa"
+    Config.yaml.should_not match "https://example.com/uaa/"
+  end
+
   it "should set multiple targets and see them fully qualified in config and targets output" do
     Cli.run("target example.com --force")
     Cli.run("target example2.com --force")