bugsnag 6.9.0 → 6.10.0

data/features/plain_features/api_key.feature

@@ -1,17 +1,16 @@
 Feature: API Key configuration options
 
 Background:
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: The API key configuration option can be set
   Given I set environment variable "RUBY_VERSION" to "<ruby version>"
-  And I set environment variable "MAZE_API_KEY" to "b35a2a72bd230ac0aa0f52715bbdc6aa"
+  And I set environment variable "BUGSNAG_API_KEY" to "b35a2a72bd230ac0aa0f52715bbdc6aa"
   And I have built the service "plain-ruby"
   And I run the service "plain-ruby" with the command "bundle exec ruby configuration/api_key.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "b35a2a72bd230ac0aa0f52715bbdc6aa"
 

data/features/plain_features/app_type.feature

@@ -2,21 +2,19 @@ Feature: App type configuration option
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: The App type configuration option can be set
   Given I set environment variable "RUBY_VERSION" to "<ruby version>"
-  And I set environment variable "MAZE_APP_TYPE" to "test_app"
+  And I set environment variable "BUGSNAG_APP_TYPE" to "test_app"
   And I have built the service "plain-ruby"
   And I run the service "plain-ruby" with the command "bundle exec ruby configuration/send_handled.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And the event "app.type" is "test_app"
+  And the event "app.type" equals "test_app"
 
   Examples:
   | ruby version |

data/features/plain_features/app_version.feature

@@ -2,21 +2,19 @@ Feature: App version configuration option
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: The App version configuration option can be set
   Given I set environment variable "RUBY_VERSION" to "<ruby version>"
-  And I set environment variable "MAZE_APP_VERSION" to "9.9.8"
+  And I set environment variable "BUGSNAG_APP_VERSION" to "9.9.8"
   And I have built the service "plain-ruby"
   And I run the service "plain-ruby" with the command "bundle exec ruby configuration/send_handled.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And the event "app.version" is "9.9.8"
+  And the event "app.version" equals "9.9.8"
 
   Examples:
   | ruby version |

data/features/plain_features/auto_notify.feature

@@ -2,13 +2,11 @@ Feature: Auto notify configuration option
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: When Auto-notify is false notifications are not sent
   Given I set environment variable "RUBY_VERSION" to "<ruby version>"
-  And I set environment variable "MAZE_AUTO_NOTIFY" to "false"
+  And I set environment variable "BUGSNAG_AUTO_NOTIFY" to "false"
   And I have built the service "plain-ruby"
   And I run the service "plain-ruby" with the command "bundle exec ruby configuration/send_unhandled.rb"
   And I wait for 1 second

data/features/plain_features/delivery.feature

@@ -2,8 +2,6 @@ Feature: delivery_method configuration option
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: When the delivery_method is set to :synchronous
@@ -12,7 +10,7 @@ Scenario Outline: When the delivery_method is set to :synchronous
   And I run the service "plain-ruby" with the command "bundle exec ruby delivery/synchronous.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the exception "errorClass" equals "RuntimeError"
   And the event "metaData.config" matches the JSON fixture in "features/fixtures/plain/json/delivery_synchronous.json"
@@ -33,7 +31,7 @@ Scenario Outline: When the delivery_method is set to :thread_queue
   And I run the service "plain-ruby" with the command "bundle exec ruby delivery/threadpool.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the exception "errorClass" equals "RuntimeError"
   And the event "metaData.config" matches the JSON fixture in "features/fixtures/plain/json/delivery_threadpool.json"
@@ -54,7 +52,7 @@ Scenario Outline: When the delivery_method is set to :thread_queue in a fork
   And I run the service "plain-ruby" with the command "bundle exec ruby delivery/fork_threadpool.rb"
   And I wait for 1 second
   Then I should receive 2 requests
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the exception "errorClass" equals "RuntimeError"
   And the event "metaData.config" matches the JSON fixture in "features/fixtures/plain/json/delivery_fork.json"

data/features/plain_features/exception_data.feature

@@ -2,8 +2,6 @@ Feature: Plain exception data
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  Given I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: An error has built in meta-data
@@ -12,7 +10,7 @@ Scenario Outline: An error has built in meta-data
   And I run the service "plain-ruby" with the command "bundle exec ruby exception_data/<state>_meta_data.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the exception "errorClass" equals "CustomError"
   And the event "metaData.exception.exception_type" equals "FATAL"
@@ -41,7 +39,7 @@ Scenario Outline: An error has built in context
   And I run the service "plain-ruby" with the command "bundle exec ruby exception_data/<state>_context.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the exception "errorClass" equals "CustomError"
@@ -70,7 +68,7 @@ Scenario Outline: An error has built in grouping hash
   And I run the service "plain-ruby" with the command "bundle exec ruby exception_data/<state>_hash.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the exception "errorClass" equals "CustomError"
   And the event "groupingHash" equals "ABCDE12345"
@@ -98,7 +96,7 @@ Scenario Outline: An error has built in user id
   And I run the service "plain-ruby" with the command "bundle exec ruby exception_data/<state>_user_id.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the exception "errorClass" equals "CustomError"

data/features/plain_features/filters.feature

@@ -2,8 +2,6 @@ Feature: Plain filtering of metadata
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  Given I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: Metadata is filtered through the default filters
@@ -12,7 +10,7 @@ Scenario Outline: Metadata is filtered through the default filters
   And I run the service "plain-ruby" with the command "bundle exec ruby filters/default_filters.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the event "metaData.filter" matches the JSON fixture in "features/fixtures/plain/json/filters_default_metadata_filters.json"
@@ -29,15 +27,15 @@ Scenario Outline: Metadata is filtered through the default filters
 
 Scenario Outline: Additional filters can be added to the filter list
   Given I set environment variable "RUBY_VERSION" to "<ruby version>"
-  And I set environment variable "MAZE_META_DATA_FILTERS" to "filter_me"
+  And I set environment variable "BUGSNAG_META_DATA_FILTERS" to "filter_me"
   And I have built the service "plain-ruby"
   And I run the service "plain-ruby" with the command "bundle exec ruby filters/additional_filters.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And the event "metaData.filter.filter_me" is "[FILTERED]"
+  And the event "metaData.filter.filter_me" equals "[FILTERED]"
 
   Examples:
   | ruby version |

data/features/plain_features/handled_errors.feature

@@ -2,42 +2,60 @@ Feature: Plain handled errors
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
-Scenario Outline: A handled error sends a report
+Scenario Outline: A rescued exception sends a report
   And I set environment variable "RUBY_VERSION" to "<ruby version>"
   And I have built the service "plain-ruby"
-  And I run the service "plain-ruby" with the command "bundle exec ruby handled/<file>.rb"
+  And I run the service "plain-ruby" with the command "bundle exec ruby handled/notify_exception.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the event "unhandled" is false
-  And the event "severity" is "warning"
-  And the event "severityReason.type" is "handledException"
+  And the event "severity" equals "warning"
+  And the event "severityReason.type" equals "handledException"
   And the exception "errorClass" equals "RuntimeError"
-  And the "file" of stack frame 0 equals "/usr/src/handled/<file>.rb"
-  And the "lineNumber" of stack frame 0 equals <lineNumber>
+  And the "file" of stack frame 0 equals "/usr/src/app/handled/notify_exception.rb"
+  And the "lineNumber" of stack frame 0 equals 6
 
   Examples:
-  | ruby version | file                | lineNumber |
-  | 1.9.3        | notify_exception    | 6          |
-  | 1.9.3        | notify_string       | 8          |
-  | 2.0          | notify_exception    | 6          |
-  | 2.0          | notify_string       | 8          |
-  | 2.1          | notify_exception    | 6          |
-  | 2.1          | notify_string       | 8          |
-  | 2.2          | notify_exception    | 6          |
-  | 2.2          | notify_string       | 8          |
-  | 2.3          | notify_exception    | 6          |
-  | 2.3          | notify_string       | 8          |
-  | 2.4          | notify_exception    | 6          |
-  | 2.4          | notify_string       | 8          |
-  | 2.5          | notify_exception    | 6          |
-  | 2.5          | notify_string       | 8          |
+  | ruby version |
+  | 1.9.3        |
+  | 2.0          |
+  | 2.1          |
+  | 2.2          |
+  | 2.3          |
+  | 2.4          |
+  | 2.5          |
+
+Scenario Outline: A notified string sends a report
+  And I set environment variable "RUBY_VERSION" to "<ruby version>"
+  And I have built the service "plain-ruby"
+  And I run the service "plain-ruby" with the command "bundle exec ruby handled/notify_string.rb"
+  And I wait for 1 second
+  Then I should receive a request
+  And the request used the "Ruby Bugsnag Notifier" notifier
+  And the request used payload v4 headers
+  And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
+  And the event "unhandled" is false
+  And the event "severity" equals "warning"
+  And the event "severityReason.type" equals "handledException"
+  And the exception "errorClass" equals "RuntimeError"
+  And the "file" of the top non-bugsnag stackframe equals "/usr/src/app/handled/notify_string.rb"
+  And the "lineNumber" of the top non-bugsnag stackframe equals 8
+
+  Examples:
+  | ruby version |
+  | 1.9.3        |
+  | 2.0          |
+  | 2.1          |
+  | 2.2          |
+  | 2.3          |
+  | 2.4          |
+  | 2.5          |
+
 
 Scenario Outline: A handled error doesn't send a report when the :skip_bugsnag flag is set
   And I set environment variable "RUBY_VERSION" to "<ruby version>"
@@ -62,17 +80,17 @@ Scenario Outline: A handled error can attach metadata in a block
   And I run the service "plain-ruby" with the command "bundle exec ruby handled/block_metadata.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the event "unhandled" is false
-  And the event "severity" is "warning"
-  And the event "severityReason.type" is "handledException"
+  And the event "severity" equals "warning"
+  And the event "severityReason.type" equals "handledException"
   And the exception "errorClass" equals "RuntimeError"
-  And the "file" of stack frame 0 equals "/usr/src/handled/block_metadata.rb"
+  And the "file" of stack frame 0 equals "/usr/src/app/handled/block_metadata.rb"
   And the "lineNumber" of stack frame 0 equals 6
-  And the event "metaData.account.id" is "1234abcd"
-  And the event "metaData.account.name" is "Acme Co"
+  And the event "metaData.account.id" equals "1234abcd"
+  And the event "metaData.account.name" equals "Acme Co"
   And the event "metaData.account.support" is true
 
   Examples:

data/features/plain_features/ignore_classes.feature

@@ -2,8 +2,6 @@ Feature: Plain ignore classes
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  Given I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: An errors class is in the ignore_classes array

data/features/plain_features/ignore_report.feature

@@ -2,8 +2,6 @@ Feature: Plain ignore report
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  Given I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: A reports severity can be modified

data/features/plain_features/proxies.feature

@@ -2,16 +2,14 @@ Feature: proxy configuration options
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: Proxy settings are provided as configuration options
   Given I set environment variable "RUBY_VERSION" to "<ruby version>"
-  And I set environment variable "MAZE_PROXY_HOST" to the current IP
-  And I set environment variable "MAZE_PROXY_PORT" to the mock API port
-  And I set environment variable "MAZE_PROXY_USER" to "tester"
-  And I set environment variable "MAZE_PROXY_PASSWORD" to "testpass"
+  And I set environment variable "BUGSNAG_PROXY_HOST" to the current IP
+  And I set environment variable "BUGSNAG_PROXY_PORT" to the mock API port
+  And I set environment variable "BUGSNAG_PROXY_USER" to "tester"
+  And I set environment variable "BUGSNAG_PROXY_PASSWORD" to "testpass"
   And I have built the service "plain-ruby"
   And I run the service "plain-ruby" with the command "bundle exec ruby configuration/proxy.rb"
   And I wait for 1 second

data/features/plain_features/release_stages.feature

@@ -2,14 +2,12 @@ Feature: Release stage configuration options
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: Doesn't notify in the wrong release stage
   Given I set environment variable "RUBY_VERSION" to "<ruby version>"
-  And I set environment variable "MAZE_NOTIFY_RELEASE_STAGE" to "stage_one"
-  And I set environment variable "MAZE_RELEASE_STAGE" to "stage_two"
+  And I set environment variable "BUGSNAG_NOTIFY_RELEASE_STAGE" to "stage_one"
+  And I set environment variable "BUGSNAG_RELEASE_STAGE" to "stage_two"
   And I have built the service "plain-ruby"
   And I run the service "plain-ruby" with the command "bundle exec ruby configuration/send_unhandled.rb"
   And I wait for 1 second
@@ -27,20 +25,20 @@ Scenario Outline: Doesn't notify in the wrong release stage
 
 Scenario Outline: Doesn't notify in the wrong release stage
   Given I set environment variable "RUBY_VERSION" to "<ruby version>"
-  And I set environment variable "MAZE_NOTIFY_RELEASE_STAGE" to "stage_one"
-  And I set environment variable "MAZE_RELEASE_STAGE" to "stage_one"
+  And I set environment variable "BUGSNAG_NOTIFY_RELEASE_STAGE" to "stage_one"
+  And I set environment variable "BUGSNAG_RELEASE_STAGE" to "stage_one"
   And I have built the service "plain-ruby"
   And I run the service "plain-ruby" with the command "bundle exec ruby configuration/send_unhandled.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
   And the event "unhandled" is true
-  And the event "severity" is "error"
-  And the event "severityReason.type" is "unhandledException"
+  And the event "severity" equals "error"
+  And the event "severityReason.type" equals "unhandledException"
   And the exception "errorClass" equals "RuntimeError"
-  And the "file" of stack frame 0 equals "/usr/src/configuration/send_unhandled.rb"
+  And the "file" of stack frame 0 equals "/usr/src/app/configuration/send_unhandled.rb"
 
   Examples:
   | ruby version |

data/features/plain_features/report_api_key.feature

@@ -2,8 +2,6 @@ Feature: Plain report modify api key
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  Given I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: A report can have its api_key modified
@@ -13,7 +11,7 @@ Scenario Outline: A report can have its api_key modified
   And I run the service "plain-ruby" with the command "bundle exec ruby report_modification/modify_api_key.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "abcdefghijklmnopqrstuvwxyz123456"
 

data/features/plain_features/report_severity.feature

@@ -2,8 +2,6 @@ Feature: Plain report modify severity
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  Given I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: A reports severity can be modified
@@ -13,11 +11,11 @@ Scenario Outline: A reports severity can be modified
   And I run the service "plain-ruby" with the command "bundle exec ruby report_modification/modify_severity.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And the event "severity" is "info"
-  And the event "severityReason.type" is "userCallbackSetSeverity"
+  And the event "severity" equals "info"
+  And the event "severityReason.type" equals "userCallbackSetSeverity"
 
   Examples:
   | ruby version | initiator               |

data/features/plain_features/report_stack_frames.feature

@@ -2,8 +2,6 @@ Feature: Plain report modify stack frames
 
 Background:
   Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  Given I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And I set environment variable "APP_PATH" to "/usr/src"
   And I configure the bugsnag endpoint
 
 Scenario Outline: Stack frames can be removed
@@ -13,36 +11,52 @@ Scenario Outline: Stack frames can be removed
   And I run the service "plain-ruby" with the command "bundle exec ruby stack_frame_modification/remove_stack_frame.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And the "file" of stack frame 0 equals "/usr/src/stack_frame_modification/initiators/<initiator>.rb"
+  And the "file" of the top non-bugsnag stackframe equals "/usr/src/app/stack_frame_modification/initiators/<initiator>.rb"
   And the "lineNumber" of stack frame 0 equals <lineNumber>
 
   Examples:
   | ruby version | initiator               | lineNumber |
   | 1.9.3        | handled_before_notify   | 20         |
-  | 1.9.3        | handled_block           | 19         |
   | 1.9.3        | unhandled_before_notify | 21         |
   | 2.0          | handled_before_notify   | 20         |
-  | 2.0          | handled_block           | 19         |
   | 2.0          | unhandled_before_notify | 21         |
   | 2.1          | handled_before_notify   | 20         |
-  | 2.1          | handled_block           | 19         |
   | 2.1          | unhandled_before_notify | 21         |
   | 2.2          | handled_before_notify   | 20         |
-  | 2.2          | handled_block           | 19         |
   | 2.2          | unhandled_before_notify | 21         |
   | 2.3          | handled_before_notify   | 20         |
-  | 2.3          | handled_block           | 19         |
   | 2.3          | unhandled_before_notify | 21         |
   | 2.4          | handled_before_notify   | 20         |
-  | 2.4          | handled_block           | 19         |
   | 2.4          | unhandled_before_notify | 21         |
   | 2.5          | handled_before_notify   | 20         |
-  | 2.5          | handled_block           | 19         |
   | 2.5          | unhandled_before_notify | 21         |
 
+Scenario Outline: Stack frames can be removed from a notified string
+  Given I set environment variable "RUBY_VERSION" to "<ruby version>"
+  And I set environment variable "CALLBACK_INITIATOR" to "handled_block"
+  And I have built the service "plain-ruby"
+  And I run the service "plain-ruby" with the command "bundle exec ruby stack_frame_modification/remove_stack_frame.rb"
+  And I wait for 1 second
+  Then I should receive a request
+  And the request used the "Ruby Bugsnag Notifier" notifier
+  And the request used payload v4 headers
+  And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
+  And the "file" of the top non-bugsnag stackframe equals "/usr/src/app/stack_frame_modification/initiators/handled_block.rb"
+  And the "lineNumber" of the top non-bugsnag stackframe equals 19
+
+  Examples:
+  | ruby version |
+  | 1.9.3        |
+  | 2.0          |
+  | 2.1          |
+  | 2.2          |
+  | 2.3          |
+  | 2.4          |
+  | 2.5          |
+
 Scenario Outline: Stack frames can be marked as in project
   Given I set environment variable "RUBY_VERSION" to "<ruby version>"
   And I set environment variable "CALLBACK_INITIATOR" to "<initiator>"
@@ -50,10 +64,10 @@ Scenario Outline: Stack frames can be marked as in project
   And I run the service "plain-ruby" with the command "bundle exec ruby stack_frame_modification/mark_frames_in_project.rb"
   And I wait for 1 second
   Then I should receive a request
-  And the request used the Ruby notifier
+  And the request used the "Ruby Bugsnag Notifier" notifier
   And the request used payload v4 headers
   And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
-  And the "file" of stack frame 0 equals "/usr/src/stack_frame_modification/initiators/<initiator>.rb"
+  And the "file" of stack frame 0 equals "/usr/src/app/stack_frame_modification/initiators/<initiator>.rb"
   And the event "exceptions.0.stacktrace.0.inProject" is null
   And the event "exceptions.0.stacktrace.1.inProject" is true
   And the event "exceptions.0.stacktrace.2.inProject" is true
@@ -62,23 +76,42 @@ Scenario Outline: Stack frames can be marked as in project
   Examples:
   | ruby version | initiator               |
   | 1.9.3        | handled_before_notify   |
-  | 1.9.3        | handled_block           |
   | 1.9.3        | unhandled_before_notify |
   | 2.0          | handled_before_notify   |
-  | 2.0          | handled_block           |
   | 2.0          | unhandled_before_notify |
   | 2.1          | handled_before_notify   |
-  | 2.1          | handled_block           |
   | 2.1          | unhandled_before_notify |
   | 2.2          | handled_before_notify   |
-  | 2.2          | handled_block           |
   | 2.2          | unhandled_before_notify |
   | 2.3          | handled_before_notify   |
-  | 2.3          | handled_block           |
   | 2.3          | unhandled_before_notify |
   | 2.4          | handled_before_notify   |
-  | 2.4          | handled_block           |
   | 2.4          | unhandled_before_notify |
   | 2.5          | handled_before_notify   |
-  | 2.5          | handled_block           |
-  | 2.5          | unhandled_before_notify |
+  | 2.5          | unhandled_before_notify |
+
+Scenario Outline: Stack frames can be marked as in project with a handled string
+  Given I set environment variable "RUBY_VERSION" to "<ruby version>"
+  And I set environment variable "CALLBACK_INITIATOR" to "handled_block"
+  And I have built the service "plain-ruby"
+  And I run the service "plain-ruby" with the command "bundle exec ruby stack_frame_modification/mark_frames_in_project.rb"
+  And I wait for 1 second
+  Then I should receive a request
+  And the request used the "Ruby Bugsnag Notifier" notifier
+  And the request used payload v4 headers
+  And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa"
+  And the "file" of the top non-bugsnag stackframe equals "/usr/src/app/stack_frame_modification/initiators/handled_block.rb"
+  And the event "exceptions.0.stacktrace.0.inProject" is null
+  And the event "exceptions.0.stacktrace.1.inProject" is true
+  And the event "exceptions.0.stacktrace.2.inProject" is true
+  And the event "exceptions.0.stacktrace.3.inProject" is true
+
+  Examples:
+  | ruby version |
+  | 1.9.3        |
+  | 2.0          |
+  | 2.1          |
+  | 2.2          |
+  | 2.3          |
+  | 2.4          |
+  | 2.5          |