railties 4.2.11.3 → 5.0.0.beta1

data/lib/rails/tasks/framework.rake

@@ -32,35 +32,37 @@ namespace :rails do
           FileUtils.cp_r src_name, dst_name
         end
       end
-     end
+    end
   end
 
   namespace :update do
-    def invoke_from_app_generator(method)
-      app_generator.send(method)
-    end
+    class RailsUpdate
+      def self.invoke_from_app_generator(method)
+        app_generator.send(method)
+      end
 
-    def app_generator
-      @app_generator ||= begin
-        require 'rails/generators'
-        require 'rails/generators/rails/app/app_generator'
-        gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
-                                                             destination_root: Rails.root
-        File.exist?(Rails.root.join("config", "application.rb")) ?
-          gen.send(:app_const) : gen.send(:valid_const?)
-        gen
+      def self.app_generator
+        @app_generator ||= begin
+          require 'rails/generators'
+          require 'rails/generators/rails/app/app_generator'
+          gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
+            destination_root: Rails.root
+          File.exist?(Rails.root.join("config", "application.rb")) ?
+            gen.send(:app_const) : gen.send(:valid_const?)
+          gen
+        end
       end
     end
 
     # desc "Update config/boot.rb from your current rails install"
     task :configs do
-      invoke_from_app_generator :create_boot_file
-      invoke_from_app_generator :update_config_files
+      RailsUpdate.invoke_from_app_generator :create_boot_file
+      RailsUpdate.invoke_from_app_generator :update_config_files
     end
 
     # desc "Adds new executables to the application bin/ directory"
     task :bin do
-      invoke_from_app_generator :create_bin_files
+      RailsUpdate.invoke_from_app_generator :create_bin_files
     end
   end
 end

data/lib/rails/tasks/initializers.rake

@@ -0,0 +1,6 @@
+desc "Print out all defined initializers in the order they are invoked by Rails."
+task initializers: :environment do
+  Rails.application.initializers.tsort_each do |initializer|
+    puts initializer.name
+  end
+end

data/lib/rails/tasks/restart.rake

@@ -0,0 +1,5 @@
+desc "Restart app by touching tmp/restart.txt"
+task :restart do
+  FileUtils.mkdir_p('tmp')
+  FileUtils.touch('tmp/restart.txt')
+end

data/lib/rails/tasks/statistics.rake

@@ -1,6 +1,6 @@
-# while having global constant is not good,
-# many 3rd party tools depend on it, like rspec-rails, cucumber-rails, etc
-# so if will be removed - deprecation warning is needed
+# While global constants are bad, many 3rd party tools depend on this one (e.g
+# rspec-rails & cucumber-rails). So a deprecation warning is needed if we want
+# to remove it.
 STATS_DIRECTORIES = [
   %w(Controllers        app/controllers),
   %w(Helpers            app/helpers),
@@ -9,15 +9,14 @@ STATS_DIRECTORIES = [
   %w(Mailers            app/mailers),
   %w(Javascripts        app/assets/javascripts),
   %w(Libraries          lib/),
+  %w(Tasks              lib/tasks),
   %w(APIs               app/apis),
   %w(Controller\ tests  test/controllers),
   %w(Helper\ tests      test/helpers),
   %w(Model\ tests       test/models),
   %w(Mailer\ tests      test/mailers),
-  %w(Job\ tests      test/jobs),
+  %w(Job\ tests         test/jobs),
   %w(Integration\ tests test/integration),
-  %w(Functional\ tests\ (old)  test/functional),
-  %w(Unit\ tests \ (old)       test/unit)
 ].collect do |name, dir|
   [ name, "#{File.dirname(Rake.application.rakefile_location)}/#{dir}" ]
 end.select { |name, dir| File.directory?(dir) }

data/lib/rails/tasks/tmp.rake

@@ -1,9 +1,8 @@
 namespace :tmp do
-  desc "Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)"
-  task clear: [ "tmp:sessions:clear",  "tmp:cache:clear", "tmp:sockets:clear"]
+  desc "Clear cache and socket files from tmp/ (narrow w/ tmp:cache:clear, tmp:sockets:clear)"
+  task clear: ["tmp:cache:clear", "tmp:sockets:clear"]
 
-  tmp_dirs = [ 'tmp/sessions',
-               'tmp/cache',
+  tmp_dirs = [ 'tmp/cache',
                'tmp/sockets',
                'tmp/pids',
                'tmp/cache/assets/development',
@@ -12,16 +11,9 @@ namespace :tmp do
 
   tmp_dirs.each { |d| directory d }
 
-  desc "Creates tmp directories for sessions, cache, sockets, and pids"
+  desc "Creates tmp directories for cache, sockets, and pids"
   task create: tmp_dirs
 
-  namespace :sessions do
-    # desc "Clears all files in tmp/sessions"
-    task :clear do
-      FileUtils.rm(Dir['tmp/sessions/[^.]*'])
-    end
-  end
-
   namespace :cache do
     # desc "Clears all files and directories in tmp/cache"
     task :clear do

data/lib/rails/templates/rails/mailers/email.html.erb

@@ -94,9 +94,9 @@
 
     <% if @email.multipart? %>
       <dd>
-        <select onchange="document.getElementsByName('messageBody')[0].src=this.options[this.selectedIndex].value;">
-          <option <%= request.format == Mime::HTML ? 'selected' : '' %> value="?part=text%2Fhtml">View as HTML email</option>
-          <option <%= request.format == Mime::TEXT ? 'selected' : '' %> value="?part=text%2Fplain">View as plain-text email</option>
+        <select onchange="formatChanged(this);">
+          <option <%= request.format == Mime[:html] ? 'selected' : '' %> value="?part=text%2Fhtml">View as HTML email</option>
+          <option <%= request.format == Mime[:text] ? 'selected' : '' %> value="?part=text%2Fplain">View as plain-text email</option>
         </select>
       </dd>
     <% end %>
@@ -112,5 +112,19 @@
   </p>
 <% end %>
 
+<script>
+  function formatChanged(form) {
+    var part_name = form.options[form.selectedIndex].value
+    var iframe =document.getElementsByName('messageBody')[0];
+    iframe.contentWindow.location.replace(part_name);
+
+    if (history.replaceState) {
+      var url    = location.pathname.replace(/\.(txt|html)$/, '');
+      var format = /html/.test(part_name) ? '.html' : '.txt';
+      window.history.replaceState({}, '', url + format);
+    }
+  }
+</script>
+
 </body>
 </html>

data/lib/rails/templates/rails/welcome/index.html.erb

@@ -18,7 +18,9 @@
         color: #000;
       }
 
-      a  {color: #03c}
+      a {
+        color: #03c;
+      }
 
       a:hover {
         background-color: #03c;
@@ -64,7 +66,10 @@
         height: 64px;
       }
 
-      #header h1, #header h2 {margin: 0}
+      #header h1,
+      #header h2 {
+        margin: 0;
+      }
 
       #header h2 {
         color: #888;
@@ -104,7 +109,9 @@
         color: #555;
       }
 
-      #about-content td.value {color: #000}
+      #about-content td.value {
+        color: #000;
+      }
 
       #about-content ul {
         padding: 0;

data/lib/rails/test_help.rb

@@ -2,18 +2,14 @@
 # so fixtures aren't loaded into that environment
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
 
-require 'active_support/testing/autorun'
+require "rails/test_unit/minitest_plugin"
 require 'active_support/test_case'
 require 'action_controller'
 require 'action_controller/test_case'
 require 'action_dispatch/testing/integration'
 require 'rails/generators/test_case'
 
-# Config Rails backtrace in tests.
-require 'rails/backtrace_cleaner'
-if ENV["BACKTRACE"].nil?
-  Minitest.backtrace_filter = Rails.backtrace_cleaner
-end
+require 'active_support/testing/autorun'
 
 if defined?(ActiveRecord::Base)
   ActiveRecord::Migration.maintain_test_schema!
@@ -21,6 +17,7 @@ if defined?(ActiveRecord::Base)
   class ActiveSupport::TestCase
     include ActiveRecord::TestFixtures
     self.fixture_path = "#{Rails.root}/test/fixtures/"
+    self.file_fixture_path = self.fixture_path + "files"
   end
 
   ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
@@ -31,13 +28,15 @@ if defined?(ActiveRecord::Base)
 end
 
 class ActionController::TestCase
-  setup do
+  def before_setup # :nodoc:
     @routes = Rails.application.routes
+    super
   end
 end
 
 class ActionDispatch::IntegrationTest
-  setup do
+  def before_setup # :nodoc:
     @routes = Rails.application.routes
+    super
   end
 end

data/lib/rails/test_unit/minitest_plugin.rb

@@ -0,0 +1,91 @@
+require "active_support/core_ext/module/attribute_accessors"
+require "rails/test_unit/reporter"
+require "rails/test_unit/test_requirer"
+
+module Minitest
+  mattr_accessor(:hide_aggregated_results) { false }
+
+  module AggregatedResultSuppresion
+    def aggregated_results
+      super unless Minitest.hide_aggregated_results
+    end
+  end
+
+  SummaryReporter.prepend AggregatedResultSuppresion
+
+  def self.plugin_rails_options(opts, options)
+    executable = ::Rails::TestUnitReporter.executable
+    opts.separator ""
+    opts.separator "Usage: #{executable} [options] [files or directories]"
+    opts.separator "You can run a single test by appending a line number to a filename:"
+    opts.separator ""
+    opts.separator "    #{executable} test/models/user_test.rb:27"
+    opts.separator ""
+    opts.separator "You can run multiple files and directories at the same time:"
+    opts.separator ""
+    opts.separator "    #{executable} test/controllers test/integration/login_test.rb"
+    opts.separator ""
+    opts.separator "By default test failures and errors are reported inline during a run."
+    opts.separator ""
+
+    opts.separator "Rails options:"
+    opts.on("-e", "--environment ENV",
+            "Run tests in the ENV environment") do |env|
+      options[:environment] = env.strip
+    end
+
+    opts.on("-b", "--backtrace",
+            "Show the complete backtrace") do
+      options[:full_backtrace] = true
+    end
+
+    opts.on("-d", "--defer-output",
+            "Output test failures and errors after the test run") do
+      options[:output_inline] = false
+    end
+
+    opts.on("-f", "--fail-fast",
+            "Abort test run on first failure") do
+      options[:fail_fast] = true
+    end
+
+    options[:output_inline] = true
+    options[:patterns] = opts.order!
+  end
+
+  # Running several Rake tasks in a single command would trip up the runner,
+  # as the patterns would also contain the other Rake tasks.
+  def self.rake_run(patterns) # :nodoc:
+    @rake_patterns = patterns
+    passed = run
+    exit passed unless passed
+    passed
+  end
+
+  def self.plugin_rails_init(options)
+    self.run_with_rails_extension = true
+
+    ENV["RAILS_ENV"] = options[:environment] || "test"
+
+    unless run_with_autorun
+      patterns = defined?(@rake_patterns) ? @rake_patterns : options[:patterns]
+      ::Rails::TestRequirer.require_files(patterns)
+    end
+
+    unless options[:full_backtrace] || ENV["BACKTRACE"]
+      # Plugin can run without Rails loaded, check before filtering.
+      Minitest.backtrace_filter = ::Rails.backtrace_cleaner if ::Rails.respond_to?(:backtrace_cleaner)
+    end
+
+    # Disable the extra failure output after a run, unless output is deferred.
+    self.hide_aggregated_results = options[:output_inline]
+
+    self.reporter << ::Rails::TestUnitReporter.new(options[:io], options)
+  end
+
+  mattr_accessor(:run_with_autorun)         { false }
+  mattr_accessor(:run_with_rails_extension) { false }
+end
+
+Minitest.load_plugins
+Minitest.extensions << 'rails'

data/lib/rails/test_unit/reporter.rb

@@ -0,0 +1,74 @@
+require "active_support/core_ext/class/attribute"
+require "minitest"
+
+module Rails
+  class TestUnitReporter < Minitest::StatisticsReporter
+    class_attribute :executable
+    self.executable = "bin/rails test"
+
+    def record(result)
+      super
+
+      if output_inline? && result.failure && (!result.skipped? || options[:verbose])
+        io.puts
+        io.puts
+        io.puts result.failures.map(&:message)
+        io.puts
+        io.puts format_rerun_snippet(result)
+        io.puts
+      end
+
+      if fail_fast? && result.failure && !result.error? && !result.skipped?
+        raise Interrupt
+      end
+    end
+
+    def report
+      return if output_inline? || filtered_results.empty?
+      io.puts
+      io.puts "Failed tests:"
+      io.puts
+      io.puts aggregated_results
+    end
+
+    def aggregated_results # :nodoc:
+      filtered_results.map { |result| format_rerun_snippet(result) }.join "\n"
+    end
+
+    def filtered_results
+      if options[:verbose]
+        results
+      else
+        results.reject(&:skipped?)
+      end
+    end
+
+    def relative_path_for(file)
+      file.sub(/^#{app_root}\/?/, '')
+    end
+
+    private
+      def output_inline?
+        options[:output_inline]
+      end
+
+      def fail_fast?
+        options[:fail_fast]
+      end
+
+      def format_rerun_snippet(result)
+        # Try to extract path to assertion from backtrace.
+        if result.location =~ /\[(.*)\]\z/
+          assertion_path = $1
+        else
+          assertion_path = result.method(result.name).source_location.join(':')
+        end
+
+        "#{self.executable} #{relative_path_for(assertion_path)}"
+      end
+
+      def app_root
+        @app_root ||= defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
+      end
+  end
+end

data/lib/rails/test_unit/test_requirer.rb

@@ -0,0 +1,28 @@
+require 'active_support/core_ext/object/blank'
+require 'rake/file_list'
+
+module Rails
+  class TestRequirer # :nodoc:
+    class << self
+      def require_files(patterns)
+        patterns = expand_patterns(patterns)
+
+        Rake::FileList[patterns.compact.presence || 'test/**/*_test.rb'].to_a.each do |file|
+          require File.expand_path(file)
+        end
+      end
+
+      private
+        def expand_patterns(patterns)
+          patterns.map do |arg|
+            arg = arg.gsub(/:(\d+)?$/, '')
+            if Dir.exist?(arg)
+              "#{arg}/**/*_test.rb"
+            else
+              arg
+            end
+          end
+        end
+    end
+  end
+end

data/lib/rails/test_unit/testing.rake

@@ -1,11 +1,13 @@
-require 'rake/testtask'
-require 'rails/test_unit/sub_test_task'
+gem 'minitest'
+require 'minitest'
+require 'rails/test_unit/minitest_plugin'
 
 task default: :test
 
 desc "Runs all tests in test folder"
 task :test do
-  Rails::TestTask.test_creator(Rake.application.top_level_tasks).invoke_rake_task
+  $: << "test"
+  Minitest.rake_run(["test"])
 end
 
 namespace :test do
@@ -14,53 +16,30 @@ namespace :test do
     # If used with Active Record, this task runs before the database schema is synchronized.
   end
 
-  Rails::TestTask.new(:run) do |t|
-    t.pattern = "test/**/*_test.rb"
-  end
+  task :run => %w[test]
 
   desc "Run tests quickly, but also reset db"
   task :db => %w[db:test:prepare test]
 
-  desc "Run tests quickly by merging all types and not resetting db"
-  Rails::TestTask.new(:all) do |t|
-    t.pattern = "test/**/*_test.rb"
-  end
-
-  Rake::Task["test:all"].enhance do
-    Rake::Task["test:deprecate_all"].invoke
-  end
-
-  task :deprecate_all do
-    ActiveSupport::Deprecation.warn "rake test:all is deprecated and will be removed in Rails 5. " \
-    "Use rake test to run all tests in test directory."
-  end
-
-  namespace :all do
-    desc "Run tests quickly, but also reset db"
-    task :db => %w[db:test:prepare test:all]
-
-    Rake::Task["test:all:db"].enhance do
-      Rake::Task["test:deprecate_all"].invoke
-    end
-  end
-
-  Rails::TestTask.new(single: "test:prepare")
-
   ["models", "helpers", "controllers", "mailers", "integration", "jobs"].each do |name|
-    Rails::TestTask.new(name => "test:prepare") do |t|
-      t.pattern = "test/#{name}/**/*_test.rb"
+    task name => "test:prepare" do
+      $: << "test"
+      Minitest.rake_run(["test/#{name}"])
     end
   end
 
-  Rails::TestTask.new(generators: "test:prepare") do |t|
-    t.pattern = "test/lib/generators/**/*_test.rb"
+  task :generators => "test:prepare" do
+    $: << "test"
+    Minitest.rake_run(["test/lib/generators"])
   end
 
-  Rails::TestTask.new(units: "test:prepare") do |t|
-    t.pattern = 'test/{models,helpers,unit}/**/*_test.rb'
+  task :units => "test:prepare" do
+    $: << "test"
+    Minitest.rake_run(["test/models", "test/helpers", "test/unit"])
   end
 
-  Rails::TestTask.new(functionals: "test:prepare") do |t|
-    t.pattern = 'test/{controllers,mailers,functional}/**/*_test.rb'
+  task :functionals => "test:prepare" do
+    $: << "test"
+    Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"])
   end
 end