Merge branch 'tickets/2.7.x/7259-make-active-record-test-requirement-optional' into 2.7.next

* tickets/2.7.x/7259-make-active-record-test-requirement-optional:
  (#7259) Remove ActiveRecord requirement from indirector face spec
  (#7259) Do not try to load all Terminus classes when configuring the Indirector

2 files changed, 12 insertions, 3 deletions

diff --git a/lib/puppet/indirector.rb b/lib/puppet/indirector.rb
index 7267ac7f3..86ede5994 100644
--- a/lib/puppet/indirector.rb
+++ b/lib/puppet/indirector.rb
@@ -18,7 +18,7 @@ module Puppet::Indirector
       terminus_name = termini["terminus"]
       cache_name    = termini["cache"]
 
-      Puppet::Indirector::Terminus.terminus_classes(indirection_name)
+      Puppet::Indirector::Terminus.terminus_class(indirection_name, terminus_name || cache_name)
 
       indirection = Puppet::Indirector::Indirection.instance(indirection_name)
       raise "Indirection #{indirection_name} does not exist" unless indirection
diff --git a/spec/unit/indirector/face_spec.rb b/spec/unit/indirector/face_spec.rb
index 1530f7270..943ff7991 100755
--- a/spec/unit/indirector/face_spec.rb
+++ b/spec/unit/indirector/face_spec.rb
@@ -16,8 +16,17 @@ describe Puppet::Indirector::Face do
     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::Indirector::Face.terminus_classes(:catalog).should be_include("compiler")
+  it "should return the sorted to_s list of terminus classes" do
+    Puppet::Indirector::Terminus.expects(:terminus_classes).returns([
+      :yaml,
+      :compiler,
+      :rest
+   ])
+    Puppet::Indirector::Face.terminus_classes(:catalog).should == [
+      'compiler',
+      'rest',
+      'yaml'
+    ]
   end
 
   describe "as an instance" do