bringing Indirector::REST specs to mongrel-land as well.

1 files changed, 112 insertions, 44 deletions

diff --git a/spec/integration/indirector/rest.rb b/spec/integration/indirector/rest.rb
index 9ac2bc997..b92ff30bf 100644
--- a/spec/integration/indirector/rest.rb
+++ b/spec/integration/indirector/rest.rb
@@ -25,67 +25,135 @@ end
 
 
 describe Puppet::Indirector::REST do
-  before :each do
-    Puppet[:servertype] = 'webrick'
-    @params = { :address => "127.0.0.1", :port => 34343, :handlers => [ :test_indirected_foo ] }
-    @server = Puppet::Network::Server.new(@params)
-    @server.listen
+  describe "when using webrick" do
+    before :each do
+      Puppet[:servertype] = 'webrick'
+      @params = { :address => "127.0.0.1", :port => 34343, :handlers => [ :test_indirected_foo ] }
+      @server = Puppet::Network::Server.new(@params)
+      @server.listen
 
-    # the autoloader was clearly not written test-first.  We subvert the integration test to get around its bullshit.
-    Puppet::Indirector::Terminus.stubs(:terminus_class).returns(Puppet::TestIndirectedFoo::Rest)
-    Puppet::TestIndirectedFoo.terminus_class = :rest
-  end
+      # the autoloader was clearly not written test-first.  We subvert the integration test to get around its bullshit.
+      Puppet::Indirector::Terminus.stubs(:terminus_class).returns(Puppet::TestIndirectedFoo::Rest)
+      Puppet::TestIndirectedFoo.terminus_class = :rest
+    end
   
-  describe "when finding a model instance over REST" do
-    describe "when a matching model instance can be found" do
-      before :each do
-        @model_instance = Puppet::TestIndirectedFoo.new(23)
-        @mock_model = stub('faked model', :find => @model_instance)
-        Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:model).returns(@mock_model)        
-      end
+    describe "when finding a model instance over REST" do
+      describe "when a matching model instance can be found" do
+        before :each do
+          @model_instance = Puppet::TestIndirectedFoo.new(23)
+          @mock_model = stub('faked model', :find => @model_instance)
+          Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:model).returns(@mock_model)        
+        end
       
-      it "should not fail" do
-        lambda { Puppet::TestIndirectedFoo.find('bar') }.should_not raise_error
-      end
+        it "should not fail" do
+          lambda { Puppet::TestIndirectedFoo.find('bar') }.should_not raise_error
+        end
   
-      it 'should return an instance of the model class' do
-        Puppet::TestIndirectedFoo.find('bar').class.should == Puppet::TestIndirectedFoo
-      end
+        it 'should return an instance of the model class' do
+          Puppet::TestIndirectedFoo.find('bar').class.should == Puppet::TestIndirectedFoo
+        end
   
-      it 'should return the instance of the model class associated with the provided lookup key' do
-        Puppet::TestIndirectedFoo.find('bar').value.should == @model_instance.value
-      end
+        it 'should return the instance of the model class associated with the provided lookup key' do
+          Puppet::TestIndirectedFoo.find('bar').value.should == @model_instance.value
+        end
   
-      it 'should set a version timestamp on model instance' do
-        Puppet::TestIndirectedFoo.find('bar').version.should_not be_nil
+        it 'should set a version timestamp on model instance' do
+          Puppet::TestIndirectedFoo.find('bar').version.should_not be_nil
+        end
       end
-    end
     
-    describe "when no matching model instance can be found" do
-      before :each do
-        @mock_model = stub('faked model', :find => nil)
-        Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:model).returns(@mock_model)
+      describe "when no matching model instance can be found" do
+        before :each do
+          @mock_model = stub('faked model', :find => nil)
+          Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:model).returns(@mock_model)
+        end
+      
+        it "should return nil" do
+          Puppet::TestIndirectedFoo.find('bar').should be_nil
+        end
       end
+    
+      describe "when an exception is encountered in looking up a model instance" do
+        before :each do
+          @mock_model = stub('faked model')
+          @mock_model.stubs(:find).raises(RuntimeError)
+          Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:model).returns(@mock_model)        
+        end
       
-      it "should return nil" do
-        Puppet::TestIndirectedFoo.find('bar').should be_nil
+        it "should raise an exception" do
+          lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(RuntimeError) 
+        end
       end
     end
+
+    after :each do
+      @server.unlisten
+    end
+  end
+
+  describe "when using mongrel" do
+    before :each do
+      Puppet[:servertype] = 'mongrel'
+      @params = { :address => "127.0.0.1", :port => 34343, :handlers => [ :test_indirected_foo ] }
+      @server = Puppet::Network::Server.new(@params)
+      @server.listen
+
+      # the autoloader was clearly not written test-first.  We subvert the integration test to get around its bullshit.
+      Puppet::Indirector::Terminus.stubs(:terminus_class).returns(Puppet::TestIndirectedFoo::Rest)
+      Puppet::TestIndirectedFoo.terminus_class = :rest
+    end
+  
+    describe "when finding a model instance over REST" do
+      describe "when a matching model instance can be found" do
+        before :each do
+          @model_instance = Puppet::TestIndirectedFoo.new(23)
+          @mock_model = stub('faked model', :find => @model_instance)
+          Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:model).returns(@mock_model)        
+        end
+      
+        it "should not fail" do
+          lambda { Puppet::TestIndirectedFoo.find('bar') }.should_not raise_error
+        end
+  
+        it 'should return an instance of the model class' do
+          Puppet::TestIndirectedFoo.find('bar').class.should == Puppet::TestIndirectedFoo
+        end
+  
+        it 'should return the instance of the model class associated with the provided lookup key' do
+          Puppet::TestIndirectedFoo.find('bar').value.should == @model_instance.value
+        end
+  
+        it 'should set a version timestamp on model instance' do
+          Puppet::TestIndirectedFoo.find('bar').version.should_not be_nil
+        end
+      end
     
-    describe "when an exception is encountered in looking up a model instance" do
-      before :each do
-        @mock_model = stub('faked model')
-        @mock_model.stubs(:find).raises(RuntimeError)
-        Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:model).returns(@mock_model)        
+      describe "when no matching model instance can be found" do
+        before :each do
+          @mock_model = stub('faked model', :find => nil)
+          Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:model).returns(@mock_model)
+        end
+      
+        it "should return nil" do
+          Puppet::TestIndirectedFoo.find('bar').should be_nil
+        end
       end
+    
+      describe "when an exception is encountered in looking up a model instance" do
+        before :each do
+          @mock_model = stub('faked model')
+          @mock_model.stubs(:find).raises(RuntimeError)
+          Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:model).returns(@mock_model)        
+        end
       
-      it "should raise an exception" do
-        lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(RuntimeError) 
+        it "should raise an exception" do
+          lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(RuntimeError) 
+        end
       end
     end
-  end
 
-  after :each do
-    @server.unlisten
+    after :each do
+      @server.unlisten
+    end
   end
 end
\ No newline at end of file