flapjack 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3317311175764e3c3788fd62a5c77dcc2ceac9
-  data.tar.gz: 9fed5e93b52806e9876aa39579a309cf72a454dd
+  metadata.gz: 08eb6e473cdb410cd9628953cee45bd15105e730
+  data.tar.gz: e70c64ec5ee5fbaebcd0a57ea28279637baa9ae8
 SHA512:
-  metadata.gz: 89c8564d062e6117d0625cc29fa19724f984357ad8b42c18ef4170cba70e6a6a5a402687a77ab462e4b311591618012141b924d703acc265c2b162417e50e615
-  data.tar.gz: f2722e5e0d9e22d7126e56713f912274e1808217d4a787c8c10d2c08ab44a67995ad273b64d067b21f5f057088d89f386a216f1fb27426cb4504469378cee872
+  metadata.gz: ba9fe3aab9ae6f58038f663737a478991bfc378a263f1e83919ff608f6bcc5b44883a71f36f9568ec38a53f8273df044802034d2ca6540be70d5930aabb3ba07
+  data.tar.gz: e95391893e56e8b8fe95c46db61777b861e6b470889d61e578ffd3a856a6da39c95626c6f58519145768346795f57c859d17bbc6bb234cdc91a5766b6a80470c

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.2.0

data/.travis.yml

@@ -1,16 +1,8 @@
 language: ruby
-matrix:
-  include:
-    - rvm: 1.9.3
-      gemfile: Gemfile-ruby1.9
-      script:  "bundle exec rspec spec && bundle exec rake pact:verify && bundle exec cucumber features"
-      env: BUNDLE_GEMFILE=Gemfile-ruby1.9
-    - rvm: '2.0'
-      gemfile: Gemfile
-      script: "bundle exec rspec spec && bundle exec rake pact:verify && bundle exec cucumber features"
-    - rvm: '2.1'
-      gemfile: Gemfile
-      script: "bundle exec rspec spec && bundle exec rake pact:verify && bundle exec cucumber features"
+rvm:
+- '2.0'
+- '2.1'
+- '2.2'
 services:
 - redis-server
 before_script:
@@ -18,6 +10,13 @@ before_script:
 before_install:
 - git submodule update --init --recursive
 - gem install bundler
+install:
+- go get github.com/garyburd/redigo/redis
+- go get github.com/go-martini/martini
+- go get gopkg.in/alecthomas/kingpin.v1
+- go get github.com/oguzbilgic/pandik
+- bundle install
+script: "bundle exec rspec spec && bundle exec rake pact:verify && bundle exec cucumber features && cd src/flapjack && go test -v"
 notifications:
   irc:
     channels:

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Flapjack Changelog
 
+# 1.2.2 - 2015-02-10
+- Feature: Add the maint subcommand to the chat bot to fix #664 (@someword)
+- Feature: support for Ruby 2.2, drop support for 1.9, removes Resque due to gem dependencies #760 (@ali-graham)
+- Feature: Gammu SMS gateway #759 (@paologlim)
+- Feature: Use microsecond resolution for logs (maint/1.x) #762 (@jgoldschrafe)
+- Feature: Backport notification delays from master #748 (@jgoldschrafe)
+- Feature: make event summary optional, fixes #513 #779 (@ali-graham)
+- Bug: fix purge script #758 (@pulecp)
+- Bug: Fix for orphaned entity data #784 (@ali-graham)
+
 # 1.2.1 - 2014-12-10
 - Bug: Fix PagerDuty log failure on POST (maint/1.x) #744 (@jgoldschrafe)
 

data/Gemfile

@@ -13,7 +13,6 @@ group :test do
   gem 'rack-test'
   gem 'pact'
   gem 'async_rack_test', '>= 0.0.5'
-  gem 'resque_spec'
   gem 'webmock'
   gem 'guard'
   gem 'rb-fsevent'
@@ -21,10 +20,4 @@ group :test do
   gem 'guard-cucumber'
   gem 'fuubar'
   gem 'simplecov', :require => false
-
-  # # Not compiling under 1.9.3-p550 anyway
-  # if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
-  #   gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools.rb
-  #   gem 'perftools.rb'
-  # end
 end

data/Rakefile

@@ -7,7 +7,6 @@ end
 require 'fileutils'
 require 'rake'
 
-require 'resque/tasks'
 require 'pact/tasks'
 
 Dir['tasks/**/*.rake'].each { |t| load t }

data/bin/flapjack

@@ -2,6 +2,8 @@
 
 require 'gli'
 
+$stdout.sync = true
+
 include GLI::App
 subcommand_option_handling :normal
 sort_help :manually

data/etc/flapjack_config.yaml.example

@@ -40,6 +40,7 @@ production:
     email_queue: email_notifications
     sms_queue: sms_notifications
     sms_twilio_queue: sms_twilio_notifications
+    sms_gammu_queue: sms_gammu_notifications
     sns_queue: sns_notifications
     jabber_queue: jabber_notifications
     pagerduty_queue: pagerduty_notifications
@@ -116,6 +117,22 @@ production:
       #templates:
       #  rollup.text: '/etc/flapjack/templates/sms_twilio/rollup.text.erb'
       #  alert.text: '/etc/flapjack/templates/sms_twilio/alert.text.erb'
+    # Sends SMS notifications via Gammu
+    sms_gammu:
+      enabled: yes
+      queue: sms_gammu_notifications
+      from: "xxxxxxxxx"
+      mysql_host: "x.x.x.x"
+      mysql_database: "gammu"
+      mysql_username: "gammu"
+      mysql_password: "xxxxxxxx"
+      logger:
+        level: INFO
+        syslog_errors: yes
+      # location of custom alert templates
+      templates:
+        rollup.text: '/etc/flapjack/templates/sms_gammu/rollup.text.erb'
+        alert.text: '/etc/flapjack/templates/sms_gammu/alert.text.erb'
     # Generates SNS notifications
     sns:
       enabled: no
@@ -169,6 +186,9 @@ production:
       # Seconds between auto_refresh of entities/checks pages.  Set to 0 to disable
       auto_refresh: 120
       access_log: "/var/log/flapjack/web_access.log"
+      # Main URL for this service eg: "http://flapjack.example/"
+      #base_url: "/"
+      # URL for accessing the JSONAPI service from the browser
       api_url: "http://localhost:3081/"
       # Full path to location of logo file, e.g. /etc/flapjack/custom_logo.png
       #logo_image_path: "/etc/flapjack/web/custom_logo/flapjack-2013-notext-transparent-300-300.png"

data/features/ack_after_sched_maint.feature

@@ -1,4 +1,4 @@
-@rollup @notification_rules @resque @processor @notifier @events
+@rollup @notification_rules @processor @notifier @events
 Feature: Multiple acknowledgements after scheduled maintenance
 
   Background:

data/features/cli.feature

@@ -27,7 +27,7 @@ test:
   processor:
     enabled: yes
     logger:
-      level: warn
+      level: debug
 """
 
   Scenario: Running with --help shows usage information

data/features/notification_rules.feature

@@ -1,4 +1,4 @@
-@notification_rules @resque @processor @notifier
+@notification_rules @processor @notifier
 Feature: Notification rules on a per contact basis
 
   Background:

data/features/notifications.feature

@@ -5,28 +5,24 @@ Feature: notifications
 
   # TODO test across multiple contacts
 
-  @resque
   Scenario: Queue an SMS notification
     Given the user wants to receive SMS notifications for entity 'example.com'
     When an event notification is generated for entity 'example.com'
     Then an SMS notification for entity 'example.com' should be queued for the user
     And an email notification for entity 'example.com' should not be queued for the user
 
-  @resque
   Scenario: Queue an SNS notification
     Given the user wants to receive SNS notifications for entity 'example.com'
     When an event notification is generated for entity 'example.com'
     Then an SNS notification for entity 'example.com' should be queued for the user
     And an email notification for entity 'example.com' should not be queued for the user
 
-  @resque
   Scenario: Queue an email notification
     Given the user wants to receive email notifications for entity 'example.com'
     When an event notification is generated for entity 'example.com'
     Then an email notification for entity 'example.com' should be queued for the user
     And an SMS notification for entity 'example.com' should not be queued for the user
 
-  @resque
   Scenario: Queue SMS and email notifications
     Given the user wants to receive SMS notifications for entity 'example.com' and email notifications for entity 'example2.com'
     When an event notification is generated for entity 'example.com'
@@ -36,11 +32,6 @@ Feature: notifications
     Then an email notification for entity 'example.com' should not be queued for the user
     And an email notification for entity 'example2.com' should be queued for the user
 
-  # NB: Scenarios below here are those that cover code run by the Resque workers
-  # We could maybe test resque integration as well, see
-  #   http://corner.squareup.com/2010/08/cucumber-and-resque.html
-  #   http://gist.github.com/532100
-
   Scenario: Send a queued SMS notification
     Given a user SMS notification has been queued for entity 'example.com'
     When the SMS notification handler runs successfully

data/features/rollup.feature

@@ -1,4 +1,4 @@
-@rollup @notification_rules @resque @processor @notifier @events
+@rollup @notification_rules @processor @notifier @events
 Feature: Rollup on a per contact, per media basis
 
   Background:

data/features/steps/events_steps.rb

@@ -2,7 +2,8 @@
 
 def drain_events
   loop do
-    event = Flapjack::Data::Event.next('events', :block => false, :redis => @redis)
+    event = Flapjack::Data::Event.next('events', :block => false,
+      :redis => @redis)
     break unless event
     @processor.send(:process_event, event)
   end
@@ -12,12 +13,23 @@ end
 def drain_notifications
   return unless @notifier_redis
   loop do
-    notification = Flapjack::Data::Notification.next('notifications', :block => false, :redis => @notifier_redis)
+    notification = Flapjack::Data::Notification.next('notifications',
+      :block => false, :redis => @notifier_redis)
     break unless notification
     @notifier.send(:process_notification, notification)
   end
 end
 
+def drain_alerts(queue, gateway)
+  return unless @notifier_redis
+  loop do
+    alert = Flapjack::Data::Alert.next(queue, :block => false,
+      :redis => @notifier_redis, :logger => @logger)
+    break unless alert
+    gateway.send(:deliver, alert)
+  end
+end
+
 def submit_event(event)
   @redis.rpush('events', Flapjack.dump_json(event))
 end
@@ -405,18 +417,18 @@ Then /^(\w+) (\w+) alert(?:s)?(?: of)?(?: type (\w+))?(?: and)?(?: rollup (\w+))
   when 'no'
     num_queued = 0
   end
-  queue = Resque.peek("#{media}_notifications", 0, 30)
-  queued_length = queue.find_all {|n|
-    type_ok = notification_type ? ( n['args'].first['notification_type'] == notification_type ) : true
+  queued = redis_peek("#{media}_notifications", 0, 30)
+  queued_length = queued.find_all {|n|
+    type_ok = notification_type ? ( n['notification_type'] == notification_type ) : true
     rollup_ok = case rollup
     when 'none'
-      n['args'].first['rollup'].nil?
-    when nil, n['args'].first['rollup']
+      n['rollup'].nil?
+    when nil, n['rollup']
       true
     else
       false
     end
-    type_ok && rollup_ok && ( n['args'].first['address'] == address )
+    type_ok && rollup_ok && ( n['address'] == address )
   }.length
   expect(queued_length).to eq(num_queued.to_i)
 end

data/features/steps/notifications_steps.rb

@@ -2,7 +2,7 @@
 # copied from flapjack-populator
 # TODO use Flapjack::Data::Contact.add
 def add_contact(contact = {})
-  @redis.multi do |multi|
+  @notifier_redis.multi do |multi|
     multi.del("contact:#{contact['id']}")
     multi.del("contact_media:#{contact['id']}")
     multi.hset("contact:#{contact['id']}", 'first_name', contact['first_name'])
@@ -23,7 +23,7 @@ Given /^the user wants to receive SMS notifications for entity '([\w\.\-]+)'$/ d
   Flapjack::Data::Entity.add({'id'       => '5000',
                               'name'     => entity,
                               'contacts' => ["0999"]},
-                             :redis => @redis )
+                             :redis => @notifier_redis )
 end
 
 Given /^the user wants to receive SNS notifications for entity '([\w\.\-]+)'$/ do |entity|
@@ -35,7 +35,7 @@ Given /^the user wants to receive SNS notifications for entity '([\w\.\-]+)'$/ d
   Flapjack::Data::Entity.add({'id'       => '5000',
                               'name'     => entity,
                               'contacts' => ["0999"]},
-                              :redis => @redis )
+                              :redis => @notifier_redis )
 end
 
 Given /^the user wants to receive email notifications for entity '([\w\.\-]+)'$/ do |entity|
@@ -47,7 +47,7 @@ Given /^the user wants to receive email notifications for entity '([\w\.\-]+)'$/
   Flapjack::Data::Entity.add({'id'       => '5000',
                               'name'     => entity,
                               'contacts' => ["0999"]},
-                             :redis => @redis )
+                             :redis => @notifier_redis )
 end
 
 Given /^the user wants to receive SMS notifications for entity '([\w\.\-]+)' and email notifications for entity '([\w\.\-]+)'$/ do |entity1, entity2|
@@ -64,11 +64,11 @@ Given /^the user wants to receive SMS notifications for entity '([\w\.\-]+)' and
   Flapjack::Data::Entity.add({'id'       => '5000',
                               'name'     => entity1,
                               'contacts' => ["0998"]},
-                             :redis => @redis )
+                             :redis => @notifier_redis )
   Flapjack::Data::Entity.add({'id'       => '5001',
                               'name'     => entity2,
                               'contacts' => ["0999"]},
-                             :redis => @redis )
+                             :redis => @notifier_redis )
 end
 
 # TODO create the notification object in redis, flag the relevant operation as
@@ -90,33 +90,33 @@ When /^an event notification is generated for entity '([\w\.\-]+)'$/ do |entity|
 
   Flapjack::Data::Notification.add('notifications', event,
     :type => notification_type, :severity => severity, :last_state => last_state,
-    :redis => @redis)
+    :redis => @notifier_redis)
   drain_notifications
 end
 
 Then /^an SMS notification for entity '([\w\.\-]+)' should be queued for the user$/ do |entity|
-  queue = ResqueSpec.peek('sms_notifications')
-  expect(queue.select {|n| n[:args].first['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
+  queue = redis_peek('sms_notifications')
+  expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
 end
 
 Then /^an SNS notification for entity '([\w\.\-]+)' should be queued for the user$/ do |entity|
-  queue = ResqueSpec.peek('sns_notifications')
-  expect(queue.select {|n| n[:args].first['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
+  queue = redis_peek('sns_notifications')
+  expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
 end
 
 Then /^an email notification for entity '([\w\.\-]+)' should be queued for the user$/ do |entity|
-  queue = ResqueSpec.peek('email_notifications')
-  expect(queue.select {|n| n[:args].first['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
+  queue = redis_peek('email_notifications')
+  expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).not_to be_empty
 end
 
 Then /^an SMS notification for entity '([\w\.\-]+)' should not be queued for the user$/ do |entity|
-  queue = ResqueSpec.peek('sms_notifications')
-  expect(queue.select {|n| n[:args].first['event_id'] =~ /#{entity}:ping/ }).to be_empty
+  queue = redis_peek('sms_notifications')
+  expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).to be_empty
 end
 
 Then /^an email notification for entity '([\w\.\-]+)' should not be queued for the user$/ do |entity|
-  queue = ResqueSpec.peek('email_notifications')
-  expect(queue.select {|n| n[:args].first['event_id'] =~ /#{entity}:ping/ }).to be_empty
+  queue = redis_peek('email_notifications')
+  expect(queue.select {|n| n['event_id'] =~ /#{entity}:ping/ }).to be_empty
 end
 
 Given /^a user SMS notification has been queued for entity '([\w\.\-]+)'$/ do |entity|
@@ -134,13 +134,16 @@ Given /^a user SMS notification has been queued for entity '([\w\.\-]+)'$/ do |e
                        'id'                 => 1,
                        'state_duration'     => 30,
                        'duration'           => 45}
+
+  Flapjack::Data::Alert.add('sms_notifications', @sms_notification,
+                            :redis => @notifier_redis)
 end
 
 Given /^a user SNS notification has been queued for entity '([\w\.\-]+)'$/ do |entity|
   Flapjack::Data::Entity.add({'id'   => '5000',
                               'name' => entity},
                              :redis => @redis )
-  @sms_notification = {'notification_type'  => 'problem',
+  @sns_notification = {'notification_type'  => 'problem',
                        'contact_first_name' => 'John',
                        'contact_last_name'  => 'Smith',
                        'state'              => 'critical',
@@ -151,6 +154,9 @@ Given /^a user SNS notification has been queued for entity '([\w\.\-]+)'$/ do |e
                        'id'                 => 1,
                        'state_duration'     => 30,
                        'duration'           => 45}
+
+  Flapjack::Data::Alert.add('sns_notifications', @sns_notification,
+                            :redis => @notifier_redis)
 end
 
 Given /^a user email notification has been queued for entity '([\w\.\-]+)'$/ do |entity|
@@ -168,66 +174,54 @@ Given /^a user email notification has been queued for entity '([\w\.\-]+)'$/ do
                          'id'                 => 2,
                          'state_duration'     => 30,
                          'duration'           => 3600}
-end
 
-# NB using perform, the notifiers were accessing the wrong Redis DB number
+  Flapjack::Data::Alert.add('email_notifications', @email_notification,
+                            :redis => @notifier_redis)
+end
 
-# TODO may need to get more complex, depending which SMS provider is used
 When /^the SMS notification handler runs successfully$/ do
   @request = stub_request(:get, /^#{Regexp.escape(Flapjack::Gateways::SmsMessagenet::MESSAGENET_DEFAULT_URL)}/)
 
-  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
-  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@redis', @redis)
-  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@logger', @logger)
-  Flapjack::Gateways::SmsMessagenet.start
+  @sms_messagenet = Flapjack::Gateways::SmsMessagenet.new(:config => {
+      'username' => 'abcd', 'password' => 'efgh'
+    }, :redis_config => @redis_opts, :logger => @logger)
 
-  Flapjack::Gateways::SmsMessagenet.perform(@sms_notification)
+  drain_alerts('sms_notifications', @sms_messagenet)
 end
 
 When /^the SNS notification handler runs successfully$/ do
   @request = stub_request(:post, /amazonaws\.com/)
 
-  Flapjack::Gateways::AwsSns.instance_variable_set('@config', {
+  @aws_sns = Flapjack::Gateways::AwsSns.new(:config => {
     'access_key' => "AKIAIOSFODNN7EXAMPLE",
     'secret_key' => "secret"
-  })
-  Flapjack::Gateways::AwsSns.instance_variable_set('@redis', @redis)
-  Flapjack::Gateways::AwsSns.instance_variable_set('@logger', @logger)
-  Flapjack::Gateways::AwsSns.start
+  }, :redis_config => @redis_opts, :logger => @logger)
 
-  Flapjack::Gateways::AwsSns.perform(@sms_notification)
+  drain_alerts('sns_notifications', @aws_sns)
 end
 
 When /^the SMS notification handler fails to send an SMS$/ do
   @request = stub_request(:get, /^#{Regexp.escape(Flapjack::Gateways::SmsMessagenet::MESSAGENET_DEFAULT_URL)}/).to_return(:status => [500, "Internal Server Error"])
-  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
-  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@redis', @redis)
-  Flapjack::Gateways::SmsMessagenet.instance_variable_set('@logger', @logger)
-  Flapjack::Gateways::SmsMessagenet.start
 
-  Flapjack::Gateways::SmsMessagenet.perform(@sms_notification)
+  @sms_messagenet = Flapjack::Gateways::SmsMessagenet.new(:config => {
+      'username' => 'abcd', 'password' => 'efgh'
+    }, :redis_config => @redis_opts, :logger => @logger)
+
+  drain_alerts('sms_notifications', @sms_messagenet)
 end
 
 When /^the SNS notification handler fails to send an SMS$/ do
   @request = stub_request(:post, /amazonaws\.com/).to_return(:status => [500, "Internal Server Error"])
-  Flapjack::Gateways::AwsSns.instance_variable_set('@config', {
+
+  @aws_sns = Flapjack::Gateways::AwsSns.new(:config => {
     'access_key' => "AKIAIOSFODNN7EXAMPLE",
     'secret_key' => "secret"
-  })
-  Flapjack::Gateways::AwsSns.instance_variable_set('@redis', @redis)
-  Flapjack::Gateways::AwsSns.instance_variable_set('@logger', @logger)
-  Flapjack::Gateways::AwsSns.start
+  }, :redis_config => @redis_opts, :logger => @logger)
 
-  Flapjack::Gateways::AwsSns.perform(@sms_notification)
+  drain_alerts('sns_notifications', @aws_sns)
 end
 
 When /^the email notification handler runs successfully$/ do
-  Resque.redis = @redis
-  Flapjack::Gateways::Email.instance_variable_set('@config', {'smtp_config' => {'host' => '127.0.0.1', 'port' => 2525, 'from' => 'flapjack@example'}})
-  Flapjack::Gateways::Email.instance_variable_set('@redis', @redis)
-  Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
-  Flapjack::Gateways::Email.start
-
   # poor man's stubbing
   EM::P::SmtpClient.class_eval {
     def self.send(args = {})
@@ -237,16 +231,16 @@ When /^the email notification handler runs successfully$/ do
     end
   }
 
-  Flapjack::Gateways::Email.perform(@email_notification)
+  @email = Flapjack::Gateways::Email.new(:config => {
+    'smtp_config' => {'host' => '127.0.0.1',
+                      'port' => 2525,
+                      'from' => 'flapjack@example'}
+  }, :redis_config => @redis_opts, :logger => @logger)
+
+  drain_alerts('email_notifications', @email)
 end
 
 When /^the email notification handler fails to send an email$/ do
-  Resque.redis = @redis
-  Flapjack::Gateways::Email.instance_variable_set('@config', {'smtp_config' => {'host' => '127.0.0.1', 'port' => 2525, 'from' => 'flapjack@example'}})
-  Flapjack::Gateways::Email.instance_variable_set('@redis', @redis)
-  Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
-  Flapjack::Gateways::Email.start
-
   # poor man's stubbing
   EM::P::SmtpClient.class_eval {
     def self.send(args = {})
@@ -256,33 +250,26 @@ When /^the email notification handler fails to send an email$/ do
     end
   }
 
-  Flapjack::Gateways::Email.perform(@email_notification)
-end
+  @email = Flapjack::Gateways::Email.new(:config => {
+    'smtp_config' => {'host' => '127.0.0.1',
+                      'port' => 2525,
+                      'from' => 'flapjack@example'}
+  }, :redis_config => @redis_opts, :logger => @logger)
 
-Then /^the user should receive an SMS notification$/ do
-  expect(@request).to have_been_requested
-  expect(Flapjack::Gateways::SmsMessagenet.instance_variable_get('@sent')).to eq(1)
+  drain_alerts('email_notifications', @email)
 end
 
-Then /^the user should receive an SNS notification$/ do
+Then /^the user should( not)? receive an SMS notification$/ do |negativity|
   expect(@request).to have_been_requested
-  expect(Flapjack::Gateways::AwsSns.instance_variable_get('@sent')).to eq(1)
-end
-
-Then /^the user should receive an email notification$/ do
-  expect(Flapjack::Gateways::Email.instance_variable_get('@sent')).to eq(1)
+  expect(@sms_messagenet.instance_variable_get('@sent')).to eq(negativity.nil? ? 1 : 0)
 end
 
-Then /^the user should not receive an SMS notification$/ do
+Then /^the user should( not)? receive an SNS notification$/ do |negativity|
   expect(@request).to have_been_requested
-  expect(Flapjack::Gateways::SmsMessagenet.instance_variable_get('@sent')).to eq(0)
+  expect(@aws_sns.instance_variable_get('@sent')).to eq(negativity.nil? ? 1 : 0)
 end
 
-Then /^the user should not receive an SNS notification$/ do
-  expect(@request).to have_been_requested
-  expect(Flapjack::Gateways::AwsSns.instance_variable_get('@sent')).to eq(0)
+Then /^the user should( not)? receive an email notification$/ do |negativity|
+  expect(@email.instance_variable_get('@sent')).to eq(negativity.nil? ? 1 : 0)
 end
 
-Then /^the user should not receive an email notification$/ do
-  expect(Flapjack::Gateways::Email.instance_variable_get('@sent')).to eq(0)
-end