Merge branch 'feature/2.7.x/7181-rename-configurer-face' into 2.7.x

2 files changed, 4 insertions, 6 deletions

diff --git a/spec/unit/application/configurer_spec.rb b/spec/unit/application/secret_agent_spec.rb
index 791a367ea..eba936447 100755
--- a/spec/unit/application/configurer_spec.rb
+++ b/spec/unit/application/secret_agent_spec.rb
@@ -1,11 +1,11 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
-require 'puppet/application/configurer'
+require 'puppet/application/secret_agent'
 require 'puppet/indirector/catalog/rest'
 require 'puppet/indirector/report/rest'
 require 'tempfile'
 
-describe "Puppet::Application::Configurer" do
+describe "Puppet::Application::Secret_agent" do
   it "should retrieve and apply a catalog and submit a report" do
     pending "REVISIT: 2.7 changes broke this, and we want the merge published"
 
@@ -25,7 +25,7 @@ describe "Puppet::Application::Configurer" do
 
     Puppet::Util::Log.stubs(:newdestination)
 
-    Puppet::Application::Configurer.new.run
+    Puppet::Application::Secret_agent.new.run
 
     @report.status.should == "changed"
   end
diff --git a/spec/unit/face/configurer_spec.rb b/spec/unit/face/secret_agent_spec.rb
index 56b45031f..9117ad44d 100755
--- a/spec/unit/face/configurer_spec.rb
+++ b/spec/unit/face/secret_agent_spec.rb
@@ -3,11 +3,9 @@ require 'spec_helper'
 require 'puppet/indirector/catalog/rest'
 require 'tempfile'
 
-describe Puppet::Face[:configurer, '0.0.1'] do
+describe Puppet::Face[:secret_agent, '0.0.1'] do
   describe "#synchronize" do
     it "should retrieve and apply a catalog and return a report" do
-      pending "REVISIT: 2.7 changes broke this, and we want the merge published"
-
       dirname = Dir.mktmpdir("puppetdir")
       Puppet[:vardir] = dirname
       Puppet[:confdir] = dirname