From e44e7b3a43bbe48d8a3a5594c24dcc7314c78fb8 Mon Sep 17 00:00:00 2001
From: Jon Moss <me@jonathanmoss.me>
Date: Tue, 31 May 2016 10:36:22 -0400
Subject: [PATCH] Remove unnecessary code & cleanup Action View `abstract_unit`

- Remove `active_record` require --> AV does not depend on AR
- Remove `Rails.env` hack
- Remove translations/localization code, appears to not be used
- Remove `with_autoload_path`, appears to not be used
- Move `Workshop` to the test it's being used.
---
 actionview/test/abstract_unit.rb            | 45 ---------------------
 actionview/test/template/url_helper_test.rb | 18 +++++++++
 2 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
index 3256d8fc4db95..8ada22dd69e36 100644
--- a/actionview/test/abstract_unit.rb
+++ b/actionview/test/abstract_unit.rb
@@ -20,18 +20,9 @@
 require 'action_view/testing/resolvers'
 require 'active_support/dependencies'
 require 'active_model'
-require 'active_record'
 
 require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
 
-module Rails
-  class << self
-    def env
-      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "test")
-    end
-  end
-end
-
 ActiveSupport::Dependencies.hook!
 
 Thread.abort_on_exception = true
@@ -42,9 +33,6 @@ def env
 # Disable available locale checks to avoid warnings running the test suite.
 I18n.enforce_available_locales = false
 
-# Register danish language for testing
-I18n.backend.store_translations 'da', {}
-I18n.backend.store_translations 'pt-BR', {}
 ORIGINAL_LOCALES = I18n.available_locales.map(&:to_s).sort
 
 FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
@@ -194,21 +182,6 @@ def with_routing(&block)
     self.class.app = old_app
     silence_warnings { Object.const_set(:SharedTestRoutes, old_routes) }
   end
-
-  def with_autoload_path(path)
-    path = File.join(File.dirname(__FILE__), "fixtures", path)
-    if ActiveSupport::Dependencies.autoload_paths.include?(path)
-      yield
-    else
-      begin
-        ActiveSupport::Dependencies.autoload_paths << path
-        yield
-      ensure
-        ActiveSupport::Dependencies.autoload_paths.reject! {|p| p == path}
-        ActiveSupport::Dependencies.clear
-      end
-    end
-  end
 end
 
 ActionView::RoutingUrlFor.include(ActionDispatch::Routing::UrlFor)
@@ -242,24 +215,6 @@ class TestCase
   end
 end
 
-class Workshop
-  extend ActiveModel::Naming
-  include ActiveModel::Conversion
-  attr_accessor :id
-
-  def initialize(id)
-    @id = id
-  end
-
-  def persisted?
-    id.present?
-  end
-
-  def to_s
-    id.to_s
-  end
-end
-
 module ActionDispatch
   class DebugExceptions
     private
diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
index ab56d80de39fc..10583554a52ce 100644
--- a/actionview/test/template/url_helper_test.rb
+++ b/actionview/test/template/url_helper_test.rb
@@ -1,5 +1,23 @@
 require 'abstract_unit'
 
+class Workshop
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+  attr_accessor :id
+
+  def initialize(id)
+    @id = id
+  end
+
+  def persisted?
+    id.present?
+  end
+
+  def to_s
+    id.to_s
+  end
+end
+
 class UrlHelperTest < ActiveSupport::TestCase
 
   # In a few cases, the helper proxies to 'controller'