appsignal 2.1.0.beta.1 → 2.1.0

data/spec/lib/appsignal/demo_spec.rb

@@ -11,7 +11,7 @@ describe Appsignal::Demo do
 
     context "without config" do
       it "returns false" do
-        expect(silence { subject }).to be_false
+        expect(silence { subject }).to be_falsy
       end
     end
 
@@ -20,7 +20,7 @@ describe Appsignal::Demo do
       before { Appsignal.config = config }
 
       it "returns true" do
-        expect(subject).to be_true
+        expect(subject).to be_truthy
       end
 
       it "creates demonstration samples" do
@@ -50,6 +50,7 @@ describe Appsignal::Demo do
       expect(error_transaction).to receive(:set_metadata).with("path", "/hello")
       expect(error_transaction).to receive(:set_metadata).with("method", "GET")
       expect(error_transaction).to receive(:set_metadata).with("demo_sample", "true")
+      expect(error_transaction).to receive(:complete)
       subject
     end
   end
@@ -79,6 +80,7 @@ describe Appsignal::Demo do
       expect(performance_transaction).to receive(:set_metadata).with("path", "/hello")
       expect(performance_transaction).to receive(:set_metadata).with("method", "GET")
       expect(performance_transaction).to receive(:set_metadata).with("demo_sample", "true")
+      expect(performance_transaction).to receive(:complete)
       subject
     end
   end

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

@@ -2,17 +2,21 @@ if DependencyHelper.rails_present?
   require "action_view"
 
   describe Appsignal::EventFormatter::ActionView::RenderFormatter do
-    before { Rails.root.stub(:to_s => "/var/www/app/20130101") }
+    before { allow(Rails.root).to receive(:to_s).and_return("/var/www/app/20130101") }
     let(:klass) { Appsignal::EventFormatter::ActionView::RenderFormatter }
     let(:formatter) { klass.new }
 
     it "should register render_partial.action_view and render_template.action_view" do
-      Appsignal::EventFormatter.registered?("render_partial.action_view", klass).should be_true
-      Appsignal::EventFormatter.registered?("render_template.action_view", klass).should be_true
+      expect(Appsignal::EventFormatter.registered?("render_partial.action_view", klass)).to be_truthy
+      expect(Appsignal::EventFormatter.registered?("render_template.action_view", klass)).to be_truthy
     end
 
     describe "#root_path" do
-      its(:root_path) { should eq "/var/www/app/20130101/" }
+      subject { formatter.root_path }
+
+      it "returns Rails root path" do
+        is_expected.to eq "/var/www/app/20130101/"
+      end
     end
 
     describe "#format" do
@@ -21,19 +25,19 @@ if DependencyHelper.rails_present?
       context "with an identifier" do
         let(:payload) { { :identifier => "/var/www/app/20130101/app/views/home/index/html.erb" } }
 
-        it { should eq ["app/views/home/index/html.erb", nil] }
+        it { is_expected.to eq ["app/views/home/index/html.erb", nil] }
       end
 
       context "with a frozen identifier" do
         let(:payload) { { :identifier => "/var/www/app/20130101/app/views/home/index/html.erb".freeze } }
 
-        it { should eq ["app/views/home/index/html.erb", nil] }
+        it { is_expected.to eq ["app/views/home/index/html.erb", nil] }
       end
 
       context "without an identifier" do
         let(:payload) { {} }
 
-        it { should be_nil }
+        it { is_expected.to be_nil }
       end
     end
   end

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

@@ -3,7 +3,7 @@ describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
   let(:formatter) { klass.new }
 
   it "should register instantiation.active_record" do
-    Appsignal::EventFormatter.registered?("instantiation.active_record", klass).should be_true
+    expect(Appsignal::EventFormatter.registered?("instantiation.active_record", klass)).to be_truthy
   end
 
   describe "#format" do
@@ -16,6 +16,6 @@ describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
 
     subject { formatter.format(payload) }
 
-    it { should eq ["User", nil] }
+    it { is_expected.to eq ["User", nil] }
   end
 end

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

@@ -3,7 +3,7 @@ describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
   let(:formatter) { klass.new }
 
   it "should register sql.active_record" do
-    Appsignal::EventFormatter.registered?("sql.active_record", klass).should be_true
+    expect(Appsignal::EventFormatter.registered?("sql.active_record", klass)).to be_truthy
   end
 
   describe "#format" do
@@ -16,6 +16,6 @@ describe Appsignal::EventFormatter::ActiveRecord::InstantiationFormatter do
 
     subject { formatter.format(payload) }
 
-    it { should eq ["User load", "SELECT * FROM users", 1] }
+    it { is_expected.to eq ["User load", "SELECT * FROM users", 1] }
   end
 end

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

@@ -5,7 +5,7 @@ describe Appsignal::EventFormatter::ElasticSearch::SearchFormatter do
   it "should register query.moped" do
     expect(
       Appsignal::EventFormatter.registered?("search.elasticsearch", klass)
-    ).to be_true
+    ).to be_truthy
   end
 
   describe "#format" do

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

@@ -3,7 +3,7 @@ describe Appsignal::EventFormatter::Faraday::RequestFormatter do
   let(:formatter) { klass.new }
 
   it "should register request.faraday" do
-    Appsignal::EventFormatter.registered?("request.faraday", klass).should be_true
+    expect(Appsignal::EventFormatter.registered?("request.faraday", klass)).to be_truthy
   end
 
   describe "#format" do
@@ -16,6 +16,6 @@ describe Appsignal::EventFormatter::Faraday::RequestFormatter do
 
     subject { formatter.format(payload) }
 
-    it { should eq ["GET http://example.org", "GET http://example.org/hello/world"] }
+    it { is_expected.to eq ["GET http://example.org", "GET http://example.org/hello/world"] }
   end
 end

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

@@ -3,7 +3,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
   let(:formatter) { klass.new }
 
   it "should register query.moped" do
-    Appsignal::EventFormatter.registered?("query.moped", klass).should be_true
+    expect(Appsignal::EventFormatter.registered?("query.moped", klass)).to be_truthy
   end
 
   describe "#format" do
@@ -13,7 +13,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
     context "without ops in the payload" do
       let(:payload) { {} }
 
-      it { should be_nil }
+      it { is_expected.to be_nil }
     end
 
     context "Moped::Protocol::Command" do
@@ -25,7 +25,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should eq ["Command", '{:database=>"database.collection", :selector=>{"query"=>"?"}}'] }
+      it { is_expected.to eq ["Command", '{:database=>"database.collection", :selector=>{"query"=>"?"}}'] }
     end
 
     context "Moped::Protocol::Query" do
@@ -41,7 +41,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should eq ["Query", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[], :limit=>0, :skip=>0, :fields=>nil}'] }
+      it { is_expected.to eq ["Query", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[], :limit=>0, :skip=>0, :fields=>nil}'] }
     end
 
     context "Moped::Protocol::Delete" do
@@ -54,7 +54,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should eq ["Delete", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[]}'] }
+      it { is_expected.to eq ["Delete", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :flags=>[]}'] }
     end
 
     context "Moped::Protocol::Insert" do
@@ -70,7 +70,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should eq ["Insert", '{:database=>"database.collection", :documents=>{"_id"=>"?", "events"=>"?"}, :count=>2, :flags=>[]}'] }
+      it { is_expected.to eq ["Insert", '{:database=>"database.collection", :documents=>{"_id"=>"?", "events"=>"?"}, :count=>2, :flags=>[]}'] }
     end
 
     context "Moped::Protocol::Update" do
@@ -84,7 +84,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should eq ["Update", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :update=>{"user.?"=>"?"}, :flags=>[]}'] }
+      it { is_expected.to eq ["Update", '{:database=>"database.collection", :selector=>{"_id"=>"?"}, :update=>{"user.?"=>"?"}, :flags=>[]}'] }
     end
 
     context "Moped::Protocol::KillCursors" do
@@ -95,7 +95,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should eq ["KillCursors", "{:number_of_cursor_ids=>2}"] }
+      it { is_expected.to eq ["KillCursors", "{:number_of_cursor_ids=>2}"] }
     end
 
     context "Moped::Protocol::Other" do
@@ -106,7 +106,7 @@ describe Appsignal::EventFormatter::Moped::QueryFormatter do
         )
       end
 
-      it { should eq ["Other", '{:database=>"database.collection"}'] }
+      it { is_expected.to eq ["Other", '{:database=>"database.collection"}'] }
     end
   end
 end

data/spec/lib/appsignal/event_formatter_spec.rb

@@ -39,18 +39,18 @@ describe Appsignal::EventFormatter do
 
   context "registering and unregistering formatters" do
     it "should register a formatter" do
-      klass.formatters["mock"].should be_instance_of(MockFormatter)
+      expect(klass.formatters["mock"]).to be_instance_of(MockFormatter)
     end
 
     it "should know wether a formatter is registered" do
-      klass.registered?("mock").should be_true
-      klass.registered?("mock", MockFormatter).should be_true
-      klass.registered?("mock", Hash).should be_false
-      klass.registered?("nonsense").should be_false
+      expect(klass.registered?("mock")).to be_truthy
+      expect(klass.registered?("mock", MockFormatter)).to be_truthy
+      expect(klass.registered?("mock", Hash)).to be_falsy
+      expect(klass.registered?("nonsense")).to be_falsy
     end
 
     it "doesn't register formatters that raise a name error in the initializer" do
-      klass.registered?("mock.dependent").should be_false
+      expect(klass.registered?("mock.dependent")).to be_falsy
     end
 
     it "doesn't register formatters that don't have a format(payload) method" do
@@ -59,42 +59,42 @@ describe Appsignal::EventFormatter do
 
       Appsignal::EventFormatter.initialize_formatters
 
-      klass.registered?("mock.missing_format").should be_false
-      klass.registered?("mock.incorrect_format").should be_false
+      expect(klass.registered?("mock.missing_format")).to be_falsy
+      expect(klass.registered?("mock.incorrect_format")).to be_falsy
     end
 
     it "should register a custom formatter" do
       klass.register("mock.specific", MockFormatter)
       Appsignal::EventFormatter.initialize_formatters
 
-      klass.formatter_classes["mock.specific"].should eq MockFormatter
-      klass.registered?("mock.specific").should be_true
-      klass.formatters["mock.specific"].should be_instance_of(MockFormatter)
-      klass.formatters["mock.specific"].body.should eq "some value"
+      expect(klass.formatter_classes["mock.specific"]).to eq MockFormatter
+      expect(klass.registered?("mock.specific")).to be_truthy
+      expect(klass.formatters["mock.specific"]).to be_instance_of(MockFormatter)
+      expect(klass.formatters["mock.specific"].body).to eq "some value"
     end
 
     it "should not have a formatter that's not registered" do
-      klass.formatters["nonsense"].should be_nil
+      expect(klass.formatters["nonsense"]).to be_nil
     end
 
     it "should unregister a formatter if the registered one has the same class" do
       klass.register("mock.unregister", MockFormatter)
 
       klass.unregister("mock.unregister", Hash)
-      klass.registered?("mock.unregister").should be_true
+      expect(klass.registered?("mock.unregister")).to be_truthy
 
       klass.unregister("mock.unregister", MockFormatter)
-      klass.registered?("mock.unregister").should be_false
+      expect(klass.registered?("mock.unregister")).to be_falsy
     end
   end
 
   context "calling formatters" do
     it "should return nil if there is no formatter registered" do
-      klass.format("nonsense", {}).should be_nil
+      expect(klass.format("nonsense", {})).to be_nil
     end
 
     it "should call the formatter if it is registered and use a value set in the initializer" do
-      klass.format("mock", {}).should eq ["title", "some value"]
+      expect(klass.format("mock", {})).to eq ["title", "some value"]
     end
   end
 end

data/spec/lib/appsignal/extension_spec.rb

@@ -4,21 +4,21 @@ describe "extension loading and operation" do
   describe ".agent_config" do
     subject { Appsignal::Extension.agent_config }
 
-    it { should have_key("version") }
-    it { should have_key("triples") }
+    it { is_expected.to have_key("version") }
+    it { is_expected.to have_key("triples") }
   end
 
   describe ".agent_version" do
     subject { Appsignal::Extension.agent_version }
 
-    it { should_not be_nil }
+    it { is_expected.to_not be_nil }
   end
 
   context "when the extension library can be loaded" do
     subject { Appsignal::Extension }
 
     it "should indicate that the extension is loaded" do
-      Appsignal.extension_loaded?.should be_true
+      expect(Appsignal.extension_loaded?).to be_truthy
     end
 
     it "should have a start and stop method" do
@@ -97,15 +97,15 @@ describe "extension loading and operation" do
   context "when the extension library cannot be loaded" do
     subject { Appsignal::Extension }
 
-    before :all do
+    before :context do
       Appsignal.extension_loaded = false
     end
-    after :all do
+    after :context do
       Appsignal.extension_loaded = true
     end
 
     it "should indicate that the extension is not loaded" do
-      Appsignal.extension_loaded?.should be_false
+      expect(Appsignal.extension_loaded?).to be_falsy
     end
 
     it "should not raise errors when methods are called" do

data/spec/lib/appsignal/garbage_collection_profiler_spec.rb

@@ -1,6 +1,3 @@
-require "spec_helper"
-require_relative "../../support/mocks/fake_gc_profiler"
-
 describe Appsignal::GarbageCollectionProfiler do
   let(:internal_profiler) { FakeGCProfiler.new }
 

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

@@ -1,6 +1,6 @@
 describe Appsignal::Hooks::ActiveSupportNotificationsHook do
   if active_support_present?
-    before :all do
+    before :context do
       start_agent
     end
     before do
@@ -10,7 +10,11 @@ describe Appsignal::Hooks::ActiveSupportNotificationsHook do
     let(:notifier) { ActiveSupport::Notifications::Fanout.new }
     let(:instrumenter) { ActiveSupport::Notifications::Instrumenter.new(notifier) }
 
-    its(:dependencies_present?) { should be_true }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
 
     it "should instrument an AS notifications instrument call with a block" do
       expect(Appsignal::Transaction.current).to receive(:start_event)
@@ -37,6 +41,10 @@ describe Appsignal::Hooks::ActiveSupportNotificationsHook do
       expect(return_value).to eq "value"
     end
   else
-    its(:dependencies_present?) { should be_false }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_falsy }
+    end
   end
 end

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

@@ -1,17 +1,21 @@
 describe Appsignal::Hooks::CelluloidHook do
   context "with celluloid" do
-    before :all do
+    before :context do
       module Celluloid
         def self.shutdown
         end
       end
       Appsignal::Hooks::CelluloidHook.new.install
     end
-    after :all do
+    after :context do
       Object.send(:remove_const, :Celluloid)
     end
 
-    its(:dependencies_present?) { should be_true }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
 
     specify { expect(Appsignal).to receive(:stop) }
     specify { expect(Celluloid).to receive(:shutdown_without_appsignal) }
@@ -22,6 +26,10 @@ describe Appsignal::Hooks::CelluloidHook do
   end
 
   context "without celluloid" do
-    its(:dependencies_present?) { should be_false }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_falsy }
+    end
   end
 end

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

@@ -1,6 +1,6 @@
 describe Appsignal::Hooks::DataMapperHook do
   context "with datamapper" do
-    before :all do
+    before :context do
       module DataMapper
       end
       module DataObjects
@@ -10,12 +10,16 @@ describe Appsignal::Hooks::DataMapperHook do
       Appsignal::Hooks::DataMapperHook.new.install
     end
 
-    after :all do
+    after :context do
       Object.send(:remove_const, :DataMapper)
       Object.send(:remove_const, :DataObjects)
     end
 
-    its(:dependencies_present?) { should be_true }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
 
     it "should install the listener" do
       expect(::DataObjects::Connection).to receive(:include)
@@ -26,6 +30,10 @@ describe Appsignal::Hooks::DataMapperHook do
   end
 
   context "without datamapper" do
-    its(:dependencies_present?) { should be_false }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_falsy }
+    end
   end
 end