summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Bradley <rick@rickbradley.com>2007-12-07 16:07:23 -0600
committerRick Bradley <rick@rickbradley.com>2007-12-07 16:07:23 -0600
commit99f9047d0200664461603c40379cdcea8191be99 (patch)
tree525ab706be130d81a4e61870d6efb9028c638ff8
parent87e1e815bf5fdb2d9a81c56b2f8c8ce1cf4a6b1c (diff)
downloadpuppet-99f9047d0200664461603c40379cdcea8191be99.tar.gz
puppet-99f9047d0200664461603c40379cdcea8191be99.tar.xz
puppet-99f9047d0200664461603c40379cdcea8191be99.zip
tweaking spec language; require Puppet::Network::HTTP class since it is referenced by Puppet::Network::Server
-rw-r--r--lib/puppet/network/server.rb2
-rw-r--r--spec/unit/network/server.rb8
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb
index 50e3bd686..f2c8dc18c 100644
--- a/lib/puppet/network/server.rb
+++ b/lib/puppet/network/server.rb
@@ -1,3 +1,5 @@
+require 'puppet/network/http'
+
class Puppet::Network::Server
attr_reader :server_type, :protocols, :address, :port
diff --git a/spec/unit/network/server.rb b/spec/unit/network/server.rb
index 3e29807ad..846b5471d 100644
--- a/spec/unit/network/server.rb
+++ b/spec/unit/network/server.rb
@@ -212,7 +212,7 @@ describe Puppet::Network::Server, "when listening is on" do
@server.listen
end
- it "should indicate that listening is turned off" do
+ it "should indicate that it is listening" do
@server.should be_listening
end
@@ -235,14 +235,14 @@ describe Puppet::Network::Server, "when listening is being turned on" do
@mock_http_server.stubs(:listen)
end
- it "should fetch an instance of an HTTP server when listening is turned on" do
+ it "should fetch an instance of an HTTP server" do
mock_http_server_class = mock('http server class')
mock_http_server_class.expects(:new).returns(@mock_http_server)
@server.expects(:http_server_class).returns(mock_http_server_class)
@server.listen
end
- it "should cause the HTTP server to listen when listening is turned on" do
+ it "should cause the HTTP server to listen" do
@mock_http_server.expects(:listen)
@server.expects(:http_server).returns(@mock_http_server)
@server.listen
@@ -261,7 +261,7 @@ describe Puppet::Network::Server, "when listening is being turned off" do
@server.listen
end
- it "should cause the HTTP server to stop listening when listening is turned off" do
+ it "should cause the HTTP server to stop listening" do
@mock_http_server.expects(:unlisten)
@server.unlisten
end