spec/queue_spec.rb in agent-0.9.1 vs spec/queue_spec.rb in agent-0.10.0

@@ -156,15 +156,24 @@
         @queue.queue.size.should == 2
         @queue.close
         @queue.queue.size.should == 0
       end
 
-      it "should raise an error when being acted upon afterwards" do
-        @queue.close
-        lambda{ @queue.close }.should raise_error(Agent::Errors::ChannelClosed)
-        lambda{ @queue.push("1") }.should raise_error(Agent::Errors::ChannelClosed)
-        lambda{ @queue.pop }.should raise_error(Agent::Errors::ChannelClosed)
+      context "after it is closed" do
+        before{ @queue.close }
+
+        it "should raise an error when #close is called again" do
+          lambda{ @queue.close }.should raise_error(Agent::Errors::ChannelClosed)
+        end
+
+        it "should raise an error when a value is pushed onto the queue" do
+          lambda{ @queue.push("1") }.should raise_error(Agent::Errors::ChannelClosed)
+        end
+
+        it "should return [nil, false] when popping from the queue" do
+          @queue.pop.should == [nil, false]
+        end
       end
     end
 
     context "when removing operations" do
       before do
@@ -320,14 +329,23 @@
         @queue.close
         @queue.operations.size.should == 0
         @queue.pushes.size.should == 0
       end
 
-      it "should raise an error when being acted upon afterwards" do
-        @queue.close
-        lambda{ @queue.close }.should raise_error(Agent::Errors::ChannelClosed)
-        lambda{ @queue.push("1") }.should raise_error(Agent::Errors::ChannelClosed)
-        lambda{ @queue.pop }.should raise_error(Agent::Errors::ChannelClosed)
+      context "after it is closed" do
+        before{ @queue.close }
+
+        it "should raise an error when #close is called again" do
+          lambda{ @queue.close }.should raise_error(Agent::Errors::ChannelClosed)
+        end
+
+        it "should raise an error when a value is pushed onto the queue" do
+          lambda{ @queue.push("1") }.should raise_error(Agent::Errors::ChannelClosed)
+        end
+
+        it "should return [nil, false] when popping from the queue" do
+          @queue.pop.should == [nil, false]
+        end
       end
     end
 
     context "when removing operations" do
       before do