spec/event_spec.rb in fnordmetric-1.0.1 vs spec/event_spec.rb in fnordmetric-1.2.0

@@ -4,28 +4,28 @@
 describe FnordMetric::Event do
 
   include FnordMetric
 
   before(:all) do
-    @now = Time.utc(1992,01,13,5,23,23).to_i   
+    @now = Time.utc(1992,01,13,5,23,23).to_i
     @redis = Redis.new
     @redis_wrap = RedisWrap.new(@redis)
 
-    @namespace = "fnordmetric-test-ns123" 
+    @namespace = "fnordmetric-test-ns123"
     @timeline = "#{@namespace}-timeline"
 
-    @opts = {         
+    @opts = {
       :namespace_prefix => "#{@namespace}",
       :redis_prefix => "fnordmetric-test",
       :redis => @redis
-    }  
+    }
   end
 
   describe "finding events" do
 
-    before(:each) do        
-      @redis.keys("fnordmetric-test-*").each { |k| @redis.del(k) }     
+    before(:each) do
+      @redis.keys("fnordmetric-test-*").each { |k| @redis.del(k) }
     end
 
     it "should find all events" do
       create_event("242342", {:_type => "foo", :_time => @now})
       create_event("453484", {:_type => "foo", :_time => @now})
@@ -99,19 +99,19 @@
       Event.all(@opts.merge(:limit => 2)).last.id.should == "5645642"
     end
 
     it "should find all events by type" do
       namespace = Namespace.new(:ns123, :redis_prefix => "fnordmetric-test")
-      namespace.ready!(@redis_wrap).announce(
+      namespace.ready!(@redis_wrap, @redis).announce(
         :_type => "fn0rd",
         :_time => @now
       )
-      namespace.ready!(@redis_wrap).announce(
+      namespace.ready!(@redis_wrap, @redis).announce(
         :_type => "f00bar",
         :_time => @now
       )
-      namespace.ready!(@redis_wrap).announce(
+      namespace.ready!(@redis_wrap, @redis).announce(
         :_type => "fn0rd",
         :_time => @now
       )
       Event.by_type('fn0rd', @opts).length.should == 2
       Event.by_type('f00bar', @opts).length.should == 1
@@ -130,12 +130,12 @@
       let(:kate_session_key) { Digest::MD5.hexdigest "kate_session" }
       let(:events) { Event.by_session_key kate_session_key, @opts }
 
       before do
         created_events_data.each do |(event_id, session)|
-          event_data = { :_time => @now + event_id, :_eid => event_id }
+          event_data = { :_time => @now + event_id, :_eid => event_id, :_type => "fnord" }
           event_data[:_session] = session if session
-          namespace.ready!(@redis_wrap).announce event_data
+          namespace.ready!(@redis_wrap, @redis).announce event_data
         end
       end
 
       context "when events are added in ascending time order" do
         let(:created_events_data) { events_data }