appsignal 1.4.0.alpha.2 → 1.4.0.beta.1

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

@@ -1,11 +1,4 @@
-require 'spec_helper'
-
-begin
-  require 'padrino'
-rescue LoadError
-end
-
-if padrino_present?
+if DependencyHelper.padrino_present?
   describe "Padrino integration"   do
     require File.expand_path('lib/appsignal/integrations/padrino.rb')
 
@@ -100,7 +93,7 @@ if padrino_present?
           end
 
           it "should not instrument the request" do
-            expect( ActiveSupport::Notifications ).to_not receive(:instrument)
+            expect( Appsignal ).to_not receive(:instrument)
           end
 
           after { router.route!(base) }
@@ -114,7 +107,7 @@ if padrino_present?
           end
 
           it "should not instrument the request" do
-            expect( ActiveSupport::Notifications ).to_not receive(:instrument)
+            expect( Appsignal ).to_not receive(:instrument)
           end
 
           after { router.route!(base) }
@@ -146,7 +139,7 @@ if padrino_present?
             end
 
             it "should instrument the action" do
-              expect( ActiveSupport::Notifications ).to receive(:instrument).with('process_action.padrino')
+              expect( Appsignal ).to receive(:instrument).with('process_action.padrino')
             end
 
             it "should set metadata" do

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-if rails_present?
+if DependencyHelper.rails_present?
   describe Appsignal::Integrations::Railtie do
     context "after initializing the app" do
       it "should call initialize_appsignal" do

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

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-if resque_present? && active_job_present?
+if DependencyHelper.resque_present? && DependencyHelper.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,6 +1,4 @@
-require 'spec_helper'
-
-if resque_present?
+if DependencyHelper.resque_present?
   describe "Resque integration" do
     let(:file) { File.expand_path('lib/appsignal/integrations/resque.rb') }
 
@@ -20,7 +18,7 @@ if resque_present?
           extend Appsignal::Integrations::ResquePlugin
 
           def self.perform
-            raise VerySpecificError.new('broken')
+            raise VerySpecificError.new
           end
         end
       end

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

@@ -1,20 +1,45 @@
-require 'spec_helper'
-
-if sinatra_present? && !padrino_present?
+if DependencyHelper.sinatra_present?
   ENV['APPSIGNAL_PUSH_API_KEY'] = 'key'
   require 'appsignal/integrations/sinatra'
 
   describe "Sinatra integration" do
-    context "logger" do
+    context "Appsignal.logger" do
       subject { Appsignal.logger }
 
       it { should be_a Logger }
     end
 
-    it "should have added the instrumentation middleware" do
-      Sinatra::Base.middleware.to_a.should include(
-        [Appsignal::Rack::SinatraBaseInstrumentation, [], nil]
-      )
+    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
     end
   end
 end

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

@@ -1,20 +1,15 @@
-require 'spec_helper'
-if webmachine_present?
-
+if DependencyHelper.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
@@ -49,7 +44,7 @@ if webmachine_present?
       end
 
       it "should instrument the original method" do
-        expect( ActiveSupport::Notifications ).to receive(:instrument).with('process_action.webmachine')
+        expect( Appsignal ).to receive(:instrument).with('process_action.webmachine')
       end
 
       it "should close the transaction" do
@@ -59,20 +54,16 @@ if webmachine_present?
       after { fsm.run }
     end
 
-    describe "handle_exceptions_with_appsignal" do
-      let(:error) { VerySpecificError.new('error') }
+    describe "#handle_exceptions_with_appsignal" do
+      let(:error) { VerySpecificError.new }
 
       it "should catch the error and send it to AppSignal" do
         expect( Appsignal ).to receive(:set_error).with(error)
       end
 
       after do
-        begin
-          fsm.send(:handle_exceptions) { raise error };
-        rescue VerySpecificError
-        end
+        fsm.send(:handle_exceptions) { raise error }
       end
     end
-
   end
 end

data/spec/lib/appsignal/js_exception_transaction_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::JSExceptionTransaction do
   before { SecureRandom.stub(:uuid => '123abc') }
 
@@ -23,7 +21,7 @@ describe Appsignal::JSExceptionTransaction do
 
   describe "#initialize" do
     it "should call all required methods" do
-      expect( Appsignal::Extension ).to receive(:start_transaction).with('123abc', 'frontend').and_return(1)
+      expect( Appsignal::Extension ).to receive(:start_transaction).with('123abc', 'frontend', 0).and_return(1)
 
       expect( transaction ).to receive(:set_action)
       expect( transaction ).to receive(:set_metadata)
@@ -62,7 +60,7 @@ describe Appsignal::JSExceptionTransaction do
      expect( transaction.ext ).to receive(:set_error).with(
        'TypeError',
        'foo is not a valid method',
-       "[\"foo.bar/js:11:1\",\"foo.bar/js:22:2\"]"
+       Appsignal::Utils.data_generate(['foo.bar/js:11:1', 'foo.bar/js:22:2'])
      )
 
      transaction.set_error
@@ -73,7 +71,7 @@ describe Appsignal::JSExceptionTransaction do
    it "should call `Appsignal::Extension.set_transaction_error_data`" do
      expect( transaction.ext ).to receive(:set_sample_data).with(
       'tags',
-      '["tag1"]'
+      Appsignal::Utils.data_generate(['tag1'])
      )
 
      transaction.set_sample_data

data/spec/lib/appsignal/marker_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
 describe Appsignal::Marker do
   let(:config) { project_fixture_config }
-  let(:marker) {
-    Appsignal::Marker.new(
+  let(:marker) do
+    described_class.new(
       {
         :revision => '503ce0923ed177a3ce000005',
         :repository => 'master',
@@ -12,57 +10,46 @@ describe Appsignal::Marker do
       },
       config
     )
-  }
-  let(:out_stream) { StringIO.new }
-  before do
-    @original_stdout = $stdout
-    $stdout = out_stream
   end
-  after do
-    $stdout = @original_stdout
+  let(:out_stream) { StringIO.new }
+  around do |example|
+    capture_stdout(out_stream) { example.run }
   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'
-      )
-
-      marker.transmit
+  describe "#transmit" do
+    def stub_marker_request
+      stub_api_request config, "markers", marker.marker_data
     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!')
+    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
     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!'
-      )
+    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
     end
   end
 end

data/spec/lib/appsignal/minutely_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Minutely do
   before do
     Appsignal::Minutely.probes.clear

data/spec/lib/appsignal/rack/generic_instrumentation_spec.rb

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

data/spec/lib/appsignal/rack/js_exception_catcher_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Appsignal::Rack::JSExceptionCatcher do
   let(:app)            { double(:call => true) }
   let(:options)        { double }

data/spec/lib/appsignal/rack/rails_instrumentation_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-class MockController
-end
+if DependencyHelper.rails_present?
+  class MockController
+  end
 
-if defined?(::Rails)
   describe Appsignal::Rack::RailsInstrumentation do
     before :all do
       start_agent

data/spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb

@@ -1,12 +1,6 @@
-require 'spec_helper'
-
-begin
-  require 'sinatra'
+if DependencyHelper.sinatra_present?
   require 'appsignal/integrations/sinatra'
-rescue LoadError
-end
 
-if defined?(::Sinatra)
   describe Appsignal::Rack::SinatraInstrumentation do
     let(:settings) { double(:raise_errors => false) }
     let(:app) { double(:call => true, :settings => settings) }
@@ -47,6 +41,40 @@ if defined?(::Sinatra)
     let(:options) { {} }
     let(:middleware) { Appsignal::Rack::SinatraBaseInstrumentation.new(app, options) }
 
+    describe "#initialize" do
+      context "with no settings method in the Sinatra app" do
+        let(:app) { double(:call => true) }
+
+        it "should not raise errors" do
+          expect( middleware.raise_errors_on ).to be(false)
+        end
+      end
+
+      context "with no raise_errors setting in the Sinatra app" do
+        let(:app) { double(:call => true, :settings => double) }
+
+        it "should not raise errors" do
+          expect( middleware.raise_errors_on ).to be(false)
+        end
+      end
+
+      context "with raise_errors turned off in the Sinatra app" do
+        let(:app) { double(:call => true, :settings => double(:raise_errors => false)) }
+
+        it "should raise errors" do
+          expect( middleware.raise_errors_on ).to be(false)
+        end
+      end
+
+      context "with raise_errors turned on in the Sinatra app" do
+        let(:app) { double(:call => true, :settings => double(:raise_errors => true)) }
+
+        it "should raise errors" do
+          expect( middleware.raise_errors_on ).to be(true)
+        end
+      end
+    end
+
     describe "#call" do
       before do
         middleware.stub(:raw_payload => {})
@@ -133,11 +161,11 @@ if defined?(::Sinatra)
           Appsignal::Transaction.any_instance.should_receive(:set_action).with('GET /')
         end
 
-        context "with option to set path a mounted_at prefix" do
-          let(:options) {{ :mounted_at  => "/api/v2" }}
+        context "without 'sinatra.route' env" do
+          let(:env) { {:path => '/', :method => 'GET'} }
 
-          it "should call set_action with a prefix path" do
-            Appsignal::Transaction.any_instance.should_receive(:set_action).with("GET /api/v2/")
+          it "returns nil" do
+            Appsignal::Transaction.any_instance.should_receive(:set_action).with(nil)
           end
         end
 
@@ -147,6 +175,14 @@ if defined?(::Sinatra)
           it "should call set_action with an application prefix path" do
             Appsignal::Transaction.any_instance.should_receive(:set_action).with("GET /api/")
           end
+
+          context "without 'sinatra.route' env" do
+            let(:env) { {:path => '/', :method => 'GET'} }
+
+            it "returns nil" do
+              Appsignal::Transaction.any_instance.should_receive(:set_action).with(nil)
+            end
+          end
         end
       end
 

data/spec/lib/appsignal/rack/streaming_listener_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'appsignal/rack/streaming_listener'
 
 describe Appsignal::Rack::StreamingListener do
@@ -60,7 +59,7 @@ describe Appsignal::Rack::StreamingListener do
     end
 
     it "should instrument the call" do
-      expect( ActiveSupport::Notifications ).to receive(:instrument)
+      expect( Appsignal ).to receive(:instrument)
         .with('process_action.rack')
         .and_yield
 
@@ -68,7 +67,7 @@ describe Appsignal::Rack::StreamingListener do
     end
 
     it "should add `appsignal.action` to the transaction" do
-      allow( ActiveSupport::Notifications ).to receive(:instrument).and_yield
+      allow( Appsignal ).to receive(:instrument).and_yield
 
       env['appsignal.action'] = 'Action'
 
@@ -78,7 +77,7 @@ describe Appsignal::Rack::StreamingListener do
     end
 
     it "should add the path, method and queue start to the transaction" do
-      allow( ActiveSupport::Notifications ).to receive(:instrument).and_yield
+      allow( Appsignal ).to receive(:instrument).and_yield
 
       expect( transaction ).to receive(:set_metadata).with('path', '/homepage')
       expect( transaction ).to receive(:set_metadata).with('method', 'GET')
@@ -89,7 +88,7 @@ describe Appsignal::Rack::StreamingListener do
 
     context "with an exception in the instrumentation call" do
       it "should add the exception to the transaction" do
-        allow( app ).to receive(:call).and_raise(VerySpecificError.new('broken'))
+        allow( app ).to receive(:call).and_raise(VerySpecificError.new)
 
         expect( transaction ).to receive(:set_error)
 
@@ -124,7 +123,7 @@ describe Appsignal::StreamWrapper do
     context "when each raises an error" do
       it "should add the exception to the transaction" do
         allow( stream ).to receive(:each)
-          .and_raise(VerySpecificError.new('broken'))
+          .and_raise(VerySpecificError.new)
 
         expect( transaction ).to receive(:set_error)
 
@@ -144,7 +143,7 @@ describe Appsignal::StreamWrapper do
     context "when each raises an error" do
       it "should add the exception to the transaction and close it" do
         allow( stream ).to receive(:close)
-          .and_raise(VerySpecificError.new('broken'))
+          .and_raise(VerySpecificError.new)
 
         expect( transaction ).to receive(:set_error)
         expect( Appsignal::Transaction ).to receive(:complete_current!)