newrelic_rpm 3.7.3.204 → 3.8.0.218

data/test/environments/rails21/Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 
 gem "rails", "~>2.1.2"
 
+gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem "mocha", :require => false
 gem "jeweler", "1.4.0"

data/test/environments/rails22/Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 
 gem "rails", "~>2.2.3"
 
+gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem "mocha", :require => false
 gem "jeweler", "1.4.0"

data/test/environments/rails23/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem "rails", "~> 2.3.18"
 
+gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
 gem 'rack'

data/test/environments/rails30/Gemfile

@@ -1,12 +1,15 @@
 source 'http://rubygems.org'
 
 gem 'rails', '~>3.0.20'
-gem 'newrelic_rpm', :path => '../../..'
+
+gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
 
+gem 'newrelic_rpm', :path => '../../..'
+
 if (RUBY_PLATFORM == 'java')
   gem "activerecord-jdbcmysql-adapter", '1.2.5'
   gem "activerecord-jdbcsqlite3-adapter", '1.2.5'

data/test/environments/rails31/Gemfile

@@ -1,12 +1,15 @@
 source 'http://rubygems.org'
 
 gem 'rails', '~>3.1.12'
-gem 'newrelic_rpm', :path => '../../..'
+
+gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
 
+gem 'newrelic_rpm', :path => '../../..'
+
 if (RUBY_PLATFORM == 'java')
   gem "activerecord-jdbcmysql-adapter", "~>1.2.9"
   gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"

data/test/environments/rails32/Gemfile

@@ -1,14 +1,15 @@
 source 'http://rubygems.org'
 
-gem 'rake'
-
 gem 'rails', '~>3.2.15'
 
+gem 'rake', '~>10.1.1'
 gem 'minitest', '~>4.7.5'
 gem 'mocha', :require => false
 gem 'rack'
 gem 'rack-test'
 
+gem "newrelic_rpm", :path => "../../.."
+
 platforms :jruby do
   gem "activerecord-jdbcmysql-adapter", "~>1.2.9"
   gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
@@ -19,5 +20,3 @@ platforms :ruby, :rbx do
   gem "mysql", "~>2.9.1"
   gem "sqlite3"
 end
-
-gem "newrelic_rpm", :path => "../../.."

data/test/environments/rails40/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.0.1'
+gem 'rails', '~>4.0.4'
 
 # Do not automatically require minitest, since this will break with rbx-2.2.5.
 # rbx-2.2.5 helpfully bundles minitest-5.3.0.

data/test/environments/rails41/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.1.0.rc1'
+gem 'rails', '~>4.1.0'
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false

data/test/flaky_proxy/lib/flaky_proxy/proxy.rb

@@ -13,6 +13,7 @@ module FlakyProxy
       @rules = RuleSet.build('')
       @rules_path = options[:rules_path]
       @listen_socket = nil
+      reload_rules_file
     end
 
     def service_connection(client_socket)

data/test/multiverse/lib/multiverse/output_collector.rb

@@ -48,8 +48,10 @@ module Multiverse
         output(green("There were no test failures"))
       else
         output(
+          red("*" * 80),
           red("There were failures in #{failing_output.size} test suites"),
-          "Here is their output",
+          red("Here is their output"),
+          red("*" * 80),
           *failing_output)
       end
     end

data/test/multiverse/lib/multiverse/runner.rb

@@ -25,7 +25,8 @@ module Multiverse
     end
 
     # Args without a = are turned into just opts[key] = true
-    # Args with = get split, then assigned as key + value
+    # Args with = get split, then assigned as key + value. Repeats overwrite
+    # Args with name= will tally up rather than overwriting
     # :suite gets ignored
     def parse_args(args)
       opts = {}
@@ -67,14 +68,5 @@ module Multiverse
       OutputCollector.overall_report
       exit exit_status
     end
-
-    # run_one is used to run a suite directly in process
-    # Pipe shenanigans in the typical Suite runner interferes with the debugger
-    def run_one(filter="", opts={})
-      dir = Dir.new(SUITES_DIRECTORY).entries.find { |d| d.include?(filter) }
-      full_path = File.join(SUITES_DIRECTORY, dir)
-      $stderr.reopen($stdout)
-      Suite.new(full_path, opts).execute_child_environment(opts.fetch(:env, "0").to_i)
-    end
   end
 end

data/test/multiverse/lib/multiverse/suite.rb

@@ -7,20 +7,52 @@
 # version of Minitest, which we use throughout, not the one in stdlib on
 # Rubies starting with 1.9.x
 require 'rubygems'
+require 'base64'
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'environment'))
 
 module Multiverse
   class Suite
     include Color
-    attr_accessor :directory, :include_debugger, :seed, :names
+    attr_accessor :directory, :opts
 
     def initialize(directory, opts={})
-      self.directory = directory
-      self.include_debugger = opts.fetch(:run_one, false)
-      self.seed = opts.fetch(:seed, "")
-      self.names = opts.fetch(:names, [])
-      ENV["VERBOSE"] = '1' if opts[:verbose]
+      self.directory  = directory
+      self.opts       = opts
+      ENV["VERBOSE"]  = '1' if opts[:verbose]
+    end
+
+    def self.encode_options(decoded_opts)
+      Base64.encode64(Marshal.dump(decoded_opts)).gsub("\n", "")
+    end
+
+    def self.decode_options(encoded_opts)
+      Marshal.load(Base64.decode64(encoded_opts))
+    end
+
+    def suite
+      File.basename(directory)
+    end
+
+    def seed
+      opts.fetch(:seed, "")
+    end
+
+    def debug
+      opts.fetch(:debug, false)
+    end
+
+    def names
+      opts.fetch(:names, [])
+    end
+
+    def filter_env
+      value = opts.fetch(:env, nil)
+      value = value.to_i if value
+    end
+
+    def filter_file
+      opts.fetch(:file, nil)
     end
 
     def clean_gemfiles(env_index)
@@ -75,13 +107,8 @@ module Multiverse
 
         f.puts "  gem 'mocha', '0.14.0', :require => false"
 
-        # Need to get Rubinius' debugger wired in, but MRI's doesn't work
-        if include_debugger
-          if RUBY_VERSION > '1.8.7'
-            f.puts "  gem 'debugger', :platforms => [:mri]"
-          else
-            f.puts "  gem 'ruby-debug', :platforms => [:mri]"
-          end
+        if debug
+          f.puts "  gem 'pry'"
         end
       end
       puts yellow("Gemfile.#{env_index} set to:") if verbose?
@@ -127,6 +154,7 @@ module Multiverse
 
     def execute_child_environment(env_index)
       with_clean_env do
+        log_test_running_process
         configure_before_bundling
 
         gemfile_text = environments[env_index]
@@ -139,8 +167,12 @@ module Multiverse
       end
     end
 
+    def log_test_running_process
+      puts yellow("Starting tests in child PID #{Process.pid}\n")
+    end
+
     def should_serialize?
-      ENV['SERIALIZE']
+      ENV['SERIALIZE'] || debug
     end
 
     # Load the test suite's environment and execute it.
@@ -156,7 +188,8 @@ module Multiverse
       end
 
       label = should_serialize? ? 'serial' : 'parallel'
-      puts yellow("\nRunning #{directory.inspect} in #{environments.size} environments in #{label}")
+      env_count = filter_env ? 1 : environments.size
+      puts yellow("\nRunning #{directory.inspect} in #{env_count} environments in #{label}")
 
       environments.before.call if environments.before
       if should_serialize?
@@ -168,19 +201,35 @@ module Multiverse
     end
 
     def execute_serial
-      environments.each_with_index do |gemfile_text, i|
-        execute_with_pipe(i)
+      with_each_environment do |_, i|
+        if debug
+          execute_in_foreground(i)
+        else
+          execute_in_background(i)
+        end
       end
     end
 
     def execute_parallel
       threads = []
-      environments.each_with_index do |gemfile_text, i|
-        threads << Thread.new { execute_with_pipe(i) }
+      with_each_environment do |_, i|
+        threads << Thread.new { execute_in_background(i) }
       end
       threads.each {|t| t.join}
     end
 
+    def with_each_environment
+      environments.each_with_index do |gemfile_text, i|
+        next unless should_run_environment?(i)
+        yield gemfile_text, i
+      end
+    end
+
+    def should_run_environment?(index)
+      return true unless filter_env
+      return filter_env == index
+    end
+
     def with_clean_env
       if defined?(Bundler)
         # clear $BUNDLE_GEMFILE and $RUBYOPT so that the ruby subprocess can run
@@ -191,12 +240,19 @@ module Multiverse
       end
     end
 
-    def execute_with_pipe(env)
+    def execute_in_foreground(env)
+      with_clean_env do
+        puts yellow("Running #{suite.inspect} for Envfile entry #{env}\n")
+        system(child_command_line(env))
+        check_for_failure(env)
+      end
+    end
+
+    def execute_in_background(env)
       with_clean_env do
-        suite = File.basename(directory)
-        IO.popen("#{__FILE__} #{directory} #{env} '#{seed}' '#{names.join(",")}'") do |io|
-          OutputCollector.write(suite, env, yellow("Running #{suite.inspect} for Envfile entry #{env}\n"))
-          OutputCollector.write(suite, env, yellow("Starting tests in child PID #{io.pid}\n"))
+        OutputCollector.write(suite, env, yellow("Running #{suite.inspect} for Envfile entry #{env}\n"))
+
+        IO.popen(child_command_line(env)) do |io|
           until io.eof do
             chars = io.read
             OutputCollector.write(suite, env, chars)
@@ -204,11 +260,20 @@ module Multiverse
           OutputCollector.suite_report(suite, env)
         end
 
-        if $? != 0
-          OutputCollector.failed(suite, env)
-        end
-        Multiverse::Runner.notice_exit_status $?
+        check_for_failure(env)
+      end
+    end
+
+    def child_command_line(env)
+      "#{__FILE__} #{directory} #{env} '#{Suite.encode_options(opts)}'"
+    end
+
+    def check_for_failure(env)
+      if $? != 0
+        OutputCollector.write(suite, env, red("#{suite.inspect} for Envfile entry #{env} failed!"))
+        OutputCollector.failed(suite, env)
       end
+      Multiverse::Runner.notice_exit_status $?
     end
 
     def trigger_test_run
@@ -312,6 +377,10 @@ module Multiverse
       files.delete(before)
       files.delete(after)
 
+      # Important that we filter after removing before/after so they don't get
+      # tromped for not matching our pattern!
+      files.select! {|file| file.include?(filter_file) } if filter_file
+
       files.insert(0, before) if before
       files.insert(-1, after) if after
 
@@ -335,7 +404,8 @@ if $0 == __FILE__ && $already_running.nil?
   $stderr.reopen($stdout)
 
   # Ugly, but seralized args passed along to #popen when kicking child off
-  dir, env_index, seed, names, _ = *ARGV
-  suite = Multiverse::Suite.new(dir, {:seed => seed, :names => names.split(",")})
+  dir, env_index, encoded_opts, _ = *ARGV
+  opts = Multiverse::Suite.decode_options(encoded_opts)
+  suite = Multiverse::Suite.new(dir, opts)
   suite.execute_child_environment(env_index.to_i)
 end

data/test/multiverse/suites/activemerchant/Envfile

@@ -0,0 +1,16 @@
+gemfile <<-RB
+  gem 'activemerchant', '~>1.42.7'
+  gem 'rack'
+
+  if RUBY_VERSION <= '1.9.2'
+    # Very special versioning to keep us running on 1.8.7 versions of Ruby
+    gem 'activesupport', '~>2.3.14', :require => 'active_support'
+    gem 'nokogiri', '~>1.4.7'
+  else
+    gem 'activesupport', '~>4.0.4'
+    gem 'nokogiri', '~>1.6.1'
+  end
+
+  # Need to load newrelic_rpm after ActiveMerchant Gateways are required
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+RB

data/test/multiverse/suites/activemerchant/activemerchant_test.rb

@@ -0,0 +1,65 @@
+# 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.
+
+# Let ActiveSupport's auto-loading make sure the testing gateway's there.
+# require complains of redefine on certain Rubies, (looking at you REE)
+ActiveMerchant::Billing::BogusGateway
+
+class ActiveMerchant::Billing::BogusGateway
+  # Testing class doesn't have this, but we instrument it for other gateways
+  def update(*_)
+  end
+end
+
+require 'newrelic_rpm'
+
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper.rb')
+require 'multiverse_helpers'
+
+class ActiveMerchantTest < Minitest::Test
+
+  attr_reader :gateway
+
+  include MultiverseHelpers
+
+  setup_and_teardown_agent do
+    @gateway = ActiveMerchant::Billing::BogusGateway.new
+  end
+
+  # Methods with parameters (money, paysource) can just be added to this list
+  [:authorize, :purchase, :credit, :capture, :recurring, :update].each do |operation|
+    define_method("test_#{operation}") do
+      assert_merchant_transaction(operation)
+    end
+  end
+
+  # Tests for methods that require more specific parameters should go here
+  def test_void
+    assert_merchant_transaction(:void, REFERENCE)
+  end
+
+  def test_store
+    assert_merchant_transaction(:store, PAYSOURCE)
+  end
+
+  def test_unstore
+    assert_merchant_transaction(:unstore, "1")
+  end
+
+  # Helper
+  PAYSOURCE = 1
+  REFERENCE = 3
+
+  def assert_merchant_transaction(operation, *args)
+    in_transaction('txn') do
+      # Default arguments if not provided by test
+      args = [100, PAYSOURCE] if args.empty?
+
+      gateway.send(operation, *args)
+    end
+    assert_metrics_recorded([["ActiveMerchant/gateway/BogusGateway/#{operation}", "txn"],
+                              "ActiveMerchant/gateway/BogusGateway",
+                              "ActiveMerchant/operation/#{operation}"])
+  end
+end