appsignal 2.1.0.beta.1 → 2.1.0

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

@@ -1,6 +1,6 @@
 describe Appsignal::Hooks::DelayedJobHook do
   context "with delayed job" do
-    before(:all) do
+    before(:context) do
       module Delayed
         class Plugin
           def self.callbacks
@@ -14,12 +14,16 @@ describe Appsignal::Hooks::DelayedJobHook do
         end
       end
     end
-    after(:all) { Object.send(:remove_const, :Delayed) }
+    after(:context) { Object.send(:remove_const, :Delayed) }
     before do
       start_agent
     end
 
-    its(:dependencies_present?) { should be_true }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
 
     # We haven't found a way to test the hooks, we'll have to do that manually
 
@@ -43,7 +47,7 @@ describe Appsignal::Hooks::DelayedJobHook do
 
       context "with a normal call" do
         it "should wrap in a transaction with the correct params" do
-          Appsignal.should_receive(:monitor_transaction).with(
+          expect(Appsignal).to receive(:monitor_transaction).with(
             "perform_job.delayed_job",
             :class    => "TestClass",
             :method   => "perform",
@@ -78,7 +82,7 @@ describe Appsignal::Hooks::DelayedJobHook do
             }
           end
           it "should wrap in a transaction with the correct params" do
-            Appsignal.should_receive(:monitor_transaction).with(
+            expect(Appsignal).to receive(:monitor_transaction).with(
               "perform_job.delayed_job",
               :class => "CustomClass",
               :method => "perform",
@@ -108,7 +112,7 @@ describe Appsignal::Hooks::DelayedJobHook do
             let(:job) { ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper.new(job_data) }
 
             it "should wrap in a transaction with the correct params" do
-              Appsignal.should_receive(:monitor_transaction).with(
+              expect(Appsignal).to receive(:monitor_transaction).with(
                 "perform_job.delayed_job",
                 :class    => "TestClass",
                 :method   => "perform",
@@ -132,24 +136,28 @@ describe Appsignal::Hooks::DelayedJobHook do
 
       context "with an erroring call" do
         it "should add the error to the transaction" do
-          Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
-          Appsignal::Transaction.should_receive(:complete_current!)
+          expect_any_instance_of(Appsignal::Transaction).to receive(:set_error).with(error)
+          expect(Appsignal::Transaction).to receive(:complete_current!)
 
-          invoked_block.stub(:call).and_raise(error)
+          allow(invoked_block).to receive(:call).and_raise(error)
 
-          lambda do
+          expect do
             plugin.invoke_with_instrumentation(job, invoked_block)
-          end.should raise_error(StandardError)
+          end.to raise_error(StandardError)
         end
       end
     end
 
     it "should add the plugin" do
-      ::Delayed::Worker.plugins.should include Appsignal::Hooks::DelayedJobPlugin
+      expect(::Delayed::Worker.plugins).to include Appsignal::Hooks::DelayedJobPlugin
     end
   end
 
   context "without delayed job" 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/mongo_ruby_driver_spec.rb

@@ -3,9 +3,9 @@ describe Appsignal::Hooks::MongoRubyDriverHook do
 
   context "with mongo ruby driver" do
     let(:subscriber) { Appsignal::Hooks::MongoMonitorSubscriber.new }
-    before { Appsignal::Hooks::MongoMonitorSubscriber.stub(:new => subscriber) }
+    before { allow(Appsignal::Hooks::MongoMonitorSubscriber).to receive(:new).and_return(subscriber) }
 
-    before(:all) do
+    before(:context) do
       module Mongo
         module Monitoring
           COMMAND = "command"
@@ -17,12 +17,16 @@ describe Appsignal::Hooks::MongoRubyDriverHook do
         end
       end
     end
-    after(:all) { Object.send(:remove_const, :Mongo) }
+    after(:context) { Object.send(:remove_const, :Mongo) }
 
-    its(:dependencies_present?) { should be_true }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
 
     it "adds a subscriber to Mongo::Monitoring" do
-      Mongo::Monitoring::Global.should receive(:subscribe)
+      expect(Mongo::Monitoring::Global).to receive(:subscribe)
         .with("command", subscriber)
         .at_least(:once)
 
@@ -31,6 +35,10 @@ describe Appsignal::Hooks::MongoRubyDriverHook do
   end
 
   context "without mongo ruby driver" 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/net_http_spec.rb

@@ -1,10 +1,14 @@
 describe Appsignal::Hooks::NetHttpHook do
-  before :all do
+  before :context do
     start_agent
   end
 
   context "with Net::HTTP instrumentation enabled" do
-    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 a http request" do
       Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
@@ -40,6 +44,10 @@ describe Appsignal::Hooks::NetHttpHook do
     before { Appsignal.config.config_hash[:instrument_net_http] = false }
     after { Appsignal.config.config_hash[:instrument_net_http] = true }
 
-    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/passenger_spec.rb

@@ -1,22 +1,30 @@
 describe Appsignal::Hooks::PassengerHook do
   context "with passenger" do
-    before(:all) do
+    before(:context) do
       module PhusionPassenger
       end
     end
-    after(:all) { Object.send(:remove_const, :PhusionPassenger) }
+    after(:context) { Object.send(:remove_const, :PhusionPassenger) }
 
-    its(:dependencies_present?) { should be_true }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
 
     it "adds behavior to stopping_worker_process and starting_worker_process" do
-      PhusionPassenger.should_receive(:on_event).with(:starting_worker_process)
-      PhusionPassenger.should_receive(:on_event).with(:stopping_worker_process)
+      expect(PhusionPassenger).to receive(:on_event).with(:starting_worker_process)
+      expect(PhusionPassenger).to receive(:on_event).with(:stopping_worker_process)
 
       Appsignal::Hooks::PassengerHook.new.install
     end
   end
 
   context "without passenger" 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/puma_spec.rb

@@ -1,6 +1,6 @@
 describe Appsignal::Hooks::PumaHook do
   context "with puma" do
-    before(:all) do
+    before(:context) do
       class Puma
         def self.cli_config
           @cli_config ||= CliConfig.new
@@ -20,9 +20,13 @@ describe Appsignal::Hooks::PumaHook do
         end
       end
     end
-    after(:all) { Object.send(:remove_const, :Puma) }
+    after(:context) { Object.send(:remove_const, :Puma) }
 
-    its(:dependencies_present?) { should be_true }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
 
     context "when installed" do
       before do
@@ -32,8 +36,8 @@ describe Appsignal::Hooks::PumaHook do
       it "adds behavior to Unicorn::Worker#close" do
         cluster = Puma::Cluster.new
 
-        Appsignal.should_receive(:stop)
-        cluster.should_receive(:stop_workers_without_appsignal)
+        expect(Appsignal).to receive(:stop)
+        expect(cluster).to receive(:stop_workers_without_appsignal)
 
         cluster.stop_workers
       end
@@ -47,8 +51,8 @@ describe Appsignal::Hooks::PumaHook do
       end
 
       it "should add a before shutdown worker callback" do
-        Puma.cli_config.options[:before_worker_boot].first.should be_a(Proc)
-        Puma.cli_config.options[:before_worker_shutdown].first.should be_a(Proc)
+        expect(Puma.cli_config.options[:before_worker_boot].first).to be_a(Proc)
+        expect(Puma.cli_config.options[:before_worker_shutdown].first).to be_a(Proc)
       end
     end
 
@@ -60,13 +64,17 @@ describe Appsignal::Hooks::PumaHook do
       end
 
       it "should add a before shutdown worker callback" do
-        Puma.cli_config.options[:before_worker_boot].first.should be_a(Proc)
-        Puma.cli_config.options[:before_worker_shutdown].first.should be_a(Proc)
+        expect(Puma.cli_config.options[:before_worker_boot].first).to be_a(Proc)
+        expect(Puma.cli_config.options[:before_worker_shutdown].first).to be_a(Proc)
       end
     end
   end
 
   context "without puma" 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/rake_spec.rb

@@ -2,9 +2,9 @@ require "rake"
 
 describe Appsignal::Hooks::RakeHook do
   let(:task) { Rake::Task.new("task:name", Rake::Application.new) }
-  before(:all) do
+  before(:context) do
     Appsignal.config = project_fixture_config
-    expect(Appsignal.active?).to be_true
+    expect(Appsignal.active?).to be_truthy
     Appsignal::Hooks.load_hooks
   end
 

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

@@ -1,55 +1,65 @@
 describe Appsignal::Hooks::RedisHook do
-  before :all do
+  before :context do
     start_agent
   end
 
   context "with redis" do
-    context "with redis" do
-      before :all do
-        class Redis
-          class Client
-            def process(_commands)
-              1
-            end
+    before :context do
+      class Redis
+        class Client
+          def process(_commands)
+            1
           end
-          VERSION = "1.0"
         end
+        VERSION = "1.0"
       end
+    end
 
-      context "and redis instrumentation enabled" do
-        before :all do
-          Appsignal.config.config_hash[:instrument_redis] = true
-          Appsignal::Hooks::RedisHook.new.install
-        end
-        after(:all) { Object.send(:remove_const, :Redis) }
+    context "with instrumentation enabled" do
+      before :context do
+        Appsignal.config.config_hash[:instrument_redis] = true
+        Appsignal::Hooks::RedisHook.new.install
+      end
+      after(:context) { Object.send(:remove_const, :Redis) }
 
-        its(:dependencies_present?) { should be_true }
+      describe "#dependencies_present?" do
+        subject { described_class.new.dependencies_present? }
 
-        it "should instrument a redis call" do
-          Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
-          expect(Appsignal::Transaction.current).to receive(:start_event)
-            .at_least(:once)
-          expect(Appsignal::Transaction.current).to receive(:finish_event)
-            .at_least(:once)
-            .with("query.redis", nil, nil, 0)
+        it { is_expected.to be_truthy }
+      end
 
-          client = Redis::Client.new
+      it "should instrument a redis call" do
+        Appsignal::Transaction.create("uuid", Appsignal::Transaction::HTTP_REQUEST, "test")
+        expect(Appsignal::Transaction.current).to receive(:start_event)
+          .at_least(:once)
+        expect(Appsignal::Transaction.current).to receive(:finish_event)
+          .at_least(:once)
+          .with("query.redis", nil, nil, 0)
 
-          client.process([]).should eq 1
-        end
+        client = Redis::Client.new
+
+        expect(client.process([])).to eq 1
       end
     end
 
-    context "and redis instrumentation disabled" do
-      before :all do
+    context "with instrumentation disabled" do
+      before :context do
         Appsignal.config.config_hash[:instrument_net_http] = false
       end
 
-      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
 
   context "without redis" 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/sequel_spec.rb

@@ -2,11 +2,15 @@ describe Appsignal::Hooks::SequelHook do
   if DependencyHelper.sequel_present?
     let(:db) { Sequel.sqlite }
 
-    before :all do
+    before :context do
       start_agent
     end
 
-    its(:dependencies_present?) { should be_true }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
 
     context "with a transaction" do
       let(:transaction) { Appsignal::Transaction.current }
@@ -27,6 +31,10 @@ describe Appsignal::Hooks::SequelHook do
       end
     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/shoryuken_spec.rb

@@ -7,7 +7,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
   let(:body) { {} }
 
   before do
-    Appsignal::Transaction.stub(:current => current_transaction)
+    allow(Appsignal::Transaction).to receive(:current).and_return(current_transaction)
     start_agent
   end
 
@@ -24,7 +24,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
     end
 
     it "should wrap in a transaction with the correct params" do
-      Appsignal.should_receive(:monitor_transaction).with(
+      expect(Appsignal).to receive(:monitor_transaction).with(
         "perform_job.shoryuken",
         :class => "TestClass",
         :method => "perform",
@@ -50,7 +50,7 @@ describe Appsignal::Hooks::ShoryukenMiddleware do
     let(:error) { VerySpecificError.new }
 
     it "should add the exception to appsignal" do
-      Appsignal::Transaction.any_instance.should_receive(:set_error).with(error)
+      expect_any_instance_of(Appsignal::Transaction).to receive(:set_error).with(error)
     end
 
     after do
@@ -68,7 +68,7 @@ end
 
 describe Appsignal::Hooks::ShoryukenHook do
   context "with shoryuken" do
-    before(:all) do
+    before(:context) do
       module Shoryuken
         def self.configure_server
         end
@@ -76,14 +76,22 @@ describe Appsignal::Hooks::ShoryukenHook do
       Appsignal::Hooks::ShoryukenHook.new.install
     end
 
-    after(:all) do
+    after(:context) do
       Object.send(:remove_const, :Shoryuken)
     end
 
-    its(:dependencies_present?) { should be_true }
+    describe "#dependencies_present?" do
+      subject { described_class.new.dependencies_present? }
+
+      it { is_expected.to be_truthy }
+    end
   end
 
   context "without shoryuken" 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