amqp-spec 0.2.5 → 0.2.6

data/HISTORY

@@ -73,3 +73,7 @@
 == 0.2.5 / 2010-11-04
 
 * Minor Gemfile update
+
+== 0.2.6 / 2010-11-04
+
+* Fixed subtly failing specs

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/spec/rspec_amqp_spec.rb

@@ -6,7 +6,7 @@ def publish_and_consume_once(queue_name="test_sink", data="data")
     q.subscribe do |hdr, msg|
       hdr.should be_an MQ::Header
       msg.should == data
-      done {q.unsubscribe; q.delete}
+      done { q.unsubscribe; q.delete }
     end
     EM.add_timer(0.2) do
       MQ.queue(queue_name).publish data
@@ -25,7 +25,7 @@ describe 'Evented AMQP specs' do
     include AMQP::SpecHelper
 
     default_options AMQP_OPTS if defined? AMQP_OPTS
-    default_timeout 1 # Can be used to set default :spec_timeout for all your amqp-based specs
+    default_timeout 1
 
     puts "Default timeout: #{default_timeout}, Default options:"
     p default_options
@@ -40,9 +40,21 @@ describe 'Evented AMQP specs' do
 
   describe AMQP, " when testing with AMQP::Spec" do
     include AMQP::Spec
+
+    default_options AMQP_OPTS if defined? AMQP_OPTS
+    default_timeout 1
+
     it_should_behave_like 'Spec examples'
 
     context 'inside embedded context / example group' do
+      it 'should inherit default_options/metadata from enclosing example group' do
+        # This is a guard against regression on dev box without notice
+        AMQP.conn.instance_variable_get(:@settings)[:host].should == AMQP_OPTS[:host]
+        self.class.default_options[:host].should == AMQP_OPTS[:host]
+        self.class.default_timeout.should == 1
+        done
+      end
+
       it_should_behave_like 'Spec examples'
     end
   end
@@ -50,6 +62,8 @@ describe 'Evented AMQP specs' do
   describe AMQP, " tested with AMQP::SpecHelper when Rspec failures occur" do
     include AMQP::SpecHelper
 
+    default_options AMQP_OPTS if defined? AMQP_OPTS
+
     it "bubbles failing expectations up to Rspec" do
       expect {
         amqp do
@@ -77,6 +91,8 @@ describe 'Evented AMQP specs' do
   describe 'MQ', " when MQ.queue/fanout/topic tries to access Thread.current[:mq] across examples" do
     include AMQP::SpecHelper
 
+    default_options AMQP_OPTS if defined? AMQP_OPTS
+
     it 'sends data to the queue' do
       publish_and_consume_once
     end

data/spec/shared_examples.rb

@@ -83,7 +83,7 @@ shared_examples_for 'done examples' do
       done(0.2) { @block_called = true; EM.reactor_running?.should == true }
     end
     @block_called.should == true
-    (Time.now-start).should be_close(0.2, 0.05)
+    (Time.now-start).should be_close(0.2, 0.1)
   end
 
   it 'should have delayed done (when em is used)' do
@@ -92,7 +92,7 @@ shared_examples_for 'done examples' do
       done(0.2) { @block_called = true; EM.reactor_running?.should == true }
     end
     @block_called.should == true
-    (Time.now-start).should be_close(0.2, 0.05)
+    (Time.now-start).should be_close(0.2, 0.1)
   end
 end
 
@@ -133,11 +133,11 @@ shared_examples_for 'timeout examples' do
 
   if rspec2?
     context 'embedded context can set up separate defaults' do
-      default_timeout 0.25 # Can be used to set default :spec_timeout for all your amqp-based specs
+      default_timeout 0.2 # Can be used to set default :spec_timeout for all your amqp-based specs
 
-      specify 'default timeout should be 0.25' do
+      specify 'default timeout should be 0.2' do
         expect { amqp { EM.add_timer(2) { done } } }.to raise_error SpecTimeoutExceededError
-        (Time.now-@start).should be_close(0.25, 0.1)
+        (Time.now-@start).should be_close(0.2, 0.1)
       end
 
       context 'deeply embedded context can set up separate defaults' do
@@ -167,8 +167,8 @@ shared_examples_for 'Spec examples' do
   it 'should have timers' do
     start = Time.now
 
-    EM.add_timer(0.25) {
-      (Time.now-start).should be_close(0.25, 0.1)
+    EM.add_timer(0.2) {
+      (Time.now-start).should be_close(0.2, 0.1)
       done
     }
   end
@@ -177,7 +177,7 @@ shared_examples_for 'Spec examples' do
     num = 0
     start = Time.now
 
-    timer = EM.add_periodic_timer(0.25) {
+    timer = EM.add_periodic_timer(0.2) {
       if (num += 1) == 2
         (Time.now-start).should be_close(0.5, 0.1)
         EM.cancel_timer timer
@@ -188,7 +188,7 @@ shared_examples_for 'Spec examples' do
 
   it 'should have deferrables' do
     defr = EM::DefaultDeferrable.new
-    defr.timeout(0.25)
+    defr.timeout(0.2)
     defr.errback {
       done
     }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp-spec
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Arvicco