Merge commit '2.6.1rc4' into next

3 files changed, 3 insertions, 3 deletions

diff --git a/spec/unit/application/apply_spec.rb b/spec/unit/application/apply_spec.rb
index b073d1a6f..edb41b5c3 100755
--- a/spec/unit/application/apply_spec.rb
+++ b/spec/unit/application/apply_spec.rb
@@ -311,7 +311,7 @@ describe Puppet::Application::Apply do
       end
 
       it "should apply the catalog" do
-        @catalog.expects(:apply)
+        @catalog.expects(:apply).returns(stub_everything 'transaction')
 
         @apply.main
       end
diff --git a/spec/unit/application/cert_spec.rb b/spec/unit/application/cert_spec.rb
index b82a2fe89..4663fc938 100755
--- a/spec/unit/application/cert_spec.rb
+++ b/spec/unit/application/cert_spec.rb
@@ -12,7 +12,7 @@ describe Puppet::Application::Cert do
   end
 
   it "should operate in master run_mode" do
-    @cert_app.class.run_mode.name.should equal :master
+    @cert_app.class.run_mode.name.should equal(:master)
   end
 
   it "should ask Puppet::Application to parse Puppet configuration file" do
diff --git a/spec/unit/application/master_spec.rb b/spec/unit/application/master_spec.rb
index d23021317..e657445a4 100644
--- a/spec/unit/application/master_spec.rb
+++ b/spec/unit/application/master_spec.rb
@@ -23,7 +23,7 @@ describe Puppet::Application::Master do
   end
 
   it "should operate in master run_mode" do
-    @master.class.run_mode.name.should equal :master
+    @master.class.run_mode.name.should equal(:master)
   end
 
   it "should ask Puppet::Application to parse Puppet configuration file" do