railties 5.0.0.beta1.1 → 5.0.0.beta2

data/lib/rails/test_unit/railtie.rb

@@ -1,3 +1,5 @@
+require 'rails/test_unit/line_filtering'
+
 if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any?
   ENV['RAILS_ENV'] ||= 'test'
 end
@@ -11,6 +13,10 @@ module Rails
       c.integration_tool :test_unit
     end
 
+    initializer "test_unit.line_filtering" do
+      ActiveSupport::TestCase.extend Rails::LineFiltering
+    end
+
     rake_tasks do
       load "rails/test_unit/testing.rake"
     end

data/lib/rails/test_unit/reporter.rb

@@ -9,10 +9,16 @@ module Rails
     def record(result)
       super
 
+      if options[:verbose]
+        io.puts color_output(format_line(result), by: result)
+      else
+        io.print color_output(result.result_code, by: result)
+      end
+
       if output_inline? && result.failure && (!result.skipped? || options[:verbose])
         io.puts
         io.puts
-        io.puts result.failures.map(&:message)
+        io.puts format_failures(result).map { |line| color_output(line, by: result) }
         io.puts
         io.puts format_rerun_snippet(result)
         io.puts
@@ -56,6 +62,16 @@ module Rails
         options[:fail_fast]
       end
 
+      def format_line(result)
+        "%s#%s = %.2f s = %s" % [result.class, result.name, result.time, result.result_code]
+      end
+
+      def format_failures(result)
+        result.failures.map do |failure|
+          "#{failure.result_label}:\n#{result.class}##{result.name}:\n#{failure.message}\n"
+        end
+      end
+
       def format_rerun_snippet(result)
         # Try to extract path to assertion from backtrace.
         if result.location =~ /\[(.*)\]\z/
@@ -70,5 +86,25 @@ module Rails
       def app_root
         @app_root ||= defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
       end
+
+      def colored_output?
+        options[:color] && io.respond_to?(:tty?) && io.tty?
+      end
+
+      codes = { red: 31, green: 32, yellow: 33 }
+      COLOR_BY_RESULT_CODE = {
+        "." => codes[:green],
+        "E" => codes[:red],
+        "F" => codes[:red],
+        "S" => codes[:yellow]
+      }
+
+      def color_output(string, by:)
+        if colored_output?
+          "\e[#{COLOR_BY_RESULT_CODE[by.result_code]}m#{string}\e[0m"
+        else
+          string
+        end
+      end
   end
 end

data/lib/rails/test_unit/test_requirer.rb

@@ -15,7 +15,7 @@ module Rails
       private
         def expand_patterns(patterns)
           patterns.map do |arg|
-            arg = arg.gsub(/:(\d+)?$/, '')
+            arg = arg.gsub(/(:\d+)+?$/, '')
             if Dir.exist?(arg)
               "#{arg}/**/*_test.rb"
             else

data/lib/rails/test_unit/testing.rake

@@ -7,7 +7,12 @@ task default: :test
 desc "Runs all tests in test folder"
 task :test do
   $: << "test"
-  Minitest.rake_run(["test"])
+  pattern = if ENV.key?('TEST')
+               ENV['TEST']
+             else
+               "test"
+             end
+  Minitest.rake_run([pattern])
 end
 
 namespace :test do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1.1
+  version: 5.0.0.beta2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1.1
+        version: 5.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1.1
+        version: 5.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1.1
+        version: 5.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1.1
+        version: 5.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1.1
+        version: 5.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1.1
+        version: 5.0.0.beta2
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -147,6 +147,7 @@ files:
 - lib/rails/console/helpers.rb
 - lib/rails/engine.rb
 - lib/rails/engine/commands.rb
+- lib/rails/engine/commands_tasks.rb
 - lib/rails/engine/configuration.rb
 - lib/rails/engine/railties.rb
 - lib/rails/gem_version.rb
@@ -204,6 +205,7 @@ files:
 - lib/rails/generators/rails/app/templates/config.ru.tt
 - lib/rails/generators/rails/app/templates/config/application.rb
 - lib/rails/generators/rails/app/templates/config/boot.rb
+- lib/rails/generators/rails/app/templates/config/cable.yml
 - lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
 - lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
 - lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
@@ -229,11 +231,12 @@ files:
 - lib/rails/generators/rails/app/templates/config/initializers/filter_parameter_logging.rb
 - lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
 - lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb
+- lib/rails/generators/rails/app/templates/config/initializers/per_form_csrf_tokens.rb
 - lib/rails/generators/rails/app/templates/config/initializers/request_forgery_protection.rb
 - lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
 - lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
 - lib/rails/generators/rails/app/templates/config/locales/en.yml
-- lib/rails/generators/rails/app/templates/config/redis/cable.yml
+- lib/rails/generators/rails/app/templates/config/puma.rb
 - lib/rails/generators/rails/app/templates/config/routes.rb
 - lib/rails/generators/rails/app/templates/config/secrets.yml
 - lib/rails/generators/rails/app/templates/db/seeds.rb.tt
@@ -275,9 +278,8 @@ files:
 - lib/rails/generators/rails/plugin/templates/app/controllers/%namespaced_name%/application_controller.rb.tt
 - lib/rails/generators/rails/plugin/templates/app/helpers/%namespaced_name%/application_helper.rb.tt
 - lib/rails/generators/rails/plugin/templates/app/jobs/%namespaced_name%/application_job.rb.tt
-- lib/rails/generators/rails/plugin/templates/app/mailers/.empty_directory
-- lib/rails/generators/rails/plugin/templates/app/models/.empty_directory
-- lib/rails/generators/rails/plugin/templates/app/models/application_record.rb.tt
+- lib/rails/generators/rails/plugin/templates/app/mailers/%namespaced_name%/application_mailer.rb.tt
+- lib/rails/generators/rails/plugin/templates/app/models/%namespaced_name%/application_record.rb.tt
 - lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt
 - lib/rails/generators/rails/plugin/templates/bin/rails.tt
 - lib/rails/generators/rails/plugin/templates/bin/test.tt
@@ -370,6 +372,7 @@ files:
 - lib/rails/templates/rails/mailers/mailer.html.erb
 - lib/rails/templates/rails/welcome/index.html.erb
 - lib/rails/test_help.rb
+- lib/rails/test_unit/line_filtering.rb
 - lib/rails/test_unit/minitest_plugin.rb
 - lib/rails/test_unit/railtie.rb
 - lib/rails/test_unit/reporter.rb
@@ -399,8 +402,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []
+has_rdoc: 

data/lib/rails/generators/rails/app/templates/config/redis/cable.yml

@@ -1,9 +0,0 @@
-# Action Cable uses Redis to administer connections, channels, and sending/receiving messages over the WebSocket.
-production:
-  url: redis://localhost:6379/1
-
-development:
-  url: redis://localhost:6379/2
-
-test:
-  url: redis://localhost:6379/3