Merge branch 'master' into 4.2

Author: Rafael Mendonça França

lib/prototype-rails/on_load_action_view.rb

@@ -14,9 +14,11 @@
   include ActionView::Helpers::ScriptaculousHelper
 end
 
-ActionView::TestCase.class_eval do
-  include ActionView::Helpers::PrototypeHelper
-  include ActionView::Helpers::ScriptaculousHelper
+if defined?(Rails.env) && Rails.env.test?
+  ActionView::TestCase.class_eval do
+    include ActionView::Helpers::PrototypeHelper
+    include ActionView::Helpers::ScriptaculousHelper
+  end
 end
 
 ActionView::Template.register_template_handler :rjs, ActionView::Template::Handlers::RJS.new

prototype-rails.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.author   = 'Xavier Noria'
   spec.email    = 'fxn@hashref.com'
 
-  spec.files = %w(README Rakefile Gemfile MIT-LICENSE) + Dir['lib/**/*', 'vendor/**/*', 'test/**/*']
+  spec.files = %w(README.md Rakefile Gemfile MIT-LICENSE) + Dir['lib/**/*', 'vendor/**/*', 'test/**/*']
 
   spec.add_dependency('rails', '~> 4.0')
   spec.add_development_dependency('mocha')

test/lib/abstract_unit.rb

@@ -8,6 +8,12 @@
 require 'action_view'
 require 'action_view/testing/resolvers'
 
+module Rails
+  def self.env
+    ActiveSupport::StringInquirer.new("test")
+  end
+end
+
 require 'prototype-rails/on_load_action_controller'
 require 'prototype-rails/on_load_action_view'