RubyGems - airbrake - Versions diffs - 3.1.6 → 3.1.7 - Mend

airbrake 3.1.6 → 3.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

data/CHANGELOG +116 -0
data/LICENSE +61 -0
data/README.md +28 -478
data/README_FOR_HEROKU_ADDON.md +13 -5
data/Rakefile +26 -103
data/TESTED_AGAINST +6 -0
data/airbrake.gemspec +13 -14
data/features/metal.feature +27 -12
data/features/rack.feature +59 -59
data/features/rails.feature +79 -100
data/features/rails_with_js_notifier.feature +9 -21
data/features/rake.feature +6 -4
data/features/sinatra.feature +32 -6
data/features/step_definitions/file_steps.rb +4 -0
data/features/step_definitions/rack_steps.rb +9 -5
data/features/step_definitions/rails_application_steps.rb +46 -278
data/features/step_definitions/rake_steps.rb +16 -11
data/features/support/airbrake_shim.rb.template +0 -2
data/features/support/aruba.rb +5 -0
data/features/support/env.rb +12 -6
data/features/support/rails.rb +30 -73
data/features/support/rake/Rakefile +1 -2
data/features/user_informer.feature +12 -19
data/generators/airbrake/airbrake_generator.rb +1 -1
data/lib/airbrake.rb +9 -8
data/lib/airbrake/cli/project_factory.rb +6 -3
data/lib/airbrake/configuration.rb +7 -0
data/lib/airbrake/notice.rb +52 -3
data/lib/airbrake/rack.rb +16 -7
data/lib/airbrake/rails/action_controller_catcher.rb +5 -3
data/lib/airbrake/rails/controller_methods.rb +6 -6
data/lib/airbrake/rails/error_lookup.rb +4 -2
data/lib/airbrake/rails/javascript_notifier.rb +7 -3
data/lib/airbrake/rails/middleware.rb +65 -0
data/lib/airbrake/rails3_tasks.rb +16 -21
data/lib/airbrake/railtie.rb +9 -16
data/lib/airbrake/rake_handler.rb +2 -2
data/lib/airbrake/sender.rb +57 -6
data/lib/airbrake/shared_tasks.rb +24 -11
data/lib/airbrake/sinatra.rb +34 -0
data/lib/airbrake/user_informer.rb +9 -0
data/lib/airbrake/version.rb +1 -1
data/lib/rails/generators/airbrake/airbrake_generator.rb +10 -10
data/{test/airbrake_2_3.xsd → resources/airbrake_2_4.xsd} +1 -0
data/resources/airbrake_3_0.json +52 -0
data/test/catcher_test.rb +198 -240
data/test/configuration_test.rb +2 -0
data/test/helper.rb +123 -53
data/test/notice_test.rb +45 -1
data/test/sender_test.rb +63 -32
metadata +60 -79
data/MIT-LICENSE +0 -22
data/SUPPORTED_RAILS_VERSIONS +0 -38
data/TESTING.md +0 -41
data/features/step_definitions/metal_steps.rb +0 -23
data/features/support/terminal.rb +0 -107
data/lib/airbrake/extensions/blank.rb +0 -73
data/lib/airbrake/rails/middleware/exceptions_catcher.rb +0 -33

data/features/rails_with_js_notifier.feature CHANGED Viewed

@@ -1,12 +1,11 @@
 Feature: Install the Gem in a Rails application and enable the JavaScript notifier
   Background:
-    Given I have built and installed the "airbrake" gem
+    Given I successfully run `rails new rails_root -O --skip-gemfile`
+    And I cd to "rails_root"
+    And I configure the Airbrake shim
   Scenario: Include the Javascript notifier when enabled
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
     When I configure the notifier to use the following configuration lines:
       """
       config.api_key     = "myapikey"
@@ -16,7 +15,7 @@ Feature: Install the Gem in a Rails application and enable the JavaScript notifi
         render :inline => '<html><head profile="http://example.com"><%= airbrake_javascript_notifier %></head><body></body></html>'
       """
     And I route "/test/index" to "test#index"
-    And I perform a request to "http://example.com:123/test/index"
+    And I perform a request to "http://example.com:123/test/index" in the "production" environment
     Then I should see the notifier JavaScript for the following:
       | api_key  | environment | host           |
       | myapikey | production  | api.airbrake.io |
@@ -25,11 +24,9 @@ Feature: Install the Gem in a Rails application and enable the JavaScript notifi
       | http://example.com:123/test/index | test      | index  |
   Scenario: Include the Javascript notifier when enabled using custom configuration settings
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
     When I configure the notifier to use the following configuration lines:
       """
+      config.development_environments = []
       config.api_key     = "myapikey!"
       config.host        = "myairbrake.com"
       config.port        = 3001
@@ -42,12 +39,9 @@ Feature: Install the Gem in a Rails application and enable the JavaScript notifi
     And I perform a request to "http://example.com:123/test/index"
     Then I should see the notifier JavaScript for the following:
       | api_key   | environment | host               |
-      | myapikey! | production  | myairbrake.com:3001 |
+      | myapikey! | test  | myairbrake.com:3001 |
   Scenario: Don't include the Javascript notifier by default
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
     When I configure the notifier to use the following configuration lines:
       """
       config.api_key = "myapikey!"
@@ -61,9 +55,6 @@ Feature: Install the Gem in a Rails application and enable the JavaScript notifi
     Then I should not see notifier JavaScript
   Scenario: Don't include the Javascript notifier when enabled in non-public environments
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
     When I configure the notifier to use the following configuration lines:
       """
       config.api_key          = "myapikey!"
@@ -76,11 +67,8 @@ Feature: Install the Gem in a Rails application and enable the JavaScript notifi
     And I route "/test/index" to "test#index"
     And I perform a request to "http://example.com:123/test/index" in the "test" environment
     Then I should not see notifier JavaScript
-  Scenario: Include the Javascript notifier with a custom api key
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
+  Scenario: Use the js_api_key if present
     When I configure the notifier to use the following configuration lines:
       """
       config.api_key     = "myapikey!"
@@ -91,7 +79,7 @@ Feature: Install the Gem in a Rails application and enable the JavaScript notifi
         render :inline => '<html><head><%= airbrake_javascript_notifier %></head><body></body></html>'
       """
     And I route "/test/index" to "test#index"
-    And I perform a request to "http://example.com:123/test/index"
+    And I perform a request to "http://example.com:123/test/index" in the "production" environment
     Then I should see the notifier JavaScript for the following:
       | api_key     | environment | host        |
       | myjsapikey! | production  | api.airbrake.io |

data/features/rake.feature CHANGED Viewed

@@ -1,6 +1,7 @@
 Feature: Use the Gem to catch errors in a Rake application
   Background:
-    Given I have built and installed the "airbrake" gem
+    Given I've prepared the Rakefile
   Scenario: Catching exceptions in Rake
     When I run rake with airbrake
@@ -22,6 +23,7 @@ Feature: Use the Gem to catch errors in a Rake application
     When I run rake with airbrake autodetect not from terminal
     Then Airbrake should catch the exception
-  Scenario: Sending the correct component name
-    When I run rake with airbrake
-    Then Airbrake should send the rake command line as the component name
+  @wip
+  Scenario: Airbrake should also send the command name
+    When I run `rake airbrake_autodetect_not_from_terminal`
+    Then command "airbrake_autodetect_not_from_terminal" should be reported

data/features/sinatra.feature CHANGED Viewed

@@ -1,21 +1,20 @@
 Feature: Use the notifier in a Sinatra app
-  Background:
-    Given I have built and installed the "airbrake" gem
   Scenario: Rescue an exception in a Sinatra app
     Given the following Rack app:
       """
       require 'sinatra/base'
       require 'airbrake'
+      require 'logger'
       Airbrake.configure do |config|
-        config.api_key = 'my_api_key'
+        config.api_key = 'my_api_key'
+        config.logger  = Logger.new STDOUT
+        config.development_environments = []
       end
       class FontaneApp < Sinatra::Base
-        use Airbrake::Rack
-        enable :raise_errors
+        use Airbrake::Sinatra
         get "/test/index" do
           raise "Sinatra has left the building"
@@ -26,4 +25,31 @@ Feature: Use the notifier in a Sinatra app
       """
     When I perform a Rack request to "http://example.com:123/test/index?param=value"
     Then I should receive a Airbrake notification
+  Scenario: Catching environment name in modular Sinatra app
+    Given the following Rack app:
+      """
+      require 'sinatra/base'
+      require 'airbrake'
+      require 'logger'
+      Airbrake.configure do |config|
+        config.api_key = 'my_api_key'
+        config.logger  = Logger.new STDOUT
+      end
+      class FontaneApp < Sinatra::Base
+        use Airbrake::Sinatra
+        set :environment, :production
+        get "/test/index" do
+          raise "Sinatra has left the building"
+        end
+      end
+      app = FontaneApp
+      """
+    When I perform a Rack request to "http://example.com:123/test/index?param=value"
+    Then I should receive a Airbrake notification
+    And the output should contain "Env: production"

data/features/step_definitions/file_steps.rb CHANGED Viewed

@@ -8,3 +8,7 @@ Then /^"([^\"]*)" should not contain text of "([^\"]*)"$/ do |target_file, conte
   target_text.should_not include(contents_text)
 end
+Then /^I append "([^\"]*)" to Gemfile$/ do |contents|
+  append_to_gemfile(contents)
+end

data/features/step_definitions/rack_steps.rb CHANGED Viewed

@@ -2,6 +2,14 @@ Given /^the following Rack app:$/ do |definition|
   File.open(RACK_FILE, 'w') { |file| file.write(definition) }
 end
+When /^I add "([^\"]*)" requirement(?: with "([^\"]*)" option)?$/ do |gem,option|
+  append_to_gemfile("gem '#{gem}'#{option ? ", #{option}":""}")
+end
+When /^I initialize Gemfile$/ do
+  step %{I run `bundle init`}
+end
 When /^I perform a Rack request to "([^\"]*)"$/ do |url|
   shim_file = File.join(PROJECT_ROOT, 'features', 'support', 'airbrake_shim.rb.template')
   request_file = File.join(TEMP_DIR, 'rack_request.rb')
@@ -15,9 +23,5 @@ When /^I perform a Rack request to "([^\"]*)"$/ do |url|
     file.puts %{headers.each { |key, value| puts "\#{key}: \#{value}"}}
     file.puts "body.each { |part| print part }"
   end
-  @terminal.run("ruby #{request_file}")
-end
-Then /^I should receive a Airbrake notification for rack$/ do
-  Then %{I should see "You have accessed a deleted account."}
+  step %{I run `bundle exec ruby #{request_file}`}
 end

data/features/step_definitions/rails_application_steps.rb CHANGED Viewed

@@ -1,21 +1,11 @@
 require 'uri'
-require 'active_support/core_ext/string/inflections'
-Given /^I have built and installed the "([^\"]*)" gem$/ do |gem_name|
-  @terminal.build_and_install_gem(File.join(PROJECT_ROOT, "#{gem_name}.gemspec"))
-end
-Given /^PENDING/ do
-  pending
-end
+require 'active_support/core_ext/string/inflections'
 Given /^Airbrake server is not responding$/ do
-  bundle_gem("sham_rack")
   content = <<-CONTENT
   require 'sham_rack'
-  Airbrake.configuration.logger = Logger.new STDOUT
   ShamRack.at("api.airbrake.io") {["500", { "Content-type" => "text/xml" }, ["Internal server error"]]}
   CONTENT
@@ -23,105 +13,20 @@ Given /^Airbrake server is not responding$/ do
   File.open(target,"w") { |f| f.write content }
 end
-When /^I generate a new Rails application$/ do
-  @terminal.cd(TEMP_DIR)
-  rails3 = version_string =~ /^3/
-  if rails3
-    rails_create_command = 'new'
-  else
-    rails_create_command = ''
-  end
-  load_rails = <<-RUBY
-    gem 'rails', '#{version_string}'; \
-    load Gem.bin_path('#{version_string >= "3.2.0" ? "railties" : "rails"}', 'rails', '#{version_string}')
-  RUBY
-  @terminal.run(%{ruby -rrubygems -rthread -e "#{load_rails.strip!}" #{rails_create_command} rails_root})
-  if rails_root_exists?
-    @terminal.echo("Generated a Rails #{version_string.strip} application")
-  else
-    raise "Unable to generate a Rails application:\n#{@terminal.output}"
-  end
-  require_thread
-  if version_string >= "3.1.0"
-    When %{I configure my application to require the "therubyracer" gem with version "0.10.1"}
-  elsif version_string =~ /2.3.14/
-    monkeypatch_old_version
-  end
-  config_gem_dependencies unless rails3
-end
-When /^I run the airbrake generator with "([^\"]*)"$/ do |generator_args|
-  if rails3?
-    When %{I run "./script/rails generate airbrake #{generator_args}"}
-  else
-    When %{I run "./script/generate airbrake #{generator_args}"}
-  end
-end
-When /^I print the console output$/ do
-  puts @terminal.output
-end
-Given /^I have installed the "([^\"]*)" gem$/ do |gem_name|
-  @terminal.install_gem(gem_name)
-end
-When /^I configure my application to require the "capistrano" gem if necessary$/ do
-  When %{I configure my application to require the "capistrano" gem} if version_string >= "3.0.0"
-end
-When /^I configure my application to require the "([^\"]*)" gem(?: with version "(.+)")?$/ do |gem_name, version|
-  if rails_manages_gems?
-    config_gem(gem_name, version)
-  elsif bundler_manages_gems?
-    bundle_gem(gem_name, version)
-  else
-    File.open(environment_path, 'a') do |file|
-      file.puts
-      file.puts("require 'airbrake'")
-      file.puts("require 'airbrake/rails'")
-    end
-    unless rails_finds_generators_in_gems?
-      FileUtils.cp_r(File.join(PROJECT_ROOT, 'generators'), File.join(rails_root, 'lib'))
-    end
-  end
-end
-When /^I run "([^\"]*)"$/ do |command|
-  @terminal.cd(rails_root)
-  @terminal.run(command)
-end
-Then /^I should( not)? receive a Airbrake notification$/ do |or_should_not|
-  Then %{I should#{or_should_not} see "** [Airbrake] Response from Airbrake:"}
-  And %{I should#{or_should_not} see "b6817316-9c45-ed26-45eb-780dbb86aadb"}
-  And %{I should#{or_should_not} see "http://airbrake.io/locate/b6817316-9c45-ed26-45eb-780dbb86aadb"}
+Then /^I should (?:(not ))?receive a Airbrake notification$/ do |negator|
+  steps %{
+    Then the output should #{negator}contain "** [Airbrake] Response from Airbrake:"
+    And the output should #{negator}contain "b6817316-9c45-ed26-45eb-780dbb86aadb"
+    And the output should #{negator}contain "http://airbrake.io/locate/b6817316-9c45-ed26-45eb-780dbb86aadb"
+  }
 end
 Then /^I should receive two Airbrake notifications$/ do
-  @terminal.output.scan(/\[Airbrake\] Response from Airbrake:/).size.should == 2
+  step %{the output should match /\[Airbrake\] Response from Airbrake:/}
 end
 When /^I configure the Airbrake shim$/ do
-  if bundler_manages_gems?
-    bundle_gem("sham_rack")
-  end
   shim_file = File.join(PROJECT_ROOT, 'features', 'support', 'airbrake_shim.rb.template')
-  if rails_supports_initializers?
-    target = File.join(rails_root, 'config', 'initializers', 'airbrake_shim.rb')
-    FileUtils.cp(shim_file, target)
-  else
-    File.open(environment_path, 'a') do |file|
-      file.puts
-      file.write IO.read(shim_file)
-    end
-  end
   target = File.join(rails_root, 'config', 'initializers', 'airbrake_shim.rb')
   FileUtils.cp(shim_file, target)
 end
@@ -136,28 +41,13 @@ When /^I configure the notifier to use "([^\"]*)" as an API key$/ do |api_key|
 end
 When /^I configure the notifier to use the following configuration lines:$/ do |configuration_lines|
-  if rails_manages_gems?
-    requires = ''
-  else
-    requires = "require 'airbrake'"
-  end
   initializer_code = <<-EOF
-    #{requires}
     Airbrake.configure do |config|
       #{configuration_lines}
     end
   EOF
-  if rails_supports_initializers?
-    File.open(rails_initializer_file, 'w') { |file| file.write(initializer_code) }
-  else
-    File.open(environment_path, 'a') do |file|
-      file.puts
-      file.puts initializer_code
-    end
-  end
+  File.open(rails_initializer_file, 'w') { |file| file.write(initializer_code) }
 end
 def rails_initializer_file
@@ -168,47 +58,8 @@ def rails_non_initializer_airbrake_config_file
   File.join(rails_root, 'config', 'airbrake.rb')
 end
-Then /^I should see "([^\"]*)"$/ do |expected_text|
-  unless @terminal.output.include?(expected_text)
-    raise("Got terminal output:\n#{@terminal.output}\n\nExpected output:\n#{expected_text}")
-  end
-end
-Then /^I should not see "([^\"]*)"$/ do |unexpected_text|
-  if @terminal.output.include?(unexpected_text)
-    raise("Got terminal output:\n#{@terminal.output}\n\nDid not expect the following output:\n#{unexpected_text}")
-  end
-end
-When /^I uninstall the "([^\"]*)" gem$/ do |gem_name|
-  @terminal.uninstall_gem(gem_name)
-end
-When /^I unpack the "([^\"]*)" gem$/ do |gem_name|
-  if bundler_manages_gems?
-    @terminal.cd(rails_root)
-    @terminal.run("bundle pack")
-  elsif rails_manages_gems?
-    @terminal.cd(rails_root)
-    @terminal.run("rake gems:unpack GEM=#{gem_name}")
-  else
-    vendor_dir = File.join(rails_root, 'vendor', 'gems')
-    FileUtils.mkdir_p(vendor_dir)
-    @terminal.cd(vendor_dir)
-    @terminal.run("gem unpack #{gem_name}")
-    gem_path =
-      Dir.glob(File.join(rails_root, 'vendor', 'gems', "#{gem_name}-*", 'lib')).first
-    File.open(environment_path, 'a') do |file|
-      file.puts
-      file.puts("$: << #{gem_path.inspect}")
-    end
-  end
-end
-When /^I install cached gems$/ do
-  if bundler_manages_gems?
-    Then %{I run "bundle install"}
-  end
+Then /^I should (?:(not ))?see "([^\"]*)"$/ do |negator,expected_text|
+  step %{the output should #{negator}contain "#{expected_text}"}
 end
 When /^I install the "([^\"]*)" plugin$/ do |plugin_name|
@@ -232,10 +83,12 @@ end
 When /^I perform a request to "([^\"]*)"$/ do |uri|
   perform_request(uri)
+  step %{I run `bundle exec ./script/rails runner request.rb`}
 end
 When /^I perform a request to "([^\"]*)" in the "([^\"]*)" environment$/ do |uri, environment|
-  perform_request(uri, environment)
+  perform_request(uri,environment)
+  step %{I run `bundle exec rails runner -e #{environment} request.rb`}
 end
 Given /^the response page for a "([^\"]*)" error is$/ do |error, html|
@@ -244,55 +97,16 @@ Given /^the response page for a "([^\"]*)" error is$/ do |error, html|
   end
 end
-Then /^I should receive the following Airbrake notification:$/ do |table|
-  exceptions = @terminal.output.scan(%r{Recieved the following exception:\n([^\n]*)\n}m)
-  exceptions.should_not be_empty
-  xml = exceptions.last[0]
-  doc = Nokogiri::XML.parse(xml)
-  hash = table.transpose.hashes.first
-  doc.should have_content('//error/message', hash['error message'])
-  doc.should have_content('//error/class',   hash['error class'])
-  doc.should have_content('//request/url',   hash['url'])
-  doc.should have_content('//component', hash['component']) if hash['component']
-  doc.should have_content('//action', hash['action']) if hash['action']
-  doc.should have_content('//server-environment/project-root', hash['project-root']) if hash['project-root']
-  if hash['session']
-    session_key, session_value = hash['session'].split(': ')
-    doc.should have_content('//request/session/var/@key', session_key)
-    doc.should have_content('//request/session/var',      session_value)
-  end
-  if hash['parameters']
-    param_key, param_value     = hash['parameters'].split(': ')
-    doc.should have_content('//request/params/var/@key',  param_key)
-    doc.should have_content('//request/params/var',       param_value)
-  end
-end
 Then /^I should see the Rails version$/ do
-  Then %{I should see "[Rails: #{rails_version}]"}
+  step %{I should see "Rails: #{ENV["RAILS_VERSION"]}"}
 end
 Then /^I should see that "([^\"]*)" is not considered a framework gem$/ do |gem_name|
-  Then %{I should not see "[R] #{gem_name}"}
-end
-Then /^the command should have run successfully$/ do
-  @terminal.status.exitstatus.should == 0
+  step %{I should not see "[R] #{gem_name}"}
 end
 When /^I route "([^\"]*)" to "([^\"]*)"$/ do |path, controller_action_pair|
-  route = if rails3?
-            %(match "#{path}", :to => "#{controller_action_pair}")
-          else
-            controller, action = controller_action_pair.split('#')
-            %(map.connect "#{path}", :controller => "#{controller}", :action => "#{action}")
-          end
+  route = %(get "#{path}", :to => "#{controller_action_pair}")
   routes_file = File.join(rails_root, "config", "routes.rb")
   File.open(routes_file, "r+") do |file|
     content = file.read
@@ -310,12 +124,7 @@ Then /^"([^\"]*)" should not contain "([^\"]*)"$/ do |file_path, text|
 end
 Then /^my Airbrake configuration should contain the following line:$/ do |line|
-  configuration_file = if rails_supports_initializers?
-    rails_initializer_file
-  else
-    rails_non_initializer_airbrake_config_file
-    # environment_path
-  end
+  configuration_file = rails_initializer_file
   configuration = File.read(configuration_file)
   if ! configuration.include?(line.strip)
@@ -323,15 +132,7 @@ Then /^my Airbrake configuration should contain the following line:$/ do |line|
   end
 end
-When /^I set the environment variable "([^\"]*)" to "([^\"]*)"$/ do |environment_variable, value|
-  @terminal.environment_variables[environment_variable] = value
-end
-When /^I configure the Heroku rake shim$/ do
-  @terminal.invoke_heroku_rake_tasks_locally = true
-end
-When /^I configure the Heroku gem shim with "([^\"]*)"( and multiple app support)?$/ do |api_key, multi_app|
+When /^I configure the Heroku shim with "([^\"]*)"( and multiple app support)?$/ do |api_key, multi_app|
   heroku_script_bin = File.join(TEMP_DIR, "bin")
   FileUtils.mkdir_p(heroku_script_bin)
   heroku_script     = File.join(heroku_script_bin, "heroku")
@@ -372,36 +173,21 @@ fi
     end
   end
   FileUtils.chmod(0755, heroku_script)
-  @terminal.prepend_path(heroku_script_bin)
+  prepend_path(heroku_script_bin)
 end
 When /^I configure the application to filter parameter "([^\"]*)"$/ do |parameter|
-  if rails3?
-    application_filename = File.join(rails_root, 'config', 'application.rb')
-    application_lines = File.open(application_filename).readlines
+  application_filename = File.join(rails_root, 'config', 'application.rb')
+  application_lines = File.open(application_filename).readlines
-    application_definition_line       = application_lines.detect { |line| line =~ /Application/ }
-    application_definition_line_index = application_lines.index(application_definition_line)
+  application_definition_line       = application_lines.detect { |line| line =~ /Application/ }
+  application_definition_line_index = application_lines.index(application_definition_line)
-    application_lines.insert(application_definition_line_index + 1,
-                             "    config.filter_parameters += [#{parameter.inspect}]")
+  application_lines.insert(application_definition_line_index + 1,
+                           "    config.filter_parameters += [#{parameter.inspect}]")
-   File.open(application_filename, "w") do |file|
-     file.puts application_lines.join("\n")
-   end
-  else
-   controller_filename = application_controller_filename
-   controller_lines = File.open(controller_filename).readlines
-   controller_definition_line       = controller_lines.detect { |line| line =~ /ApplicationController/ }
-   controller_definition_line_index = controller_lines.index(controller_definition_line)
-   controller_lines.insert(controller_definition_line_index + 1,
-                           "    filter_parameter_logging #{parameter.inspect}")
-   File.open(controller_filename, "w") do |file|
-     file.puts controller_lines.join("\n")
-   end
+  File.open(application_filename, "w") do |file|
+    file.puts application_lines.join("\n")
   end
 end
@@ -412,46 +198,25 @@ Then /^I should see the notifier JavaScript for the following:$/ do |table|
   api_key     = hash['api_key']
   environment = hash['environment'] || 'production'
-  document_body = '<html>' + @terminal.output.split('<html>').last
-  document_body.should include("#{host}/javascripts/notifier.js")
-  response = Nokogiri::HTML.parse(document_body)
-  response.css("script[type='text/javascript']:last-child").each do |element|
-    content = element.content
-    content.should include("Airbrake.setKey('#{api_key}');")
-    content.should include("Airbrake.setHost('#{host}');")
-    content.should include("Airbrake.setEnvironment('#{environment}');")
-  end
+  steps %{
+    Then the output should contain "#{host}/javascripts/notifier.js"
+    And the output should contain "Airbrake.setKey('#{api_key}');"
+    And the output should contain "Airbrake.setHost('#{host}');"
+    And the output should contain "Airbrake.setEnvironment('#{environment}');"
+  }
 end
-Then "the notifier JavaScript should provide the following errorDefaults:" do |table|
+Then /^the notifier JavaScript should provide the following errorDefaults:$/ do |table|
   hash = table.hashes.first
-  document_body = '<html>' + @terminal.output.split('<html>').last
-  response = Nokogiri::HTML.parse(document_body)
-  response.css("script[type='text/javascript']:last-child").each do |element|
-    content = element.content
-    hash.each do |key, value|
-      content.should =~ %r{Airbrake\.setErrorDefaults.*#{key}: "#{value}}m
-    end
+  hash.each do |key, value|
+    assert_matching_output("Airbrake\.setErrorDefaults.*#{key}: \"#{value}\"",all_output)
   end
 end
 Then /^I should not see notifier JavaScript$/ do
-  response = Nokogiri::HTML.parse('<html>' + @terminal.output.split('<html>').last)
-  response.at_css("script[type='text/javascript'][src$='/javascripts/notifier.js']").should be_nil
+  step %{the output should not contain "script[type='text/javascript'][src$='/javascripts/notifier.js']"}
 end
-When /^I configure usage of Airbrake$/ do
-    When %{I configure my application to require the "airbrake" gem}
-    When %{I run the airbrake generator with "-k myapikey"}
-    @terminal.flush!                                              # flush the results of setting up Airbrake (generates notification)
-end
 When /^I have set up authentication system in my app that uses "([^\"]*)"$/ do |current_user|
   application_controller = File.join(rails_root, 'app', 'controllers', "application_controller.rb")
   definition =
@@ -462,7 +227,7 @@ When /^I have set up authentication system in my app that uses "([^\"]*)"$/ do |
     # this is the ultimate authentication system, devise is history
     def #{current_user}
-      Struct.new(:attributes).new({:id => 1,:name => 'Bender',:email => 'bender@beer.com',:username => 'b3nd0r'})
+      Struct.new(:id, :name, :email, :username).new(1, 'Bender', 'bender@beer.com', 'b3nd0r')
     end
   end
   """
@@ -470,9 +235,12 @@ When /^I have set up authentication system in my app that uses "([^\"]*)"$/ do |
 end
 Then /^the Airbrake notification should contain user details$/ do
-  Then %{I should see "Bender"}
-  And %{I should see "bender@beer.com"}
-  And %{I should see "<id>1</id>"}
-  And %{I should see "b3nd0r"}
+  step %{I should see "Bender"}
+  step %{I should see "bender@beer.com"}
+  step %{I should see "<id>1</id>"}
+  step %{I should see "b3nd0r"}
 end
+Then /^the Airbrake notification should contain the framework information$/ do
+  step %{the output should contain "Rails: #{ENV["RAILS_VERSION"]}"}
+end