test/multiverse/suites/rails/app.rb in newrelic_rpm-3.8.1.221 vs test/multiverse/suites/rails/app.rb in newrelic_rpm-3.9.0.229

@@ -1,80 +1,45 @@
 # 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 'action_controller/railtie'
-require 'active_model'
-
 require 'multiverse_helpers'
-require 'rails/test_help'
+require File.join(File.dirname(__FILE__), 'middlewares')
 
-# We define our single Rails application here, one time, upon the first inclusion
-# Tests should feel free to define their own Controllers locally, but if they
-# need anything special at the Application level, put it here
-if !defined?(MyApp)
+suite_dir = File.expand_path(File.dirname(__FILE__))
 
-  ENV['NEW_RELIC_DISPATCHER'] = 'test'
+if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR > 2
+  require File.join(suite_dir, 'rails3_app', 'app_rails3_plus')
+  class RailsMultiverseTest < ActionDispatch::IntegrationTest; end
+elsif !defined?(RAILS_ROOT)
+  RAILS_ROOT = File.join(suite_dir, 'rails2_app')
+  require File.join(RAILS_ROOT, 'config', 'environment')
+  class RailsMultiverseTest < ActionController::IntegrationTest; end
+end
 
-  class ErrorMiddleware
-    def initialize(app, options={})
-      @app = app
-    end
+# a basic active model compliant model we can render
+class Foo
+  extend ActiveModel::Naming if defined?(ActiveModel::Naming)
 
-    def call(env)
-      path = ::Rack::Request.new(env).path_info
-      raise "middleware error" if path.match(/\/middleware_error\/before/)
-      result = @app.call(env)
-      raise "middleware error" if path.match(/\/middleware_error\/after/)
-      result
-    end
+  def to_model
+    self
   end
 
-  class MyApp < Rails::Application
-    # We need a secret token for session, cookies, etc.
-    config.active_support.deprecation = :log
-    config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
-    config.eager_load = false
-    config.filter_parameters += [:secret]
-    initializer "install_error_middleware" do
-      config.middleware.use ErrorMiddleware
-    end
+  def to_partial_path
+    'foos/foo'
   end
-  MyApp.initialize!
 
-  MyApp.routes.draw do
-    get('/bad_route' => 'test#controller_error',
-        :constraints => lambda do |_|
-          raise ActionController::RoutingError.new('this is an uncaught routing error')
-        end)
-    get '/:controller(/:action(/:id))'
+  def valid?()      true end
+  def new_record?() true end
+  def destroyed?()  true end
+
+  def raise_error
+    raise 'this is an uncaught model error'
   end
 
-  class ApplicationController < ActionController::Base; end
-
-  # a basic active model compliant model we can render
-  class Foo
-    extend ActiveModel::Naming
-    def to_model
-      self
-    end
-
-    def to_partial_path
-      'foos/foo'
-    end
-
-    def valid?()      true end
-    def new_record?() true end
-    def destroyed?()  true end
-
-    def raise_error
-      raise 'this is an uncaught model error'
-    end
-
-    def errors
-      obj = Object.new
-      def obj.[](key)         [] end
-      def obj.full_messages() [] end
-      obj
-    end
+  def errors
+    obj = Object.new
+    def obj.[](key)         [] end
+    def obj.full_messages() [] end
+    obj
   end
 end