flapjack 0.7.34 → 0.7.35

data/lib/flapjack/logger.rb

@@ -112,6 +112,12 @@ module Flapjack
       (LEVELS + [:configure, :close, :add]).include?(sym)
     end
 
+    ['debug', 'info', 'warn', 'error', 'fatal'].each { |level|
+      define_method("#{level}?") {
+        @logger.send("#{level}?")
+      }
+    }
+
   end
 
 end

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.7.34"
+  VERSION = "0.7.35"
 end

data/spec/lib/flapjack/gateways/api/contact_methods_spec.rb

@@ -57,9 +57,6 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Gateways::API.class_eval {
       set :raise_errors, true
     }
-    Flapjack::Gateways::API.instance_variable_get('@middleware').delete_if {|m|
-      m[0] == Rack::FiberPool
-    }
   end
 
   before(:each) do
@@ -88,14 +85,14 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:all).with(:redis => redis).and_return([])
     Flapjack::Data::Contact.should_receive(:add).twice
 
-    post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
+    apost "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
     last_response.status.should == 204
   end
 
   it "does not create contacts if the data is improperly formatted" do
     Flapjack::Data::Contact.should_not_receive(:add)
 
-    post "/contacts", {'contacts' => ["Hello", "again"]}.to_json,
+    apost "/contacts", {'contacts' => ["Hello", "again"]}.to_json,
       {'CONTENT_TYPE' => 'application/json'}
     last_response.status.should == 403
   end
@@ -118,7 +115,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:all).with(:redis => redis).and_return([])
     Flapjack::Data::Contact.should_receive(:add)
 
-    post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
+    apost "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
     last_response.status.should == 204
   end
 
@@ -145,7 +142,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:all).with(:redis => redis).and_return([existing])
     Flapjack::Data::Contact.should_receive(:add).with(contacts['contacts'][0], :redis => redis)
 
-    post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
+    apost "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
     last_response.status.should == 204
   end
 
@@ -166,7 +163,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:all).with(:redis => redis).and_return([existing])
     Flapjack::Data::Contact.should_receive(:add).with(contacts['contacts'][0], :redis => redis)
 
-    post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
+    apost "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
     last_response.status.should == 204
   end
 
@@ -175,7 +172,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:all).with(:redis => redis).
       and_return([contact])
 
-    get '/contacts'
+    aget '/contacts'
     last_response.should be_ok
     last_response.body.should be_json_eql([contact_core].to_json)
   end
@@ -185,7 +182,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    get "/contacts/#{contact.id}"
+    aget "/contacts/#{contact.id}"
     last_response.should be_ok
     last_response.body.should be_json_eql(contact_core.to_json)
   end
@@ -194,7 +191,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    get "/contacts/#{contact.id}"
+    aget "/contacts/#{contact.id}"
     last_response.should be_forbidden
   end
 
@@ -208,7 +205,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    get "/contacts/#{contact.id}/notification_rules"
+    aget "/contacts/#{contact.id}/notification_rules"
     last_response.should be_ok
     last_response.body.should be_json_eql( '["rule_1", "rule_2"]' )
   end
@@ -217,7 +214,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    get "/contacts/#{contact.id}/notification_rules"
+    aget "/contacts/#{contact.id}/notification_rules"
     last_response.should be_forbidden
   end
 
@@ -226,7 +223,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::NotificationRule.should_receive(:find_by_id).
       with(notification_rule.id, {:redis => redis, :logger => @logger}).and_return(notification_rule)
 
-    get "/notification_rules/#{notification_rule.id}"
+    aget "/notification_rules/#{notification_rule.id}"
     last_response.should be_ok
     last_response.body.should be_json_eql('"rule_1"')
   end
@@ -235,7 +232,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::NotificationRule.should_receive(:find_by_id).
       with(notification_rule.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    get "/notification_rules/#{notification_rule.id}"
+    aget "/notification_rules/#{notification_rule.id}"
     last_response.should be_forbidden
   end
 
@@ -255,7 +252,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     contact.should_receive(:add_notification_rule).
       with(notification_rule_data_sym, :logger => @logger).and_return(notification_rule)
 
-    post "/notification_rules", notification_rule_data.to_json,
+    apost "/notification_rules", notification_rule_data.to_json,
       {'CONTENT_TYPE' => 'application/json'}
     last_response.should be_ok
     last_response.body.should be_json_eql('"rule_1"')
@@ -265,7 +262,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    post "/notification_rules", notification_rule_data.to_json,
+    apost "/notification_rules", notification_rule_data.to_json,
       {'CONTENT_TYPE' => 'application/json'}
     last_response.should be_forbidden
   end
@@ -273,7 +270,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
   it "does not create a notification_rule if a rule id is provided" do
     contact.should_not_receive(:add_notification_rule)
 
-    post "/notification_rules", notification_rule_data.merge(:id => 1).to_json,
+    apost "/notification_rules", notification_rule_data.merge(:id => 1).to_json,
       {'CONTENT_TYPE' => 'application/json'}
     last_response.status.should == 403
   end
@@ -294,7 +291,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
 
     notification_rule.should_receive(:update).with(notification_rule_data_sym, :logger => @logger).and_return(nil)
 
-    put "/notification_rules/#{notification_rule.id}", notification_rule_data.to_json,
+    aput "/notification_rules/#{notification_rule.id}", notification_rule_data.to_json,
       {'CONTENT_TYPE' => 'application/json'}
     last_response.should be_ok
     last_response.body.should be_json_eql('"rule_1"')
@@ -304,7 +301,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::NotificationRule.should_receive(:find_by_id).
       with(notification_rule.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    put "/notification_rules/#{notification_rule.id}", notification_rule_data
+    aput "/notification_rules/#{notification_rule.id}", notification_rule_data
     last_response.should be_forbidden
   end
 
@@ -314,7 +311,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    put "/notification_rules/#{notification_rule.id}", notification_rule_data.to_json,
+    aput "/notification_rules/#{notification_rule.id}", notification_rule_data.to_json,
       {'CONTENT_TYPE' => 'application/json'}
     last_response.should be_forbidden
   end
@@ -328,7 +325,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    delete "/notification_rules/#{notification_rule.id}"
+    adelete "/notification_rules/#{notification_rule.id}"
     last_response.status.should == 204
   end
 
@@ -336,7 +333,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::NotificationRule.should_receive(:find_by_id).
       with(notification_rule.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    delete "/notification_rules/#{notification_rule.id}"
+    adelete "/notification_rules/#{notification_rule.id}"
     last_response.should be_forbidden
   end
 
@@ -347,7 +344,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    delete "/notification_rules/#{notification_rule.id}"
+    adelete "/notification_rules/#{notification_rule.id}"
     last_response.should be_forbidden
   end
 
@@ -364,7 +361,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
            'rollup_threshold' => media_rollup_thresholds[m] }]
       }).flatten(1)].to_json
 
-    get "/contacts/#{contact.id}/media"
+    aget "/contacts/#{contact.id}/media"
     last_response.should be_ok
     last_response.body.should be_json_eql(result)
   end
@@ -373,7 +370,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    get "/contacts/#{contact.id}/media"
+    aget "/contacts/#{contact.id}/media"
     last_response.should be_forbidden
   end
 
@@ -391,7 +388,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
       'rollup_threshold' => media_rollup_thresholds['sms'],
     }
 
-    get "/contacts/#{contact.id}/media/sms"
+    aget "/contacts/#{contact.id}/media/sms"
     last_response.should be_ok
     last_response.body.should be_json_eql(result.to_json)
   end
@@ -400,7 +397,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    get "/contacts/#{contact.id}/media/sms"
+    aget "/contacts/#{contact.id}/media/sms"
     last_response.should be_forbidden
   end
 
@@ -409,7 +406,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    get "/contacts/#{contact.id}/media/telepathy"
+    aget "/contacts/#{contact.id}/media/telepathy"
     last_response.should be_forbidden
   end
 
@@ -434,7 +431,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
               'interval'         => alt_media_intervals['sms'],
               'rollup_threshold' => alt_media_rollup_thresholds['sms']}
 
-    put "/contacts/#{contact.id}/media/sms", :address => '04987654321',
+    aput "/contacts/#{contact.id}/media/sms", :address => '04987654321',
       :interval => '200', :rollup_threshold => '5'
     last_response.should be_ok
     last_response.body.should be_json_eql(result.to_json)
@@ -451,7 +448,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    put "/contacts/#{contact.id}/media/pagerduty", :service_key => result['service_key'],
+    aput "/contacts/#{contact.id}/media/pagerduty", :service_key => result['service_key'],
       :subdomain => result['subdomain'], :username => result['username'],
       :password => result['password']
 
@@ -463,7 +460,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    put "/contacts/#{contact.id}/media/sms", :address => '04987654321', :interval => '200'
+    aput "/contacts/#{contact.id}/media/sms", :address => '04987654321', :interval => '200'
     last_response.should be_forbidden
   end
 
@@ -471,7 +468,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    put "/contacts/#{contact.id}/media/sms", :interval => '200'
+    aput "/contacts/#{contact.id}/media/sms", :interval => '200'
     last_response.should be_forbidden
   end
 
@@ -489,7 +486,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    put "/contacts/#{contact.id}/media/sms", :address => '04987654321'
+    aput "/contacts/#{contact.id}/media/sms", :address => '04987654321'
     last_response.should be_ok
   end
 
@@ -498,7 +495,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    delete "/contacts/#{contact.id}/media/sms"
+    adelete "/contacts/#{contact.id}/media/sms"
     last_response.status.should == 204
   end
 
@@ -506,7 +503,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    delete "/contacts/#{contact.id}/media/sms"
+    adelete "/contacts/#{contact.id}/media/sms"
     last_response.should be_forbidden
   end
 
@@ -516,7 +513,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    get "/contacts/#{contact.id}/timezone"
+    aget "/contacts/#{contact.id}/timezone"
     last_response.should be_ok
     last_response.body.should be_json_eql('"Australia/Sydney"')
   end
@@ -525,7 +522,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    get "/contacts/#{contact.id}/timezone"
+    aget "/contacts/#{contact.id}/timezone"
     last_response.should be_forbidden
   end
 
@@ -536,7 +533,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    put "/contacts/#{contact.id}/timezone", {:timezone => 'Australia/Perth'}
+    aput "/contacts/#{contact.id}/timezone", {:timezone => 'Australia/Perth'}
     last_response.should be_ok
   end
 
@@ -544,7 +541,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    put "/contacts/#{contact.id}/timezone", {:timezone => 'Australia/Perth'}
+    aput "/contacts/#{contact.id}/timezone", {:timezone => 'Australia/Perth'}
     last_response.should be_forbidden
   end
 
@@ -554,7 +551,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    delete "/contacts/#{contact.id}/timezone"
+    adelete "/contacts/#{contact.id}/timezone"
     last_response.status.should == 204
   end
 
@@ -562,7 +559,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    delete "/contacts/#{contact.id}/timezone"
+    adelete "/contacts/#{contact.id}/timezone"
     last_response.should be_forbidden
   end
 
@@ -572,7 +569,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    post "contacts/#{contact.id}/tags", :tag => 'web'
+    apost "contacts/#{contact.id}/tags", :tag => 'web'
     last_response.should be_ok
     last_response.body.should be_json_eql( ['web'].to_json )
   end
@@ -581,7 +578,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    post "contacts/#{contact.id}/tags", :tag => 'web'
+    apost "contacts/#{contact.id}/tags", :tag => 'web'
     last_response.should be_forbidden
   end
 
@@ -591,7 +588,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    post "contacts/#{contact.id}/tags", :tag => ['web', 'app']
+    apost "contacts/#{contact.id}/tags", :tag => ['web', 'app']
     last_response.should be_ok
     last_response.body.should be_json_eql( ['web', 'app'].to_json )
   end
@@ -600,7 +597,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    post "contacts/#{contact.id}/tags", :tag => ['web', 'app']
+    apost "contacts/#{contact.id}/tags", :tag => ['web', 'app']
     last_response.should be_forbidden
   end
 
@@ -609,7 +606,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    delete "contacts/#{contact.id}/tags", :tag => 'web'
+    adelete "contacts/#{contact.id}/tags", :tag => 'web'
     last_response.status.should == 204
   end
 
@@ -617,7 +614,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    delete "contacts/#{contact.id}/tags", :tag => 'web'
+    adelete "contacts/#{contact.id}/tags", :tag => 'web'
     last_response.should be_forbidden
   end
 
@@ -626,7 +623,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    delete "contacts/#{contact.id}/tags", :tag => ['web', 'app']
+    adelete "contacts/#{contact.id}/tags", :tag => ['web', 'app']
     last_response.status.should == 204
   end
 
@@ -634,7 +631,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    delete "contacts/#{contact.id}/tags", :tag => ['web', 'app']
+    adelete "contacts/#{contact.id}/tags", :tag => ['web', 'app']
     last_response.should be_forbidden
   end
 
@@ -643,7 +640,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    get "contacts/#{contact.id}/tags"
+    aget "contacts/#{contact.id}/tags"
     last_response.should be_ok
     last_response.body.should be_json_eql( ['web', 'app'].to_json )
   end
@@ -652,7 +649,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    get "contacts/#{contact.id}/tags"
+    aget "contacts/#{contact.id}/tags"
     last_response.should be_forbidden
   end
 
@@ -669,7 +666,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    get "contacts/#{contact.id}/entity_tags"
+    aget "contacts/#{contact.id}/entity_tags"
     last_response.should be_ok
     tag_response = {'entity_1' => ['web'],
                     'entity_2' => ['app']}
@@ -680,7 +677,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    get "contacts/#{contact.id}/entity_tags"
+    aget "contacts/#{contact.id}/entity_tags"
     last_response.should be_forbidden
   end
 
@@ -701,7 +698,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    post "contacts/#{contact.id}/entity_tags",
+    apost "contacts/#{contact.id}/entity_tags",
       :entity => {'entity_1' => ['web'], 'entity_2' => ['app']}
     last_response.should be_ok
     tag_response = {'entity_1' => ['web'],
@@ -713,7 +710,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    post "contacts/#{contact.id}/entity_tags",
+    apost "contacts/#{contact.id}/entity_tags",
       :entity => {'entity_1' => ['web'], 'entity_2' => ['app']}
     last_response.should be_forbidden
   end
@@ -732,7 +729,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    delete "contacts/#{contact.id}/entity_tags",
+    adelete "contacts/#{contact.id}/entity_tags",
       :entity => {'entity_1' => ['web'], 'entity_2' => ['app']}
     last_response.status.should == 204
   end
@@ -741,7 +738,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(nil)
 
-    delete "contacts/#{contact.id}/entity_tags",
+    adelete "contacts/#{contact.id}/entity_tags",
       :entity => {'entity_1' => ['web'], 'entity_2' => ['app']}
     last_response.should be_forbidden
   end