summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rwxr-xr-xspec/unit/application/indirection_base_spec.rb4
-rwxr-xr-xspec/unit/indirector/face_spec.rb (renamed from spec/unit/face/indirector_spec.rb)16
2 files changed, 10 insertions, 10 deletions
diff --git a/spec/unit/application/indirection_base_spec.rb b/spec/unit/application/indirection_base_spec.rb
index e0a9bebb4..910774c14 100755
--- a/spec/unit/application/indirection_base_spec.rb
+++ b/spec/unit/application/indirection_base_spec.rb
@@ -1,14 +1,14 @@
#!/usr/bin/env rspec
require 'spec_helper'
require 'puppet/application/indirection_base'
-require 'puppet/face/indirector'
+require 'puppet/indirector/face'
########################################################################
# Stub for testing; the names are critical, sadly. --daniel 2011-03-30
class Puppet::Application::TestIndirection < Puppet::Application::IndirectionBase
end
-face = Puppet::Face::Indirector.define(:testindirection, '0.0.1') do
+face = Puppet::Indirector::Face.define(:testindirection, '0.0.1') do
summary "fake summary"
end
# REVISIT: This horror is required because we don't allow anything to be
diff --git a/spec/unit/face/indirector_spec.rb b/spec/unit/indirector/face_spec.rb
index e7dd44f3d..1530f7270 100755
--- a/spec/unit/face/indirector_spec.rb
+++ b/spec/unit/indirector/face_spec.rb
@@ -1,10 +1,10 @@
#!/usr/bin/env rspec
require 'spec_helper'
-require 'puppet/face/indirector'
+require 'puppet/indirector/face'
-describe Puppet::Face::Indirector do
+describe Puppet::Indirector::Face do
subject do
- instance = Puppet::Face::Indirector.new(:test, '0.0.1')
+ instance = Puppet::Indirector::Face.new(:test, '0.0.1')
indirection = stub('indirection',
:name => :stub_indirection,
:reset_terminus_class => nil)
@@ -13,24 +13,24 @@ describe Puppet::Face::Indirector do
end
it "should be able to return a list of indirections" do
- Puppet::Face::Indirector.indirections.should be_include("catalog")
+ Puppet::Indirector::Face.indirections.should be_include("catalog")
end
it "should be able to return a list of terminuses for a given indirection" do
- Puppet::Face::Indirector.terminus_classes(:catalog).should be_include("compiler")
+ Puppet::Indirector::Face.terminus_classes(:catalog).should be_include("compiler")
end
describe "as an instance" do
it "should be able to determine its indirection" do
# Loading actions here an get, um, complicated
Puppet::Face.stubs(:load_actions)
- Puppet::Face::Indirector.new(:catalog, '0.0.1').indirection.should equal(Puppet::Resource::Catalog.indirection)
+ Puppet::Indirector::Face.new(:catalog, '0.0.1').indirection.should equal(Puppet::Resource::Catalog.indirection)
end
end
[:find, :search, :save, :destroy].each do |method|
it "should define a '#{method}' action" do
- Puppet::Face::Indirector.should be_action(method)
+ Puppet::Indirector::Face.should be_action(method)
end
it "should call the indirection method with options when the '#{method}' action is invoked" do
@@ -54,6 +54,6 @@ describe Puppet::Face::Indirector do
end
it "should define a class-level 'info' action" do
- Puppet::Face::Indirector.should be_action(:info)
+ Puppet::Indirector::Face.should be_action(:info)
end
end