appsignal 1.3.6 → 1.4.0.alpha.1

data/spec/lib/appsignal/event_formatter/action_view/render_formatter_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 if rails_present?
   require 'action_view'
 

data/spec/lib/appsignal/event_formatter/active_record/instantiation_formatter_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
   let(:klass)     { Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/active_record/sql_formatter_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
   let(:klass)     { Appsignal::EventFormatter::ActiveRecord::SqlFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/elastic_search/search_formatter_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::EventFormatter::ElasticSearch::SearchFormatter do
   let(:klass)     { Appsignal::EventFormatter::ElasticSearch::SearchFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/faraday/request_formatter_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::EventFormatter::Faraday::RequestFormatter do
   let(:klass)     { Appsignal::EventFormatter::Faraday::RequestFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::EventFormatter::MongoRubyDriver::QueryFormatter do
   let(:formatter) { Appsignal::EventFormatter::MongoRubyDriver::QueryFormatter }
 

data/spec/lib/appsignal/event_formatter/moped/query_formatter_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::EventFormatter::Moped::QueryFormatter do
   let(:klass) { Appsignal::EventFormatter::Moped::QueryFormatter }
   let(:formatter) { klass.new }

data/spec/lib/appsignal/event_formatter_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 class MockFormatter < Appsignal::EventFormatter
   register 'mock'
 

data/spec/lib/appsignal/extension_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'fileutils'
 
 describe "extension loading and operation" do

data/spec/lib/appsignal/hooks/celluloid_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::CelluloidHook do
   context "with celluloid" do
     before :all do

data/spec/lib/appsignal/hooks/data_mapper_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::DataMapperHook do
   context "with datamapper" do
     before :all do

data/spec/lib/appsignal/hooks/delayed_job_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::DelayedJobHook do
   context "with delayed job" do
     before(:all) do

data/spec/lib/appsignal/hooks/mongo_ruby_driver_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::MongoRubyDriverHook do
   require 'appsignal/integrations/mongo_ruby_driver'
 

data/spec/lib/appsignal/hooks/net_http_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::NetHttpHook do
   before :all do
     start_agent

data/spec/lib/appsignal/hooks/passenger_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::PassengerHook do
   context "with passenger" do
     before(:all) do

data/spec/lib/appsignal/hooks/puma_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::PumaHook do
   context "with puma" do
     before(:all) do

data/spec/lib/appsignal/hooks/rake_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'rake'
 
 describe Appsignal::Hooks::RakeHook do

data/spec/lib/appsignal/hooks/redis_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::RedisHook do
   before :all do
     start_agent

data/spec/lib/appsignal/hooks/sequel_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::SequelHook, if: sequel_present? do
   let(:db) { Sequel.sqlite }
 

data/spec/lib/appsignal/hooks/shoryuken_spec.rb

@@ -1,3 +1,6 @@
+require 'spec_helper'
+
+
 describe Appsignal::Hooks::ShoryukenMiddleware do
   let(:current_transaction) { background_job_transaction }
 
@@ -48,7 +51,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
   end
 
   context "with an erroring call" do
-    let(:error) { VerySpecificError.new }
+    let(:error) { VerySpecificError.new('on fire') }
 
     it "should add the exception to appsignal" do
       Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)

data/spec/lib/appsignal/hooks/sidekiq_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::SidekiqPlugin do
   let(:worker) { double }
   let(:queue) { double }
@@ -77,8 +79,7 @@ describe Appsignal::Hooks::SidekiqPlugin do
   end
 
   context "with an erroring call" do
-    let(:error) { VerySpecificError.new }
-
+    let(:error) { VerySpecificError.new('the roof') }
     it "should add the exception to appsignal" do
       Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
     end

data/spec/lib/appsignal/hooks/unicorn_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::Hooks::UnicornHook do
   context "with unicorn" do
     before :all do

data/spec/lib/appsignal/hooks/webmachine_spec.rb

@@ -1,11 +1,17 @@
+require 'spec_helper'
+
 if webmachine_present?
+
   describe Appsignal::Hooks::WebmachineHook do
     context "with webmachine" do
-      let(:fsm) { Webmachine::Decision::FSM.new(double(:trace? => false), double, double) }
-      before(:all) { start_agent }
+      before(:all) do
+        Appsignal::Hooks::WebmachineHook.new.install
+      end
 
       its(:dependencies_present?) { should be_true }
 
+      let(:fsm) { Webmachine::Decision::FSM.new(double(:trace? => false), double, double) }
+
       it "should include the run alias methods" do
         expect( fsm ).to respond_to(:run_with_appsignal)
         expect( fsm ).to respond_to(:run_without_appsignal)

data/spec/lib/appsignal/hooks_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 class MockPresentHook < Appsignal::Hooks::Hook
   def dependencies_present?
     true

data/spec/lib/appsignal/integrations/data_mapper_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'appsignal/integrations/data_mapper'
 
 describe Appsignal::Hooks::DataMapperLogListener do

data/spec/lib/appsignal/integrations/grape_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 if grape_present?
   require 'appsignal/integrations/grape'
 

data/spec/lib/appsignal/integrations/mongo_ruby_driver_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'appsignal/integrations/mongo_ruby_driver'
 describe Appsignal::Hooks::MongoMonitorSubscriber do
   let(:subscriber) { Appsignal::Hooks::MongoMonitorSubscriber.new }

data/spec/lib/appsignal/integrations/object_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'appsignal/integrations/object'
 
 describe Object do
@@ -92,21 +93,6 @@ describe Object do
             expect(instance.foo).to eq(1)
           end
         end
-
-        context "with a method given a block" do
-          let(:klass) do
-            Class.new do
-              def foo
-                yield
-              end
-              appsignal_instrument_method :foo
-            end
-          end
-
-          it "should yield the block" do
-            expect(instance.foo { 42 }).to eq(42)
-          end
-        end
       end
 
       context "when not active" do
@@ -209,21 +195,6 @@ describe Object do
             expect(klass.bar).to eq(2)
           end
         end
-
-        context "with a method given a block" do
-          let(:klass) do
-            Class.new do
-              def self.bar
-                yield
-              end
-              appsignal_instrument_class_method :bar
-            end
-          end
-
-          it "should yield the block" do
-            expect(klass.bar { 42 }).to eq(42)
-          end
-        end
       end
 
       context "when not active" do

data/spec/lib/appsignal/integrations/padrino_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 begin
   require 'padrino'
 rescue LoadError

data/spec/lib/appsignal/integrations/railtie_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 if rails_present?
   describe Appsignal::Integrations::Railtie do
     context "after initializing the app" do

data/spec/lib/appsignal/integrations/resque_active_job_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 if resque_present? && active_job_present?
   describe "Resque ActiveJob integration" do
     let(:file) { File.expand_path('lib/appsignal/integrations/resque_active_job.rb') }

data/spec/lib/appsignal/integrations/resque_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 if resque_present?
   describe "Resque integration" do
     let(:file) { File.expand_path('lib/appsignal/integrations/resque.rb') }
@@ -18,7 +20,7 @@ if resque_present?
           extend Appsignal::Integrations::ResquePlugin
 
           def self.perform
-            raise VerySpecificError.new
+            raise VerySpecificError.new('broken')
           end
         end
       end

data/spec/lib/appsignal/integrations/sinatra_spec.rb

@@ -1,45 +1,20 @@
+require 'spec_helper'
+
 if sinatra_present? && !padrino_present?
   ENV['APPSIGNAL_PUSH_API_KEY'] = 'key'
   require 'appsignal/integrations/sinatra'
 
   describe "Sinatra integration" do
-    context "Appsignal.logger" do
+    context "logger" do
       subject { Appsignal.logger }
 
       it { should be_a Logger }
     end
 
-    describe "middleware" do
-      it "adds the instrumentation middleware to Sinatra::Base" do
-        Sinatra::Base.middleware.to_a.should include(
-          [Appsignal::Rack::SinatraBaseInstrumentation, [], nil]
-        )
-      end
-    end
-
-    describe "environment" do
-      subject { Appsignal.config.env }
-
-      context "without APPSIGNAL_APP_ENV" do
-        before do
-          load File.expand_path('lib/appsignal/integrations/sinatra.rb', project_dir)
-        end
-
-        it "uses the app environment" do
-          expect(subject).to eq('test')
-        end
-      end
-
-      context "with APPSIGNAL_APP_ENV" do
-        before do
-          ENV['APPSIGNAL_APP_ENV'] = 'env-staging'
-          load File.expand_path('lib/appsignal/integrations/sinatra.rb', project_dir)
-        end
-
-        it "uses the environment variable" do
-          expect(subject).to eq('env-staging')
-        end
-      end
+    it "should have added the instrumentation middleware" do
+      Sinatra::Base.middleware.to_a.should include(
+        [Appsignal::Rack::SinatraBaseInstrumentation, [], nil]
+      )
     end
   end
 end

data/spec/lib/appsignal/integrations/webmachine_spec.rb

@@ -1,16 +1,20 @@
+require 'spec_helper'
 if webmachine_present?
 
   require 'appsignal/integrations/webmachine'
 
   describe Appsignal::Integrations::WebmachinePlugin::FSM do
+    before(:all) do
+      Appsignal::Hooks::WebmachineHook.new.install
+    end
     let(:request) do
       Webmachine::Request.new('GET', 'http://google.com:80/foo', {}, nil)
     end
     let(:resource)    { double(:trace? => false, :handle_exception => true) }
     let(:response)    { double }
     let(:transaction) { double(:set_action => true) }
+
     let(:fsm) { Webmachine::Decision::FSM.new(resource, request, response) }
-    before(:all) { start_agent }
 
     # Make sure the request responds to the method we need to get query params.
     describe "request" do
@@ -55,15 +59,18 @@ if webmachine_present?
       after { fsm.run }
     end
 
-    describe "#handle_exceptions_with_appsignal" do
-      let(:error) { VerySpecificError.new }
+    describe "handle_exceptions_with_appsignal" do
+      let(:error) { VerySpecificError.new('error') }
 
       it "should catch the error and send it to AppSignal" do
         expect( Appsignal ).to receive(:set_error).with(error)
       end
 
       after do
-        fsm.send(:handle_exceptions) { raise error }
+        begin
+          fsm.send(:handle_exceptions) { raise error };
+        rescue VerySpecificError
+        end
       end
     end
 

data/spec/lib/appsignal/js_exception_transaction_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe Appsignal::JSExceptionTransaction do
   before { SecureRandom.stub(:uuid => '123abc') }
 

data/spec/lib/appsignal/marker_spec.rb

@@ -1,7 +1,9 @@
+require 'spec_helper'
+
 describe Appsignal::Marker do
   let(:config) { project_fixture_config }
-  let(:marker) do
-    described_class.new(
+  let(:marker) {
+    Appsignal::Marker.new(
       {
         :revision => '503ce0923ed177a3ce000005',
         :repository => 'master',
@@ -10,46 +12,57 @@ describe Appsignal::Marker do
       },
       config
     )
-  end
+  }
   let(:out_stream) { StringIO.new }
-  around do |example|
-    capture_stdout(out_stream) { example.run }
+  before do
+    @original_stdout = $stdout
+    $stdout = out_stream
   end
+  after do
+    $stdout = @original_stdout
+  end
+
+  context "transmit" do
+    let(:transmitter) { double }
+    before do
+      Appsignal::Transmitter.should_receive(:new).with(
+        'markers', config
+      ).and_return(transmitter)
+    end
+
+    it "should transmit data" do
+      transmitter.should_receive(:transmit).with(
+        :revision => '503ce0923ed177a3ce000005',
+        :repository => 'master',
+        :user => 'batman',
+        :rails_env => 'production'
+      )
 
-  describe "#transmit" do
-    def stub_marker_request
-      stub_api_request config, "markers", marker.marker_data
+      marker.transmit
     end
 
-    context "when request is valid" do
-      before do
-        stub_marker_request.to_return(:status => 200)
-        marker.transmit
-      end
-
-      it "outputs success" do
-        output = out_stream.string
-        expect(output).to include \
-          'Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
-          'Appsignal has been notified of this deploy!'
-      end
+    it "should log status 200" do
+      transmitter.should_receive(:transmit).and_return('200')
+
+      marker.transmit
+
+      out_stream.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
+      out_stream.string.should include('Appsignal has been notified of this deploy!')
     end
 
-    context "when request is invalid" do
-      before do
-        stub_marker_request.to_return(:status => 500)
-        marker.transmit
-      end
-
-      it "outputs failure" do
-        output = out_stream.string
-        expect(output).to include \
-          'Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman',
-          "Something went wrong while trying to notify Appsignal: 500 at "\
-          "#{config[:endpoint]}/1/markers"
-        expect(output).to_not include \
-          'Appsignal has been notified of this deploy!'
-      end
+    it "should log other status" do
+      transmitter.should_receive(:transmit).and_return('500')
+      transmitter.should_receive(:uri).and_return('http://localhost:3000/1/markers')
+
+      marker.transmit
+
+      out_stream.string.should include('Notifying Appsignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman')
+      out_stream.string.should include(
+        'Something went wrong while trying to notify Appsignal: 500 at http://localhost:3000/1/markers'
+      )
+      out_stream.string.should_not include(
+        'Appsignal has been notified of this deploy!'
+      )
     end
   end
 end