From c7b36b76f1319ee18efee8ec1bdf08825cb66f81 Mon Sep 17 00:00:00 2001 From: Rick Bradley Date: Fri, 26 Oct 2007 15:23:51 -0500 Subject: One significant step closer to getting autotest running properly on the Puppet specs. Created a spec/lib/monkey_patches/ directory for holding patches to RSpec functionality. Extraced 'confine' and 'runnable?' support from the local copy of RSpec (spec/lib/spec/) and now load them from the monkey_patches/ directory. Fixed a bad include in one of the specs. Made it possible for the gem-installed spec binary (which autotest calls) to be used with Puppet. Imported the Autotest::Rspec class, created a PuppetRspec autotest class, added a discovery.rb file for autotest to pick these up. Autotest still has the following problems: * it needs to be run with the proper include path: % ruby -I spec/lib/ `which autotest` * the patterns in our custom autotest handler (puppet_rspec) aren't yet fully specified (they only recognize changes in our spec files, not changes in the puppet libs which they are testing) --- lib/puppet/network/http/handler.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/puppet/network/http/handler.rb') diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index 172939538..773381c8d 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -29,8 +29,7 @@ class Puppet::Network::HTTP::Handler def do_search(request, response) args = params(request) result = @model.search(args).collect {|obj| obj.to_yaml } - encode_result(request, response, result) - + encode_result(request, response, result) end def do_destroy(request, response) -- cgit