newrelic_rpm 3.7.1.188 → 3.7.2.190.beta

data/test/test_helper.rb

@@ -14,6 +14,10 @@ $LOAD_PATH.uniq!
 
 require 'rubygems'
 require 'rake'
+
+require 'minitest/autorun'
+require 'mocha/setup'
+
 Dir.glob('test/helpers/*').each { |f| require f }
 
 Dir.glob(File.join(NEWRELIC_PLUGIN_DIR,'test/helpers/*.rb')).each do |helper|
@@ -29,25 +33,13 @@ if ENV["NO_RAILS"]
 else
   begin
     require 'config/environment'
-  #   require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
-
-    # we need 'rails/test_help' for Rails 4
-    # we need 'test_help' for Rails 2
-    # we need neither for Rails 3
-    begin
-      require 'rails/test_help'
-    rescue LoadError
-      begin
-        require 'test_help'
-      rescue LoadError
-        # ignore load problems on test help - it doesn't exist in rails 3
-      end
-    end
     require 'newrelic_rpm'
   rescue LoadError => e
     puts "Running tests in standalone mode."
+
     require 'bundler'
     Bundler.require
+
     require 'rails/all'
     require 'newrelic_rpm'
 
@@ -63,19 +55,6 @@ else
   end
 end
 
-require 'test/unit'
-begin
-  require 'mocha/setup'
-rescue LoadError
-  require 'mocha'
-end
-
-begin # 1.8.6
-  require 'mocha/integration/test_unit'
-  require 'mocha/integration/test_unit/assertion_counter'
-rescue LoadError
-end
-
 require 'agent_helper'
 
 def default_service(stubbed_method_overrides = {})
@@ -103,18 +82,6 @@ def default_service(stubbed_method_overrides = {})
   service
 end
 
-class Test::Unit::TestCase
-  include Mocha::API
-
-  # we can delete this trick when we stop supporting rails2.0.x
-  if ENV['BRANCH'] != 'rails20'
-    # a hack because rails2.0.2 does not like double teardowns
-    def teardown
-      mocha_teardown
-    end
-  end
-end
-
 def with_verbose_logging
   orig_logger = NewRelic::Agent.logger
   $stderr.puts '', '---', ''

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.7.1.188
-  prerelease: 
+  version: 3.7.2.190.beta
+  prerelease: 10
 platform: ruby
 authors:
 - Jason Clark
@@ -40,7 +40,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -203,21 +203,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.3
 - !ruby/object:Gem::Dependency
-  name: guard-test
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -438,6 +438,7 @@ files:
 - lib/new_relic/delayed_job_injection.rb
 - lib/new_relic/environment_report.rb
 - lib/new_relic/helper.rb
+- lib/new_relic/json_wrapper.rb
 - lib/new_relic/language_support.rb
 - lib/new_relic/latest_changes.rb
 - lib/new_relic/local_environment.rb
@@ -452,6 +453,7 @@ files:
 - lib/new_relic/rack/browser_monitoring.rb
 - lib/new_relic/rack/developer_mode.rb
 - lib/new_relic/rack/error_collector.rb
+- lib/new_relic/rack/transaction_reset.rb
 - lib/new_relic/recipes.rb
 - lib/new_relic/timer_lib.rb
 - lib/new_relic/transaction_analysis.rb
@@ -586,6 +588,7 @@ files:
 - test/multiverse/suites/agent_only/collector_exception_handling_test.rb
 - test/multiverse/suites/agent_only/config/newrelic.yml
 - test/multiverse/suites/agent_only/cross_application_tracing_test.rb
+- test/multiverse/suites/agent_only/encoding_handling_test.rb
 - test/multiverse/suites/agent_only/harvest_timestamps_test.rb
 - test/multiverse/suites/agent_only/http_response_code_test.rb
 - test/multiverse/suites/agent_only/key_transactions_test.rb
@@ -594,6 +597,7 @@ files:
 - test/multiverse/suites/agent_only/pipe_manager_test.rb
 - test/multiverse/suites/agent_only/rename_rule_test.rb
 - test/multiverse/suites/agent_only/rum_instrumentation_test.rb
+- test/multiverse/suites/agent_only/script/loading.rb
 - test/multiverse/suites/agent_only/service_timeout_test.rb
 - test/multiverse/suites/agent_only/set_transaction_name_test.rb
 - test/multiverse/suites/agent_only/ssl_test.rb
@@ -601,6 +605,8 @@ files:
 - test/multiverse/suites/agent_only/testing_app.rb
 - test/multiverse/suites/agent_only/thread_profiling_test.rb
 - test/multiverse/suites/agent_only/xray_sessions_test.rb
+- test/multiverse/suites/bare/Envfile
+- test/multiverse/suites/bare/standalone_instrumentation_test.rb
 - test/multiverse/suites/config_file_loading/Envfile
 - test/multiverse/suites/config_file_loading/config_file_loading_test.rb
 - test/multiverse/suites/curb/Envfile
@@ -794,8 +800,8 @@ files:
 - test/new_relic/fake_external_server.rb
 - test/new_relic/fake_server.rb
 - test/new_relic/framework_test.rb
-- test/new_relic/helper_test.rb
 - test/new_relic/http_client_test_cases.rb
+- test/new_relic/json_wrapper_test.rb
 - test/new_relic/language_support_test.rb
 - test/new_relic/license_test.rb
 - test/new_relic/load_test.rb
@@ -812,6 +818,7 @@ files:
 - test/new_relic/rack/developer_mode_helper_test.rb
 - test/new_relic/rack/developer_mode_test.rb
 - test/new_relic/rack/error_collector_test.rb
+- test/new_relic/rack/transaction_reset_test.rb
 - test/new_relic/transaction_analysis/segment_summary_test.rb
 - test/new_relic/transaction_analysis_test.rb
 - test/new_relic/transaction_sample/composite_segment_test.rb
@@ -981,9 +988,9 @@ post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.7.1 ##\
   \ Historically framework specific code was necessary for the Ruby agent to\n  successfully
   report data after an app forked or daemonized. Gems or scripts\n  with daemonizing
   modes had to wait for agent support or find workarounds.\n\n  With 3.7.1 setting
-  `restart_thread_in_child: true` in your newrelic.yml\n  automatically restarts the
-  agent in child processes without requiring custom\n  code. For now the feature is
-  opt-in, but future releases may default it on.\n\n* Fix for missing HTTP time\n\n
+  `restart_thread_in_children: true` in your newrelic.yml\n  automatically restarts
+  the agent in child processes without requiring custom\n  code. For now the feature
+  is opt-in, but future releases may default it on.\n\n* Fix for missing HTTP time\n\n
   \ The agent previously did not include connection establishment time for\n  outgoing
   Net::HTTP requests. This has been corrected, and reported HTTP\n  timings should
   now be more accurate.\n\n* Fix for Mongo ensure_index instrumentation (3.7.1.182)\n\n

data/test/new_relic/helper_test.rb

@@ -1,32 +0,0 @@
-# encoding: utf-8
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-
-require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
-require 'test/unit'
-require 'newrelic_rpm'
-
-if RUBY_VERSION > '1.8.6'
-
-class HelperTest < Test::Unit::TestCase
-
-  def test_json_serializer_method
-    obj = [
-      99, 'luftballons',
-      {
-        'Hast du etwas' => 'Zeit für mich',
-        'Dann singe ich' => {
-          'ein lied' => 'für dich'
-        }
-      }
-    ]
-    copy = NewRelic.json_load( NewRelic.json_dump(obj) )
-
-    assert( obj == copy )
-  end
-
-end
-
-else
-  puts "Skipping tests in #{__FILE__} because 1.8.6 character encoding is, um, less than stellar"
-end