Renaming the file_serving/{content,metadata} indirections

so that they make more sense in the REST API, and creating
stub tests for the indirection termini.  Now it's on to
create the rest of the tests for them.

6 files changed, 43 insertions, 2 deletions

diff --git a/spec/unit/file_serving/content.rb b/spec/unit/file_serving/content.rb
index 3882659b9..08397a067 100755
--- a/spec/unit/file_serving/content.rb
+++ b/spec/unit/file_serving/content.rb
@@ -4,6 +4,12 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/file_serving/content'
 
+describe Puppet::FileServing::Content do
+    it "should indirect file_content" do
+        Puppet::FileServing::Content.indirection.name.should == :file_content
+    end
+end
+
 describe Puppet::FileServing::Content, " when initializing" do
     before do
         @path = "/my/file"
diff --git a/spec/unit/file_serving/metadata.rb b/spec/unit/file_serving/metadata.rb
index 1af1fff18..c93465a45 100755
--- a/spec/unit/file_serving/metadata.rb
+++ b/spec/unit/file_serving/metadata.rb
@@ -4,6 +4,12 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/file_serving/metadata'
 
+describe Puppet::FileServing::Metadata do
+    it "should indirect file_metadata" do
+        Puppet::FileServing::Metadata.indirection.name.should == :file_metadata
+    end
+end
+
 describe Puppet::FileServing::Metadata, " when initializing" do
     it "should require a fully qualified file path" do
         proc { Puppet::FileServing::Metadata.new("unqualified") }.should raise_error(ArgumentError)
diff --git a/spec/unit/indirector/file_content/file.rb b/spec/unit/indirector/file_content/file.rb
new file mode 100755
index 000000000..68f8a38d0
--- /dev/null
+++ b/spec/unit/indirector/file_content/file.rb
@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-18.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/file_content/file'
+
+describe Puppet::Indirector::FileContent::File do
+    it "should be registered with the file_content indirection" do
+        Puppet::Indirector::Terminus.terminus_class(:file_content, :file).should equal(Puppet::Indirector::FileContent::File)
+    end
+end
+
diff --git a/spec/unit/indirector/content/rest.rb b/spec/unit/indirector/file_content/rest.rb
index 8527e2548..725e35075 100755
--- a/spec/unit/indirector/content/rest.rb
+++ b/spec/unit/indirector/file_content/rest.rb
@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/file_serving/content'
+require 'puppet/indirector/file_content'
 
 describe "Puppet::Indirector::Content::Rest" do
     it "should add the node's cert name to the arguments"
diff --git a/spec/unit/indirector/file_metadata/ral.rb b/spec/unit/indirector/file_metadata/ral.rb
new file mode 100755
index 000000000..0b0219980
--- /dev/null
+++ b/spec/unit/indirector/file_metadata/ral.rb
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+#
+#  Created by Luke Kanies on 2007-10-18.
+#  Copyright (c) 2007. All rights reserved.
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/file_metadata/ral'
+
+describe Puppet::Indirector::FileMetadata::Ral do
+    it "should be registered with the file_metadata indirection" do
+        Puppet::Indirector::Terminus.terminus_class(:file_metadata, :ral).should equal(Puppet::Indirector::FileMetadata::Ral)
+    end
+end
diff --git a/spec/unit/indirector/metadata/rest.rb b/spec/unit/indirector/file_metadata/rest.rb
index 745456e1b..e93406f88 100755
--- a/spec/unit/indirector/metadata/rest.rb
+++ b/spec/unit/indirector/file_metadata/rest.rb
@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/file_serving/metadata'
+require 'puppet/indirector/file_metadata'
 
 describe "Puppet::Indirector::Metadata::Rest" do
     it "should add the node's cert name to the arguments"