summaryrefslogtreecommitdiffstats
path: root/spec/unit
diff options
context:
space:
mode:
authorRick Bradley <rick@rickbradley.com>2007-10-26 15:23:51 -0500
committerRick Bradley <rick@rickbradley.com>2007-10-26 15:23:51 -0500
commitc7b36b76f1319ee18efee8ec1bdf08825cb66f81 (patch)
tree67f525922644402eabab9f933d14c2daf82d70f6 /spec/unit
parent6dd0d71b13f6b98b3fd4152421d0124e9786f726 (diff)
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)
Diffstat (limited to 'spec/unit')
-rwxr-xr-xspec/unit/indirector/node/memory.rb5
-rw-r--r--spec/unit/network/http.rb2
2 files changed, 3 insertions, 4 deletions
diff --git a/spec/unit/indirector/node/memory.rb b/spec/unit/indirector/node/memory.rb
index f57cae818..a924c6209 100755
--- a/spec/unit/indirector/node/memory.rb
+++ b/spec/unit/indirector/node/memory.rb
@@ -4,9 +4,8 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
require 'puppet/indirector/node/memory'
-# All of our behaviour is described here, so we always have to
-# include it.
-require 'unit/indirector/memory'
+# All of our behaviour is described here, so we always have to include it.
+require File.dirname(__FILE__) + '/../memory'
describe Puppet::Node::Memory do
before do
diff --git a/spec/unit/network/http.rb b/spec/unit/network/http.rb
index a282b650a..79a0a88d4 100644
--- a/spec/unit/network/http.rb
+++ b/spec/unit/network/http.rb
@@ -26,4 +26,4 @@ describe Puppet::Network::HTTP do
it "should return an error when asked for an unknown server" do
Proc.new { Puppet::Network::HTTP.server_class_by_type :foo }.should raise_error(ArgumentError)
end
-end \ No newline at end of file
+end