nunes 0.4.0 → 0.5.0

data/test/helper.rb

@@ -8,6 +8,8 @@ require "action_mailer"
 root = Pathname(__FILE__).dirname.join("..").expand_path
 Dir[root.join("test/support/**/*.rb")].each { |f| require f }
 
+puts "Running tests against rails version #{Rails.version}"
+
 class ActionController::TestCase
   include AdapterTestHelpers
 end
@@ -20,6 +22,8 @@ class ActiveSupport::TestCase
   include AdapterTestHelpers
 end
 
-require "rails_app/config/environment"
+rails_version = ENV["RAILS_VERSION"] || "4.2.5"
+
+require "rails_app_#{rails_version}/config/environment"
 
 require "nunes"

data/test/instrumentable_test.rb

@@ -1,7 +1,7 @@
 require "helper"
 
 class InstrumentationTest < ActiveSupport::TestCase
-  attr_reader :thing_class
+  attr_reader :thing_class, :namespaced_thing_class
 
   setup :setup_subscriber, :setup_class
   teardown :teardown_subscriber, :teardown_class
@@ -30,6 +30,17 @@ class InstrumentationTest < ActiveSupport::TestCase
         'Thing'
       end
 
+      def yo(args = {})
+        :dude
+      end
+    }
+    @namespaced_thing_class = Class.new {
+      extend Nunes::Instrumentable
+
+      def self.name
+        'Some::Thing'
+      end
+
       def yo(args = {})
         :dude
       end
@@ -38,6 +49,7 @@ class InstrumentationTest < ActiveSupport::TestCase
 
   def teardown_class
     @thing_class = nil
+    @namespaced_thing_class = nil
   end
 
   test "adds methods when extended" do
@@ -59,7 +71,7 @@ class InstrumentationTest < ActiveSupport::TestCase
 
     assert_not_nil event, "No events were found."
     assert_equal "Thing.yo", event.payload[:metric]
-    assert_in_delta 0, event.duration, 0.1
+    assert event.duration > 0, "Expected #{event.duration} to be greater than 0"
 
     assert_timer "Thing.yo"
   end
@@ -80,7 +92,7 @@ class InstrumentationTest < ActiveSupport::TestCase
 
     assert_not_nil event, "No events were found."
     assert_equal "Thing.find", event.payload[:metric]
-    assert_in_delta 0, event.duration, 0.1
+    assert event.duration > 0, "Expected #{event.duration} to be greater than 0"
 
     assert_timer "Thing.find"
   end
@@ -118,6 +130,18 @@ class InstrumentationTest < ActiveSupport::TestCase
     assert_timer "Thing.yo"
   end
 
+  test "instrument_method_time for namespaced class" do
+    namespaced_thing_class.instrument_method_time :yo
+
+    event = slurp_events { namespaced_thing_class.new.yo(some: 'thing') }.last
+
+    assert_not_nil event, "No events were found."
+    assert_equal "Some-Thing.yo", event.payload[:metric]
+    assert event.duration > 0, "Expected #{event.duration} to be greater than 0"
+
+    assert_timer "Some-Thing.yo"
+  end
+
   def slurp_events(&block)
     events = []
     callback = lambda { |*args| events << ActiveSupport::Notifications::Event.new(*args) }

data/test/job_instrumentation_test.rb

@@ -1,6 +1,8 @@
 require "helper"
 
 class JobInstrumentationTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
   setup :setup_subscriber
   teardown :teardown_subscriber
 
@@ -13,18 +15,19 @@ class JobInstrumentationTest < ActiveSupport::TestCase
   end
 
   test "perform_now" do
-    p = Post.new(title: 'Testing')
-    SpamDetectorJob.perform_now(p)
+    post = Post.new(title: 'Testing')
+    SpamDetectorJob.perform_now(post)
 
-    assert_timer   "active_job.spam_detector_job.perform"
+    assert_timer   "active_job.SpamDetectorJob.perform"
   end
 
   test "perform_later" do
-    p = Post.create!(title: 'Testing')
-    SpamDetectorJob.perform_later(p)
+    post = Post.create!(title: 'Testing')
+    perform_enqueued_jobs do
+      SpamDetectorJob.perform_later(post)
+    end
 
-    assert_timer   "active_job.spam_detector_job.perform"
-    assert_counter "active_job.spam_detector_job.enqueue"
+    assert_counter "active_job.SpamDetectorJob.enqueue"
+    assert_timer   "active_job.SpamDetectorJob.perform"
   end
-
 end

data/test/mailer_instrumentation_test.rb

@@ -1,6 +1,8 @@
 require "helper"
 
 class MailerInstrumentationTest < ActionMailer::TestCase
+  include ActiveJob::TestHelper
+
   tests PostMailer
 
   setup :setup_subscriber
@@ -20,7 +22,9 @@ class MailerInstrumentationTest < ActionMailer::TestCase
   end
 
   test "deliver_later" do
-    PostMailer.created.deliver_later
+    perform_enqueued_jobs do
+      PostMailer.created.deliver_later
+    end
     assert_timer "action_mailer.deliver.PostMailer"
   end
 

data/test/namespaced_controller_instrumentation_test.rb

@@ -19,21 +19,21 @@ class NamespacedControllerInstrumentationTest < ActionController::TestCase
 
     assert_response :success
 
-    assert_timer "action_controller.controller.Admin.PostsController.index.runtime.total"
-    assert_timer "action_controller.controller.Admin.PostsController.index.runtime.view"
-    assert_timer "action_controller.controller.Admin.PostsController.index.runtime.db"
+    assert_timer "action_controller.controller.Admin-PostsController.index.runtime.total"
+    assert_timer "action_controller.controller.Admin-PostsController.index.runtime.view"
+    assert_timer "action_controller.controller.Admin-PostsController.index.runtime.db"
 
     assert_counter "action_controller.format.html"
     assert_counter "action_controller.status.200"
 
-    assert_counter "action_controller.controller.Admin.PostsController.index.format.html"
-    assert_counter "action_controller.controller.Admin.PostsController.index.status.200"
+    assert_counter "action_controller.controller.Admin-PostsController.index.format.html"
+    assert_counter "action_controller.controller.Admin-PostsController.index.status.200"
   end
 
   test "process_action w/ json" do
     get :index, format: :json
 
-    assert_counter "action_controller.controller.Admin.PostsController.index.format.json"
+    assert_counter "action_controller.controller.Admin-PostsController.index.format.json"
   end
 
   test "process_action bad_request" do
@@ -41,6 +41,6 @@ class NamespacedControllerInstrumentationTest < ActionController::TestCase
 
     assert_response :forbidden
 
-    assert_counter "action_controller.controller.Admin.PostsController.new.status.403"
+    assert_counter "action_controller.controller.Admin-PostsController.new.status.403"
   end
 end

data/test/namespaced_job_instrumentation_test.rb

@@ -0,0 +1,33 @@
+require "helper"
+
+class NamespacedJobInstrumentationTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
+  setup :setup_subscriber
+  teardown :teardown_subscriber
+
+  def setup_subscriber
+    @subscriber = Nunes::Subscribers::ActiveJob.subscribe(adapter)
+  end
+
+  def teardown_subscriber
+    ActiveSupport::Notifications.unsubscribe @subscriber if @subscriber
+  end
+
+  test "perform_now" do
+    post = Post.new(title: 'Testing')
+    Spam::DetectorJob.perform_now(post)
+
+    assert_timer   "active_job.Spam-DetectorJob.perform"
+  end
+
+  test "perform_later" do
+    post = Post.create!(title: 'Testing')
+    perform_enqueued_jobs do
+      Spam::DetectorJob.perform_later(post)
+    end
+
+    assert_counter "active_job.Spam-DetectorJob.enqueue"
+    assert_timer   "active_job.Spam-DetectorJob.perform"
+  end
+end

data/test/namespaced_mailer_instrumentation_test.rb

@@ -0,0 +1,35 @@
+require "helper"
+
+class NamespacedMailerInstrumentationTest < ActionMailer::TestCase
+  include ActiveJob::TestHelper
+
+  tests Admin::PostMailer
+
+  setup :setup_subscriber
+  teardown :teardown_subscriber
+
+  def setup_subscriber
+    @subscriber = Nunes::Subscribers::ActionMailer.subscribe(adapter)
+  end
+
+  def teardown_subscriber
+    ActiveSupport::Notifications.unsubscribe @subscriber if @subscriber
+  end
+
+  test "deliver_now" do
+    Admin::PostMailer.created.deliver_now
+    assert_timer "action_mailer.deliver.Admin-PostMailer"
+  end
+
+  test "deliver_later" do
+    perform_enqueued_jobs do
+      Admin::PostMailer.created.deliver_later
+    end
+    assert_timer "action_mailer.deliver.Admin-PostMailer"
+  end
+
+  test "receive" do
+    Admin::PostMailer.receive Admin::PostMailer.created
+    assert_timer "action_mailer.receive.Admin-PostMailer"
+  end
+end

data/test/namespaced_model_instrumentation_test.rb

@@ -0,0 +1,55 @@
+require "helper"
+
+class NamespacedModelInstrumentationTest < ActiveSupport::TestCase
+  setup :setup_subscriber
+  teardown :teardown_subscriber
+
+  def setup_subscriber
+    @subscriber = Nunes::Subscribers::ActiveRecord.subscribe(adapter)
+  end
+
+  def teardown_subscriber
+    ActiveSupport::Notifications.unsubscribe @subscriber if @subscriber
+  end
+
+  test "transaction" do
+    Admin::Post.create(title: 'Testing')
+
+    assert_timer "active_record.sql.transaction_begin"
+    assert_timer "active_record.sql.transaction_commit"
+  end
+
+  test "create" do
+    Admin::Post.create(title: 'Testing')
+
+    assert_timer "active_record.sql"
+    assert_timer "active_record.sql.insert"
+  end
+
+  test "update" do
+    post = Admin::Post.create
+    adapter.clear
+    post.update_attributes(title: "Title")
+
+    assert_timer "active_record.sql"
+    assert_timer "active_record.sql.update"
+  end
+
+  test "find" do
+    post = Admin::Post.create
+    adapter.clear
+    Admin::Post.find(post.id)
+
+    assert_timer "active_record.sql"
+    assert_timer "active_record.sql.select"
+  end
+
+  test "destroy" do
+    post = Admin::Post.create
+    adapter.clear
+    post.destroy
+
+    assert_timer "active_record.sql"
+    assert_timer "active_record.sql.delete"
+  end
+end

data/test/nunes_test.rb

@@ -17,4 +17,12 @@ class NunesTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test "class_to_metric" do
+    assert_equal nil, Nunes.class_to_metric(nil)
+    assert_equal "Foo", Nunes.class_to_metric("Foo")
+    assert_equal "Nunes", Nunes.class_to_metric(Nunes)
+    assert_equal "Spam-DetectorJob", Nunes.class_to_metric(Spam::DetectorJob)
+    assert_equal "Spam-DetectorJob", Nunes.class_to_metric("Spam::DetectorJob")
+  end
 end

data/test/{rails_app → rails_app_4.2.5}/app/controllers/admin/posts_controller.rb

@@ -1,12 +1,7 @@
 class Admin::PostsController < ApplicationController
-  # Use fake post for controller as I don't want active record to mingle here.
-  Post = Struct.new(:title)
-
   def index
-    @posts = [
-      Post.new('First'),
-      Post.new('Second'),
-    ]
+    @posts = Post.all
+
     respond_to do |format|
       format.html { render }
       format.json { render :json => @posts }

data/test/{rails_app → rails_app_4.2.5}/app/controllers/posts_controller.rb

@@ -1,12 +1,6 @@
 class PostsController < ApplicationController
-  # Use fake post for controller as I don't want active record to mingle here.
-  Post = Struct.new(:title)
-
   def index
-    @posts = [
-      Post.new('First'),
-      Post.new('Second'),
-    ]
+    @posts = Post.all
   end
 
   def some_data

data/test/rails_app_4.2.5/app/jobs/spam/detector_job.rb

@@ -0,0 +1,11 @@
+module Spam
+  class DetectorJob < ActiveJob::Base
+    queue_as :default
+
+    def perform(*posts)
+      posts.detect do |post|
+        post.title.include?("Buy watches cheap!")
+      end
+    end
+  end
+end

data/test/rails_app_4.2.5/app/mailers/admin/post_mailer.rb

@@ -0,0 +1,13 @@
+module Admin
+  class PostMailer < ActionMailer::Base
+    default from: "from@example.com"
+
+    def created
+      mail to: "to@example.org"
+    end
+
+    def receive(email)
+      # do something
+    end
+  end
+end

data/test/rails_app_4.2.5/app/models/admin/post.rb

@@ -0,0 +1,5 @@
+module Admin
+  class Post < ActiveRecord::Base
+    self.table_name = "posts"
+  end
+end

data/test/rails_app_4.2.5/app/views/post_mailer/created.text.erb

@@ -0,0 +1 @@
+PostMailer#created.