airbrake 3.1.6 → 3.1.7

data/README_FOR_HEROKU_ADDON.md

@@ -15,7 +15,7 @@ To use Airbrake on Heroku, install the Airbrake add-on:
 After adding the Airbrake add-on, you will need to install and configure the Airbrake notifier.
 
 Your application connects to Airbrake with an API key. On Heroku, this is automatically provided to your
-application in `ENV['HOPTOAD_API_KEY']`, so installation should be a snap! (Hoptoad is Airbrake's old name.)
+application in `ENV['AIRBRAKE_API_KEY']`, so installation should be a snap!
 
 ### Rails 3.x
 
@@ -57,7 +57,7 @@ In order to use airbrake in a non-Rails rack app, just load the airbrake, config
     require 'airbrake'
 
     Airbrake.configure do |config|
-      config.api_key = `ENV['HOPTOAD_API_KEY']`
+      config.api_key = `ENV['AIRBRAKE_API_KEY']`
     end
 
     app = Rack::Builder.app do
@@ -67,8 +67,8 @@ In order to use airbrake in a non-Rails rack app, just load the airbrake, config
 
 ### Rails 1.x
 
-For Rails 1.x, visit the [Airbrake notifier's README on GitHub](http://github.com/thoughtbot/airbrake),
-and be sure to use `ENV['HOPTOAD_API_KEY']` where your API key is required in configuration code.
+For Rails 1.x, visit the [Airbrake's README on GitHub](http://github.com/airbrake/airbrake),
+and be sure to use `ENV['AIRBRAKE_API_KEY']` where your API key is required in configuration code.
 
 3. Configure your notification settings (important!)
 ---------------------------------------------------
@@ -82,7 +82,7 @@ Airbrake can deliver exception notifications to your email inbox.  To configure
 
 1. Visit your applications resources page, like [ http://api.heroku.com/myapps/my-great-app/resources ](http://api.heroku.com/myapps/my-great-app/resources).
 2. Click the name of your Airbrake addon. (It may still be called Hoptoad.)
-3. Click "Settings" to configure the Hoptoad Add-on.
+3. Click "Settings" to configure the Airbrake Add-on.
 
 4. Optionally: Set up deploy notification
 -----------------------------------------
@@ -92,3 +92,11 @@ If your Airbrake plan supports deploy notification, set it up for your Heroku ap
     rake airbrake:heroku:add_deploy_notification
 
 This will install a Heroku [HTTP Deploy Hook](http://docs.heroku.com/deploy-hooks) to notify Airbrake of the deploy.
+
+You can pass in additional information for the deploy hook, in the ENV. Here are the available parameters:
+* `ENV["RAILS_ENV"]`         - Rails environment you're deploying to, if not set on Heroku
+* `ENV["AIRBRAKE_API_KEY"]`  - API key if not saved on Heroku or in initializer
+* `ENV["HEROKU_APP"]`        - app name if you have multiple Heroku apps
+* `ENV["REPO"]`              - Github url of the repo you're deploying, set this if you're not using remote named "origin"
+
+We will also set "username" and "revision" from Heroku variables.

data/Rakefile

@@ -1,3 +1,6 @@
+require 'rubygems'
+require "bundler/setup"
+require 'appraisal'
 require 'rake'
 require 'rake/testtask'
 require 'rubygems/package_task'
@@ -9,14 +12,11 @@ rescue LoadError
 end
 require './lib/airbrake/version'
 
-FEATURES = ["sinatra","rack","metal","user_informer","rake"]
-
-desc 'Default: run unit tests.'
-task :default => [:test, "cucumber:rails:all"] + FEATURES
-
-desc "Clean out the tmp directory"
-task :clean do
-  exec "rm -rf tmp"
+task :default do
+  exec 'rake appraisal:rails-3.0 test '\
+  '&& rake appraisal:rails-3.1 test '\
+  '&& rake appraisal:rails-3.2 test '\
+  '&& rake appraisal cucumber'\
 end
 
 desc 'Test the airbrake gem.'
@@ -118,106 +118,29 @@ desc "Clean files generated by rake tasks"
 task :clobber => [:clobber_rdoc, :clobber_package]
 
 LOCAL_GEM_ROOT = File.join(GEM_ROOT, 'tmp', 'local_gems').freeze
-RAILS_VERSIONS = IO.read('SUPPORTED_RAILS_VERSIONS').strip.split("\n")
-LOCAL_GEMS =
-  [
-    ["rack","1.3.2"],
-  ] +
-  RAILS_VERSIONS.collect { |version| ['rails', version] } +
-  [
-    ['sham_rack', nil],
-    ['capistrano', nil],
-    ['sqlite3-ruby', nil],
-    ["therubyracer",nil],
-    ["sinatra",nil]
-  ]
-
-
-desc "Vendor test gems: Run this once to prepare your test environment"
-task :vendor_test_gems do
-  old_gem_path = ENV['GEM_PATH']
-  old_gem_home = ENV['GEM_HOME']
-  ENV['GEM_PATH'] = LOCAL_GEM_ROOT
-  ENV['GEM_HOME'] = LOCAL_GEM_ROOT
-
-  LOCAL_GEMS.each do |gem_name, version|
-    gem_file_pattern = [gem_name, version || '*'].compact.join('-')
-    version_option = version ? "-v #{version}" : ''
-    pattern = File.join(LOCAL_GEM_ROOT, 'gems', "#{gem_file_pattern}")
-    existing = Dir.glob(pattern).first
-    if existing
-      puts "\nskipping #{gem_name} since it's already vendored," +
-      "remove it from the tmp directory first."
-      next
-    end
 
-    command = "gem install -i #{LOCAL_GEM_ROOT} --no-ri --no-rdoc --backtrace #{version_option} #{gem_name}"
-    puts "Vendoring #{gem_file_pattern}..."
-    unless system("#{command} 2>&1")
-      puts "Command failed: #{command}"
-      exit(1)
-    end
+# Helper method that's used to only include relevant features when using
+# various gemfiles. We don't want to, for instance, test sinatra features when 
+# using the rails gemfile and vice versa.
+def cucumber_opts
+  opts = "--tags ~@wip --format progress "
+
+  opts << ENV["FEATURE"] and return if ENV["FEATURE"]
+
+  case ENV["BUNDLE_GEMFILE"]
+  when /rails/
+    opts << "features/rails.feature features/rails_with_js_notifier.feature features/metal.feature features/user_informer.feature"
+  when /rack/
+    opts << "features/rack.feature"
+  when /sinatra/
+    opts << "features/sinatra.feature"
+  when /rake/
+    opts << "features/rake.feature"
   end
-
-  ENV['GEM_PATH'] = old_gem_path
-  ENV['GEM_HOME'] = old_gem_home
 end
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.fork = true
-  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
-end
-
-task :cucumber => [:vendor_test_gems]
-
-
-def run_rails_cucumber_task(version, additional_cucumber_args)
-  puts "Testing Rails #{version}"
-  if version.empty?
-    raise "No Rails version specified - make sure ENV['RAILS_VERSION'] is set, e.g. with `rake cucumber:rails:all`"
-  end
-  ENV['RAILS_VERSION'] = version
-  cmd   = "cucumber --format #{ENV['CUCUMBER_FORMAT'] || 'progress'} #{additional_cucumber_args} features/rails.feature features/rails_with_js_notifier.feature"
-  puts "Running command: #{cmd}"
-  system(cmd)
-end
-
-def define_rails_cucumber_tasks(additional_cucumber_args = '')
-  namespace :rails do
-    RAILS_VERSIONS.each do |version|
-      desc "Test integration of the gem with Rails #{version}"
-      task version => [:vendor_test_gems] do
-        exit 1 unless run_rails_cucumber_task(version, additional_cucumber_args)
-      end
-    end
-
-    desc "Test integration of the gem with all Rails versions"
-    task :all do
-      results = RAILS_VERSIONS.map do |version|
-        run_rails_cucumber_task(version, additional_cucumber_args)
-      end
-
-      exit 1 unless results.all?
-    end
-  end
+  t.cucumber_opts = cucumber_opts
 end
 
-namespace :cucumber do
-  namespace :wip do
-    define_rails_cucumber_tasks('--tags @wip')
-  end
-
-  define_rails_cucumber_tasks
-
-  rule /#{"(" + FEATURES.join("|") + ")"}/ do |t|
-    framework = t.name
-    desc "Test integration of the gem with #{framework}"
-    task framework.to_sym do
-      puts "Testing #{framework.split(":").last}..."
-      cmd = "cucumber --format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features/#{framework.split(":").last}.feature"
-      puts "Running command: #{cmd}"
-      system(cmd)
-    end
-  end
-
-end

data/TESTED_AGAINST

@@ -0,0 +1,6 @@
+Rails 3.0.19
+Rails 3.1.10
+Rails 3.2.11
+Sinatra 1.3.3
+Rack 1.4.3
+Rake 10.0.3

data/airbrake.gemspec

@@ -8,29 +8,28 @@ Gem::Specification.new do |s|
   s.summary     = %q{Send your application errors to our hosted service and reclaim your inbox.}
 
   s.require_paths = ["lib"]
-  s.executables << "airbrake"
+  s.executables   << "airbrake"
   s.files         = Dir["{generators/**/*,lib/**/*,rails/**/*,resources/*,script/*}"]  +
-    %w(airbrake.gemspec CHANGELOG Gemfile Guardfile INSTALL MIT-LICENSE Rakefile README_FOR_HEROKU_ADDON.md README.md TESTING.md SUPPORTED_RAILS_VERSIONS install.rb)
+    %w(airbrake.gemspec CHANGELOG Gemfile Guardfile INSTALL LICENSE Rakefile README_FOR_HEROKU_ADDON.md README.md TESTED_AGAINST install.rb)
   s.test_files    = Dir.glob("{test,spec,features}/**/*")
 
   s.add_runtime_dependency("builder")
-  s.add_runtime_dependency("girl_friday")
+  s.add_runtime_dependency("activesupport")
+  s.add_runtime_dependency("json")
 
-  s.add_development_dependency("actionpack",    "~> 2.3.8")
-  s.add_development_dependency("activerecord",  "~> 2.3.8")
-  s.add_development_dependency("activesupport", "~> 2.3.8")
-  s.add_development_dependency("mocha",           "0.10.5")
-  s.add_development_dependency("bourne",          ">= 1.0")
-  s.add_development_dependency("cucumber",     "~> 0.10.6")
+  s.add_development_dependency("bourne",        ">= 1.0")
+  s.add_development_dependency("cucumber-rails","~> 1.1.1")
   s.add_development_dependency("fakeweb",       "~> 1.3.0")
-  s.add_development_dependency("nokogiri",    "~> 1.4.3.1")
+  s.add_development_dependency("nokogiri",      "~> 1.5.0")
   s.add_development_dependency("rspec",         "~> 2.6.0")
   s.add_development_dependency("sham_rack",     "~> 1.3.0")
   s.add_development_dependency("shoulda",      "~> 2.11.3")
-  s.add_development_dependency("capistrano",    "~> 2.8.0")
-  s.add_development_dependency("guard"                    )
-  s.add_development_dependency("guard-test"               )
-  s.add_development_dependency("simplecov"                )
+  s.add_development_dependency("capistrano")
+  s.add_development_dependency("aruba")
+  s.add_development_dependency("appraisal")
+  s.add_development_dependency("rspec-rails")
+  s.add_development_dependency("girl_friday")
+  s.add_development_dependency("json-schema")
 
   s.authors = ["Airbrake"]
   s.email   = %q{support@airbrake.io}

data/features/metal.feature

@@ -1,18 +1,33 @@
 Feature: Rescue errors in Rails middleware
-
   Background:
-    Given I have built and installed the "airbrake" gem
-    And I generate a new Rails application
+    Given I successfully run `rails new rails_root -O --without-gemfile`
+    And I cd to "rails_root"
+    And I configure the notifier to use the following configuration lines:
+    """
+      config.logger = Logger.new STDOUT
+    """
     And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
-
-  Scenario: Rescue an exception in the dispatcher
-    When I define a Metal endpoint called "Exploder":
-      """
-      def self.call(env)
-        raise "Explode"
+    And I append to "app/metal/exploder.rb" with:
+    """
+      class Exploder
+        def call(env)
+          raise "Explode!"
+        end
       end
-      """
+    """
+    And I remove the file "config/routes.rb"
+    And I append to "config/routes.rb" with:
+    """
+    RailsRoot::Application.routes.draw do
+      mount Exploder.new => "/"
+    end
+    """
+
+  Scenario: It should not report to Airbrake in development
     When I perform a request to "http://example.com:123/metal/index?param=value"
+    Then I should not receive a Airbrake notification
+
+  Scenario: It should report to Airbrake in production
+    When I perform a request to "http://example.com:123/metal/index?param=value" in the "production" environment
     Then I should receive a Airbrake notification
+

data/features/rack.feature

@@ -1,60 +1,60 @@
 Feature: Use the notifier in a plain Rack app
-
-  Background:
-    Given I have built and installed the "airbrake" gem
-
-  Scenario: Rescue and exception in a Rack app
-    Given the following Rack app:
-      """
-      require 'logger'
-      require 'rack'
-      require 'airbrake'
-
-      Airbrake.configure do |config|
-        config.api_key = 'my_api_key'
-        config.logger = Logger.new STDOUT
-      end
-
-      app = Rack::Builder.app do
-        use Airbrake::Rack
-        run lambda { |env| raise "Rack down" }
-      end
-      """
-    When I perform a Rack request to "http://example.com:123/test/index?param=value"
-    Then I should receive a Airbrake notification
-
-  Scenario: Ignore user agents
-    Given the following Rack app:
-      """
-      require 'logger'
-      require 'rack'
-      require 'airbrake'
-
-      Airbrake.configure do |config|
-        config.api_key = 'my_api_key'
-        config.ignore_user_agent << /ignore/
-        config.logger = Logger.new STDOUT
-      end
-
-      class Mock
-        class AppendUserAgent
-          def initialize(app)
-            @app = app
-          end
-
-          def call(env)
-            env["HTTP_USER_AGENT"] = "ignore"
-            @app.call(env)
-          end
-        end
-      end
-
-      app = Rack::Builder.app do
-        use Airbrake::Rack
-        use Mock::AppendUserAgent
-        run lambda { |env| raise "Rack down" }
-      end
-      """
-    When I perform a Rack request to "http://example.com:123/test/index?param=value"
-    Then I should not see "** [Airbrake] Response from Airbrake:"
-
+  	
+ Scenario: Rescue and exception in a Rack app
+
+   Given the following Rack app:
+     """
+     require 'logger'
+     require 'rack'
+     require 'airbrake'
+	  	
+     Airbrake.configure do |config|
+       config.api_key = 'my_api_key'
+       config.logger = Logger.new STDOUT
+     end
+	  	
+     app = Rack::Builder.app do
+       use Airbrake::Rack
+       run lambda { |env| raise "Rack down" }
+     end
+
+     """
+   When I perform a Rack request to "http://example.com:123/test/index?param=value"
+   Then I should receive a Airbrake notification
+	  	
+ Scenario: Ignore user agents
+
+   Given the following Rack app:
+     """
+     require 'logger'
+     require 'rack'
+     require 'airbrake'
+	  	
+     Airbrake.configure do |config|
+       config.api_key = 'my_api_key'
+       config.ignore_user_agent << /ignore/
+       config.logger = Logger.new STDOUT
+     end
+	  	
+     class Mock
+       class AppendUserAgent
+         def initialize(app)
+           @app = app
+         end
+	  	
+         def call(env)
+           env["HTTP_USER_AGENT"] = "ignore"
+           @app.call(env)
+         end
+       end
+     end
+	  	
+     app = Rack::Builder.app do
+       use Airbrake::Rack
+       use Mock::AppendUserAgent
+       run lambda { |env| raise "Rack down" }
+     end
+	  	
+     """
+   When I perform a Rack request to "http://example.com:123/test/index?param=value"
+   Then I should not receive a Airbrake notification

data/features/rails.feature

@@ -1,41 +1,25 @@
 Feature: Install the Gem in a Rails application
 
   Background:
-    Given I have built and installed the "airbrake" gem
-    And I generate a new Rails application
+    Given I successfully run `rails new rails_root -O --skip-gemfile`
+    And I cd to "rails_root"
 
   Scenario: Use the gem without vendoring the gem in a Rails application
     When I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
-    Then the command should have run successfully
-    And I should receive a Airbrake notification
+    And I run `rails generate airbrake -k myapikey`
+    Then I should receive a Airbrake notification
     And I should see the Rails version
 
-  Scenario: vendor the gem and uninstall
-    When I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I unpack the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
-    Then the command should have run successfully
-    When I uninstall the "airbrake" gem
-    And I install cached gems
-    And I run "rake airbrake:test"
-    Then I should see "** [Airbrake] Response from Airbrake:"
-    And I should receive two Airbrake notifications
-
   Scenario: Configure the notifier by hand
     When I configure the Airbrake shim
     And I configure the notifier to use "myapikey" as an API key
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with ""
+    And I run `rails generate airbrake`
     Then I should receive a Airbrake notification
 
   Scenario: Configuration within initializer isn't overridden by Railtie
     When I configure the Airbrake shim
-    And I configure usage of Airbrake
-    Then the command should have run successfully
-    When I configure the notifier to use the following configuration lines:
+    And I run `rails generate airbrake -k myapikey`
+    And I configure the notifier to use the following configuration lines:
       """
       config.api_key = "myapikey"
       config.project_root = "argle/bargle"
@@ -50,42 +34,26 @@ Feature: Install the Gem in a Rails application
     Then I should receive a Airbrake notification
 
   Scenario: Try to install without an api key
-    When I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with ""
+    And I run `rails generate airbrake`
     Then I should see "Must pass --api-key or --heroku or create config/initializers/airbrake.rb"
 
   Scenario: Configure and deploy using only installed gem
-    When I run "capify ."
+    When I run `capify .`
     And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
-    And I configure my application to require the "capistrano" gem if necessary
-    And I run "cap -T"
-    Then I should see "airbrake:deploy"
-
-  Scenario: Configure and deploy using only vendored gem
-    When I run "capify ."
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I unpack the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
-    And I uninstall the "airbrake" gem
-    And I install cached gems
-    And I configure my application to require the "capistrano" gem if necessary
-    And I run "cap -T"
+    And I run `rails generate airbrake -k myapikey`
+    And I run `cap -T`
     Then I should see "airbrake:deploy"
 
   Scenario: Try to install when the airbrake plugin still exists
     When I install the "airbrake" plugin
     And I configure the Airbrake shim
     And I configure the notifier to use "myapikey" as an API key
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with ""
+    And I run `rails generate airbrake`
     Then I should see "You must first remove the airbrake plugin. Please run: script/plugin remove airbrake"
 
   Scenario: Rescue an exception in a controller
     When I configure the Airbrake shim
-    And I configure usage of Airbrake
+    And I run `rails generate airbrake -k myapikey`
     And I define a response for "TestController#index":
       """
       session[:value] = "test"
@@ -98,41 +66,36 @@ Feature: Install the Gem in a Rails application
 
   Scenario: The gem should not be considered a framework gem
     When I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
-    And I run "rake gems"
+    And I run `rails generate airbrake -k myapikey`
+    And I run `rake gems`
     Then I should see that "airbrake" is not considered a framework gem
 
   Scenario: The app uses Vlad instead of Capistrano
     When I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run "touch config/deploy.rb"
-    And I run "rm Capfile"
-    And I run the airbrake generator with "-k myapikey"
+    And I run `touch config/deploy.rb`
+    And I run `rm Capfile`
+    And I run `rails generate airbrake -k myapikey`
     Then "config/deploy.rb" should not contain "capistrano"
 
+  @wip
   Scenario: Support the Heroku addon in the generator
     When I configure the Airbrake shim
-    And I configure the Heroku rake shim
-    And I configure the Heroku gem shim with "myapikey"
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "--heroku"
-    Then the command should have run successfully
-    And I should receive a Airbrake notification
+    And I run `rails generate airbrake -k myapikey`
+    And I configure the Heroku shim with "myapikey"
+    And I successfully run `rails generate airbrake --heroku`
+    Then I should receive a Airbrake notification
     And I should see the Rails version
     And my Airbrake configuration should contain the following line:
       """
       config.api_key = ENV['HOPTOAD_API_KEY']
       """
 
+  @wip
   Scenario: Support the --app option for the Heroku addon in the generator
     When I configure the Airbrake shim
-    And I configure the Heroku rake shim
-    And I configure the Heroku gem shim with "myapikey" and multiple app support
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "--heroku -a myapp"
-    Then the command should have run successfully
-    And I should receive a Airbrake notification
+    And I configure the Heroku shim with "myapikey" and multiple app support
+    And I run `rails generate airbrake --heroku -a myapp`
+    Then I should receive a Airbrake notification
     And I should see the Rails version
     And my Airbrake configuration should contain the following line:
       """
@@ -141,54 +104,43 @@ Feature: Install the Gem in a Rails application
 
   Scenario: Filtering parameters in a controller
     When I configure the Airbrake shim
-    And I configure usage of Airbrake
+    And I run `rails generate airbrake -k myapikey`
     When I configure the notifier to use the following configuration lines:
       """
       config.api_key = "myapikey"
       config.params_filters << "credit_card_number"
+      config.params_filters << "secret"
+      config.logger = Logger.new STDOUT
       """
     And I define a response for "TestController#index":
       """
+      session["secret"] = "blue42"
       params[:credit_card_number] = "red23"
       raise RuntimeError, "some message"
       """
     And I route "/test/index" to "test#index"
-    And I perform a request to "http://example.com:123/test/index?param=value"
+    And I perform a request to "http://example.com:123/test/index?param=value" in the "production" environment
     Then I should receive a Airbrake notification
     Then I should not see "red23"
+    Then I should not see "blue42"
     And I should see "FILTERED"
 
-  Scenario: Filtering session in a controller
+  Scenario: Filtering session and params based on Rails parameter filters
     When I configure the Airbrake shim
-    And I configure usage of Airbrake
+    And I run `rails generate airbrake -k myapikey`
     When I configure the notifier to use the following configuration lines:
       """
-      config.api_key = "myapikey"
-      config.params_filters << "secret"
-      """
-    And I define a response for "TestController#index":
-      """
-      session["secret"] = "blue42"
-      raise RuntimeError, "some message"
+      config.logger = Logger.new STDOUT
       """
-    And I route "/test/index" to "test#index"
-    And I perform a request to "http://example.com:123/test/index?param=value"
-    Then I should receive a Airbrake notification
-    Then I should not see "blue42"
-    And I should see "FILTERED"
-
-  Scenario: Filtering session and params based on Rails parameter filters
-    When I configure the Airbrake shim
-    And I configure usage of Airbrake
     And I configure the application to filter parameter "secret"
     And I define a response for "TestController#index":
       """
-      params["secret"] = "red23"
+      params["secret"]  = "red23"
       session["secret"] = "blue42"
       raise RuntimeError, "some message"
       """
     And I route "/test/index" to "test#index"
-    And I perform a request to "http://example.com:123/test/index?param=value"
+    And I perform a request to "http://example.com:123/test/index" in the "production" environment
     Then I should receive a Airbrake notification
     And I should not see "red23"
     And I should not see "blue42"
@@ -196,7 +148,7 @@ Feature: Install the Gem in a Rails application
 
   Scenario: Notify airbrake within the controller
     When I configure the Airbrake shim
-    And I configure usage of Airbrake
+    And I run `rails generate airbrake -k myapikey`
     And I define a response for "TestController#index":
       """
       session[:value] = "test"
@@ -204,32 +156,35 @@ Feature: Install the Gem in a Rails application
       render :nothing => true
       """
     And I route "/test/index" to "test#index"
-    And I perform a request to "http://example.com:123/test/index?param=value"
+    And I perform a request to "http://example.com:123/test/index?param=value" in the "production" environment
     Then I should receive a Airbrake notification
     And I should see "test"
 
   Scenario: Reporting 404s should be disabled by default
     When I configure the Airbrake shim
-    And I configure usage of Airbrake
-    And I perform a request to "http://example.com:123/this/route/does/not/exist"
+    And I configure the notifier to use the following configuration lines:
+      """
+         config.api_key = "myapikey"
+      """
+    And I perform a request to "http://example.com:123/this/route/does/not/exist" in the "production" environment
     Then I should see "The page you were looking for doesn't exist."
     And I should not receive a Airbrake notification
 
   Scenario: Reporting 404s should work when configured properly
     When I configure the Airbrake shim
-    And I configure usage of Airbrake
+    And I run `rails generate airbrake -k myapikey`
     When I configure the notifier to use the following configuration lines:
       """
       config.ignore_only = []
       """
-    And I perform a request to "http://example.com:123/this/route/does/not/exist"
-    Then I should see "The page you were looking for doesn't exist."
+    And I perform a request to "http://example.com:123/this/route/does/not/exist" in the "production" environment
+    Then I should see "The page you were looking for doesn't exist"
     And I should receive a Airbrake notification
 
+  @wip
   Scenario: reporting over SSL with utf8 check should work
-    Given PENDING I fix this one
     When I configure the Airbrake shim
-    And I configure usage of Airbrake
+    And I run `rails generate airbrake -k myapikey`
     When I configure the notifier to use the following configuration lines:
       """
       config.secure = true
@@ -244,29 +199,53 @@ Feature: Install the Gem in a Rails application
 
   Scenario: It should also send the user details
     When I configure the Airbrake shim
-    And I configure usage of Airbrake
+    And I configure the notifier to use the following configuration lines:
+      """
+         config.api_key = "myapikey"
+         config.logger = Logger.new STDOUT
+      """
     And I define a response for "TestController#index":
       """
       raise RuntimeError, "some message"
       """
     And I route "/test/index" to "test#index"
     And I have set up authentication system in my app that uses "current_user"
-    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 receive a Airbrake notification
     And the Airbrake notification should contain user details
     When I have set up authentication system in my app that uses "current_member"
-    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 receive a Airbrake notification
     And the Airbrake notification should contain user details
 
   Scenario: It should log the notice when failure happens
     When Airbrake server is not responding
-    And I configure usage of Airbrake
+    And I configure the notifier to use the following configuration lines:
+      """
+        config.api_key = "myapikey"
+        config.logger  = Logger.new STDOUT
+      """
     And I define a response for "TestController#index":
       """
       raise RuntimeError, "some message"
       """
     And I route "/test/index" to "test#index"
-    And I perform a request to "http://example.com:123/test/index?param=value"
+    And I perform a request to "http://example.com:123/test/index?param=value" in the "production" environment
     Then I should see "Notice details:"
     And I should see "some message"
+
+  Scenario: It should send the framework info
+    When I configure the Airbrake shim
+    And I configure the notifier to use the following configuration lines:
+    """
+       config.api_key = "myapikey"
+       config.logger  = Logger.new STDOUT
+    """
+    And I define a response for "TestController#index":
+      """
+      raise RuntimeError, "some message"
+      """
+    And I route "/test/index" to "test#index"
+    And I perform a request to "http://example.com:123/test/index" in the "production" environment
+    Then I should receive a Airbrake notification
+    And the Airbrake notification should contain the framework information