Merge branch '0.24.x'

3 files changed, 7 insertions, 7 deletions

diff --git a/spec/unit/indirector/rest.rb b/spec/unit/indirector/rest.rb
index cf29577b9..3c4716dc8 100755
--- a/spec/unit/indirector/rest.rb
+++ b/spec/unit/indirector/rest.rb
@@ -13,7 +13,7 @@ describe Puppet::Indirector::REST do
 
         @rest_class = Class.new(Puppet::Indirector::REST) do
             def self.to_s
-                "Testing"
+                "This::Is::A::Test::Class"
             end
         end
 
diff --git a/spec/unit/parser/ast/definition.rb b/spec/unit/parser/ast/definition.rb
index f236e23b7..a58e4d00e 100755
--- a/spec/unit/parser/ast/definition.rb
+++ b/spec/unit/parser/ast/definition.rb
@@ -45,7 +45,7 @@ describe Puppet::Parser::AST::Definition, "when evaluating" do
 #
 #    it "should evaluate the associated code with the new scope"
 
-    def test_initialize
+    def old_test_initialize
         parser = mkparser
 
         # Create a new definition
@@ -67,7 +67,7 @@ describe Puppet::Parser::AST::Definition, "when evaluating" do
 
     end
 
-    def test_evaluate
+    def oldtest_evaluate
         parser = mkparser
         config = mkcompiler
         config.send(:evaluate_main)
@@ -135,7 +135,7 @@ describe Puppet::Parser::AST::Definition, "when evaluating" do
     end
 
     # #539 - definitions should support both names and titles
-    def test_names_and_titles
+    def oldtest_names_and_titles
         parser = mkparser
         scope = mkscope :parser => parser
 
@@ -186,7 +186,7 @@ describe Puppet::Parser::AST::Definition, "when evaluating" do
 
     # Testing the root cause of #615.  We should be using the fqname for the type, instead
     # of just the short name.
-    def test_fully_qualified_types
+    def oldtest_fully_qualified_types
         parser = mkparser
         klass = parser.newclass("one::two")
 
diff --git a/spec/unit/parser/lexer.rb b/spec/unit/parser/lexer.rb
index cddbef1ed..9972f7268 100755
--- a/spec/unit/parser/lexer.rb
+++ b/spec/unit/parser/lexer.rb
@@ -11,11 +11,11 @@ describe Puppet::Parser::Lexer::Token do
 
     [:regex, :name, :string, :skip, :incr_line, :skip_text].each do |param|
         it "should have a #{param.to_s} reader" do
-            @token.should respond_to?(param)
+            @token.should be_respond_to(param)
         end
 
         it "should have a #{param.to_s} writer" do
-            @token.should respond_to?(param.to_s + "=")
+            @token.should be_respond_to(param.to_s + "=")
         end
     end
 end