airbrake 5.4.1 → 5.4.2

data/spec/integration/rails/rails_spec.rb

@@ -8,11 +8,21 @@ RSpec.describe "Rails integration specs" do
 
   include_examples 'rack examples'
 
-  it "inserts the Airbrake Rack middleware after DebugExceptions" do
-    middlewares = Rails.configuration.middleware.middlewares.map(&:inspect)
-    own_idx = middlewares.index('Airbrake::Rack::Middleware')
+  if ::Rails.version.start_with?('5.')
+    it "inserts the Airbrake Rack middleware after DebugExceptions" do
+      middlewares = Rails.configuration.middleware.middlewares.map(&:inspect)
+      own_idx = middlewares.index('Airbrake::Rack::Middleware')
 
-    expect(middlewares[own_idx - 1]).to eq('ActionDispatch::DebugExceptions')
+      expect(middlewares[own_idx - 1]).to eq('ActionDispatch::DebugExceptions')
+    end
+  else
+    it "inserts the Airbrake Rack middleware after ConnectionManagement" do
+      middlewares = Rails.configuration.middleware.middlewares.map(&:inspect)
+      own_idx = middlewares.index('Airbrake::Rack::Middleware')
+
+      expect(middlewares[own_idx - 1]).
+        to eq('ActiveRecord::ConnectionAdapters::ConnectionManagement')
+    end
   end
 
   shared_examples 'context payload content' do |route|

data/spec/integration/sinatra/sinatra_spec.rb

@@ -1,4 +1,6 @@
+require 'sinatra'
 require 'spec_helper'
+require 'apps/sinatra/dummy_app'
 require 'integration/shared_examples/rack_examples'
 
 RSpec.describe "Sinatra integration specs" do

data/spec/spec_helper.rb

@@ -7,11 +7,6 @@ require 'rack'
 require 'rack/test'
 require 'rake'
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0')
-  require 'sidekiq'
-  require 'sidekiq/cli'
-end
-
 require 'airbrake'
 require 'airbrake/rake/tasks'
 
@@ -69,20 +64,11 @@ if ENV['APPRAISAL_INITIALIZED']
     puts '** Skipped Rails specs'
   end
 
-  # Load a Sinatra app or skip.
-  begin
-    # Resque depends on Sinatra, so when we launch Rails specs, we also
-    # accidentally load Sinatra.
-    raise LoadError if defined?(Resque)
-
-    require 'sinatra'
-    require 'apps/sinatra/dummy_app'
-  rescue LoadError
-    puts '** Skipped Sinatra specs'
-  end
-
   # Load a Rack app or skip.
   begin
+    # Don't load the Rack app since we want to test Sinatra if it's loaded.
+    raise LoadError if defined?(Sinatra)
+
     require 'apps/rack/dummy_app'
   rescue LoadError
     puts '** Skipped Rack specs'
@@ -120,7 +106,6 @@ versions = <<EOS
 EOS
 versions << "# JRUBY_VERSION #{JRUBY_VERSION}\n" if defined?(JRUBY_VERSION)
 versions << "# Rails version: #{Rails.version}\n" if defined?(Rails)
-versions << "# Sinatra version: #{Sinatra::VERSION}\n" if defined?(Sinatra)
 versions << "# Rack release: #{Rack.release}\n"
 versions << '#' * 80
 

data/spec/unit/rake/tasks_spec.rb

@@ -36,4 +36,32 @@ RSpec.describe "airbrake/rake/tasks" do
       include_examples 'deploy payload', key, val
     end
   end
+
+  describe "airbrake:install_heroku_deploy_hook" do
+    let(:task) { Rake::Task['airbrake:install_heroku_deploy_hook'] }
+
+    after { task.reenable }
+
+    let(:airbrake_vars) { "AIRBRAKE_PROJECT_ID=1\nAIRBRAKE_API_KEY=2\nRAILS_ENV=3\n" }
+    let(:silenced_stdout) { File.new(File::NULL, 'w') }
+
+    before do
+      @original_stdout = $stdout
+      $stdout = silenced_stdout
+    end
+
+    after do
+      $stdout.close
+      $stdout = @original_stdout
+    end
+
+    describe "parsing environment variables" do
+      it "does not raise when an env variable value contains '='" do
+        heroku_config = airbrake_vars + "URL=https://airbrake.io/docs?key=11\n"
+        expect(Bundler).to receive(:with_clean_env).twice.and_return(heroku_config)
+
+        task.invoke
+      end
+    end
+  end
 end

data/spec/unit/sidekiq/error_handler_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0')
+  require 'sidekiq'
+  require 'sidekiq/cli'
+  require 'airbrake/sidekiq/error_handler'
+
   RSpec.describe "airbrake/sidekiq/error_handler" do
     let(:endpoint) do
       'https://airbrake.io/api/v3/projects/113743/notices?key=fd04e13d806a90f96614ad8e529b2822'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.2
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -187,6 +187,11 @@ files:
 - spec/apps/rack/dummy_app.rb
 - spec/apps/rails/dummy_app.rb
 - spec/apps/rails/dummy_task.rake
+- spec/apps/rails/logs/32.log
+- spec/apps/rails/logs/41.log
+- spec/apps/rails/logs/42.log
+- spec/apps/rails/logs/50.log
+- spec/apps/rails/logs/51.log
 - spec/apps/sinatra/dummy_app.rb
 - spec/integration/rack/rack_spec.rb
 - spec/integration/rails/rails_spec.rb
@@ -229,6 +234,11 @@ test_files:
 - spec/apps/rack/dummy_app.rb
 - spec/apps/rails/dummy_app.rb
 - spec/apps/rails/dummy_task.rake
+- spec/apps/rails/logs/32.log
+- spec/apps/rails/logs/41.log
+- spec/apps/rails/logs/42.log
+- spec/apps/rails/logs/50.log
+- spec/apps/rails/logs/51.log
 - spec/apps/sinatra/dummy_app.rb
 - spec/integration/rack/rack_spec.rb
 - spec/integration/rails/rails_spec.rb
@@ -241,3 +251,4 @@ test_files:
 - spec/unit/rack/user_spec.rb
 - spec/unit/rake/tasks_spec.rb
 - spec/unit/sidekiq/error_handler_spec.rb
+has_rdoc: