Renaming the 'null' terminus type to 'plain', as

requested in #960.

3 files changed, 9 insertions, 9 deletions

diff --git a/spec/unit/indirector/node/null.rb b/spec/unit/indirector/node/plain.rb
index 8125e59a1..105d0ed63 100755
--- a/spec/unit/indirector/node/null.rb
+++ b/spec/unit/indirector/node/plain.rb
@@ -2,11 +2,11 @@
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
-require 'puppet/indirector/node/null'
+require 'puppet/indirector/node/plain'
 
-describe Puppet::Node::Null do
+describe Puppet::Node::Plain do
     before do
-        @searcher = Puppet::Node::Null.new
+        @searcher = Puppet::Node::Plain.new
     end
 
     it "should call node_merge() on the returned node" do
diff --git a/spec/unit/indirector/null.rb b/spec/unit/indirector/plain.rb
index fe3a382dc..1277739af 100755
--- a/spec/unit/indirector/null.rb
+++ b/spec/unit/indirector/plain.rb
@@ -1,22 +1,22 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
-require 'puppet/indirector/null'
+require 'puppet/indirector/plain'
 
-describe Puppet::Indirector::Null do
+describe Puppet::Indirector::Plain do
     before do
         Puppet::Indirector::Terminus.stubs(:register_terminus_class)
         @model = mock 'model'
         @indirection = stub 'indirection', :name => :mystuff, :register_terminus_type => nil, :model => @model
         Puppet::Indirector::Indirection.stubs(:instance).returns(@indirection)
 
-        @null_class = Class.new(Puppet::Indirector::Null) do
+        @plain_class = Class.new(Puppet::Indirector::Plain) do
             def self.to_s
                 "Mystuff::Testing"
             end
         end
 
-        @searcher = @null_class.new
+        @searcher = @plain_class.new
     end
 
     it "should return return an instance of the indirected model" do
diff --git a/spec/unit/node.rb b/spec/unit/node.rb
index 8aea6ef0b..0ce702936 100755
--- a/spec/unit/node.rb
+++ b/spec/unit/node.rb
@@ -123,8 +123,8 @@ describe Puppet::Node, " when indirecting" do
         Puppet::Node.find(:my_node.to_s)
     end
 
-    it "should default to the 'null' node terminus" do
-        Puppet::Node.indirection.terminus_class.should == :null
+    it "should default to the 'plain' node terminus" do
+        Puppet::Node.indirection.terminus_class.should == :plain
     end
 
     after do