spec/punchblock/client_spec.rb in punchblock-1.9.4 vs spec/punchblock/client_spec.rb in punchblock-2.0.0.beta1

@@ -6,19 +6,18 @@
   describe Client do
     let(:connection) { Connection::XMPP.new :username => '[e-mail]', :password => 1 }
 
     subject { Client.new :connection => connection }
 
-    its(:event_queue)         { should be_a Queue }
     its(:connection)          { should be connection }
     its(:component_registry)  { should be_a Client::ComponentRegistry }
 
     let(:call_id)         { 'abc123' }
-    let(:mock_event)      { stub('Event').as_null_object }
+    let(:mock_event)      { double('Event').as_null_object }
     let(:component_id)    { 'abc123' }
-    let(:mock_component)  { stub 'Component', :component_id => component_id }
-    let(:mock_command)    { stub 'Command' }
+    let(:mock_component)  { double 'Component', :component_id => component_id }
+    let(:mock_command)    { double 'Command' }
 
     describe '#run' do
       it 'should start up the connection' do
         connection.should_receive(:run).once
         subject.run
@@ -48,17 +47,12 @@
         before do
           mock_event.stub :source => mock_component
           mock_component.should_receive(:add_event).with mock_event
         end
 
-        it 'should not queue up the event' do
-          subject.handle_event mock_event
-          subject.event_queue.should be_empty
-        end
-
         it 'should not call event handlers' do
-          handler = mock 'handler'
+          handler = double 'handler'
           handler.should_receive(:call).never
           subject.register_event_handler do |event|
             handler.call event
           end
           subject.handle_event mock_event
@@ -68,26 +62,16 @@
       context 'if the event cannot be associated with a source component' do
         before do
           mock_event.stub :source => nil
         end
 
-        context 'if event handlers have been set' do
-          it 'should call the event handler and not queue up the event' do
-            handler = mock 'handler'
-            handler.should_receive(:call).once.with mock_event
-            subject.register_event_handler do |event|
-              handler.call event
-            end
-            subject.handle_event mock_event
-            subject.event_queue.should be_empty
+        it 'should call registered event handlers' do
+          handler = double 'handler'
+          handler.should_receive(:call).once.with mock_event
+          subject.register_event_handler do |event|
+            handler.call event
           end
-        end
-
-        context 'if event handlers have not been set' do
-          it 'should queue up the event' do
-            subject.handle_event mock_event
-            subject.event_queue.pop(true).should be == mock_event
-          end
+          subject.handle_event mock_event
         end
       end
     end
 
     it 'should be able to register and retrieve components' do