From a9dbb5de66c9a97d13f7e7ade47bb6c3b5fa2e66 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Tue, 4 Nov 2008 17:22:27 -0600 Subject: Deduplicating slashes in the fileserving code Signed-off-by: Luke Kanies --- spec/integration/indirector/direct_file_server.rb | 2 +- spec/unit/file_serving/base.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'spec') diff --git a/spec/integration/indirector/direct_file_server.rb b/spec/integration/indirector/direct_file_server.rb index 417d661e8..c379bcbb7 100755 --- a/spec/integration/indirector/direct_file_server.rb +++ b/spec/integration/indirector/direct_file_server.rb @@ -64,7 +64,7 @@ describe Puppet::Indirector::DirectFileServer, " when interacting with FileServi case instance.full_path when /one/: instance.content.should == "one content" when /two/: instance.content.should == "two content" - when /\.$/: + when @path: else raise "No valid key for %s" % instance.path.inspect end diff --git a/spec/unit/file_serving/base.rb b/spec/unit/file_serving/base.rb index 6a76d81e9..4eb62b038 100755 --- a/spec/unit/file_serving/base.rb +++ b/spec/unit/file_serving/base.rb @@ -90,6 +90,11 @@ describe Puppet::FileServing::Base do @file.relative_path = "not/qualified" @file.full_path.should == "/this/file/not/qualified" end + + it "should strip extra slashes" do + file = Puppet::FileServing::Base.new("//this//file") + file.full_path.should == "/this/file" + end end describe "when stat'ing files" do -- cgit