web_spec.rb in flapjack-0.7.0

- old
+ new

@@ -14,10 +14,19 @@
   let(:entity)          { mock(Flapjack::Data::Entity) }
   let(:entity_check)    { mock(Flapjack::Data::EntityCheck) }
 
   let(:redis) { mock('redis') }
 
+  before(:all) do
+    Flapjack::Gateways::Web.class_eval {
+      set :raise_errors, true
+    }
+    Flapjack::Gateways::Web.instance_variable_get('@middleware').delete_if {|m|
+      m[0] == Rack::FiberPool
+    }
+  end
+
   before(:each) do
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
     Flapjack::Gateways::Web.instance_variable_set('@config', {})
     Flapjack::Gateways::Web.instance_variable_set('@logger', @logger)
     Flapjack::Gateways::Web.start
@@ -172,10 +181,11 @@
     entity_check.should_receive(:create_scheduled_maintenance).
       with(:start_time => start_time.to_i, :duration => duration, :summary => summary)
 
     post "/scheduled_maintenances/#{entity_name_esc}/ping?"+
       "start_time=1+day+ago&duration=30+minutes&summary=wow"
+
     last_response.status.should == 302
   end
 
   it "updates a scheduled maintenance period for an entity check" do
     t = Time.new.to_i
@@ -225,10 +235,10 @@
 
   it "shows details of an individual contact found by id" do
     contact = mock('contact')
     contact.should_receive(:name).twice.and_return("Smithson Smith")
     contact.should_receive(:media).exactly(3).times.and_return({})
-    contact.should_receive(:entities_and_checks).and_return([])
+    contact.should_receive(:entities).with(:checks => true).and_return([])
 
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with('0362', :redis => redis).and_return(contact)
 
     get "/contacts/0362"