railties 5.0.7.2 → 5.1.0.beta1

data/lib/rails/generators/rails/plugin/templates/bin/rails.tt

@@ -3,6 +3,7 @@
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/<%= namespaced_name -%>/engine', __FILE__)
+APP_PATH = File.expand_path('../../<%= dummy_path -%>/config/application', __FILE__)
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)

data/lib/rails/generators/rails/plugin/templates/bin/test.tt

@@ -1,10 +1,4 @@
-$: << File.expand_path(File.expand_path('../../test', __FILE__))
+$: << File.expand_path(File.expand_path("../../test", __FILE__))
 
-require 'bundler/setup'
-require 'rails/test_unit/runner'
-require 'rails/test_unit/reporter'
-
-Rails::TestUnitReporter.executable = 'bin/test'
-
-Rails::TestUnit::Runner.parse_options(ARGV)
-Rails::TestUnit::Runner.run(ARGV)
+require "bundler/setup"
+require "rails/plugin/test"

data/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb

@@ -0,0 +1,5 @@
+require "test_helper"
+
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
+end

data/lib/rails/generators/rails/plugin/templates/test/test_helper.rb

@@ -1,6 +1,3 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
 require File.expand_path("../../<%= options[:dummy_path] -%>/config/environment.rb", __FILE__)
 <% unless options[:skip_active_record] -%>
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../<%= options[:dummy_path] -%>/db/migrate", __FILE__)]

data/lib/rails/generators/rails/resource/resource_generator.rb

@@ -1,5 +1,5 @@
-require 'rails/generators/resource_helpers'
-require 'rails/generators/rails/model/model_generator'
+require "rails/generators/resource_helpers"
+require "rails/generators/rails/model/model_generator"
 
 module Rails
   module Generators

data/lib/rails/generators/rails/scaffold/scaffold_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/rails/resource/resource_generator'
+require "rails/generators/rails/resource/resource_generator"
 
 module Rails
   module Generators
@@ -6,6 +6,7 @@ module Rails
       remove_hook_for :resource_controller
       remove_class_option :actions
 
+      class_option :api, type: :boolean
       class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
       class_option :stylesheet_engine, desc: "Engine for Stylesheets"
       class_option :assets, type: :boolean
@@ -15,10 +16,13 @@ module Rails
       def handle_skip
         @options = @options.merge(stylesheets: false) unless options[:assets]
         @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] && options[:scaffold_stylesheet]
+        @options = @options.merge(system_tests: false) if options[:api]
       end
 
       hook_for :scaffold_controller, required: true
 
+      hook_for :system_tests, as: :system
+
       hook_for :assets do |assets|
         invoke assets, [controller_name]
       end

data/lib/rails/generators/rails/scaffold/templates/scaffold.css

@@ -1,13 +1,13 @@
 body {
   background-color: #fff;
   color: #333;
+  margin: 33px;
 }
 
 body, p, ol, ul, td {
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
   line-height: 18px;
-  margin: 33px;
 }
 
 pre {
@@ -34,9 +34,7 @@ th {
 }
 
 td {
-  padding-bottom: 7px;
-  padding-left: 5px;
-  padding-right: 5px;
+  padding: 0 5px 7px;
 }
 
 div.field,
@@ -57,8 +55,7 @@ div.actions {
 #error_explanation {
   width: 450px;
   border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
+  padding: 7px 7px 0;
   margin-bottom: 20px;
   background-color: #f0f0f0;
 }
@@ -68,8 +65,7 @@ div.actions {
   font-weight: bold;
   padding: 5px 5px 5px 15px;
   font-size: 12px;
-  margin: -7px;
-  margin-bottom: 0;
+  margin: -7px -7px 0;
   background-color: #c00;
   color: #fff;
 }

data/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/resource_helpers'
+require "rails/generators/resource_helpers"
 
 module Rails
   module Generators
@@ -17,10 +17,9 @@ module Rails
 
       def create_controller_files
         template_file = options.api? ? "api_controller.rb" : "controller.rb"
-        template template_file, File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
+        template template_file, File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
       end
 
-
       hook_for :template_engine, as: :scaffold do |template_engine|
         invoke template_engine unless options.api?
       end

data/lib/rails/generators/rails/system_test/USAGE

@@ -0,0 +1,10 @@
+Description:
+    Stubs out a new system test. Pass the name of the test, either
+    CamelCased or under_scored, as an argument.
+
+    This generator invokes the current system tool, which defaults to
+    TestUnit.
+
+Example:
+    `rails generate system_test GeneralStories` creates a GeneralStories
+    system test in test/system/general_stories_test.rb

data/lib/rails/generators/rails/system_test/system_test_generator.rb

@@ -0,0 +1,7 @@
+module Rails
+  module Generators
+    class SystemTestGenerator < NamedBase # :nodoc:
+      hook_for :system_tests, as: :system
+    end
+  end
+end

data/lib/rails/generators/rails/task/task_generator.rb

@@ -4,9 +4,8 @@ module Rails
       argument :actions, type: :array, default: [], banner: "action action"
 
       def create_task_files
-        template 'task.rb', File.join('lib/tasks', "#{file_name}.rake")
+        template "task.rb", File.join("lib/tasks", "#{file_name}.rake")
       end
-
     end
   end
 end

data/lib/rails/generators/resource_helpers.rb

@@ -1,12 +1,11 @@
-require 'rails/generators/active_model'
-require 'rails/generators/model_helpers'
+require "rails/generators/active_model"
+require "rails/generators/model_helpers"
 
 module Rails
   module Generators
     # Deal with controller names on scaffold and add some helpers to deal with
     # ActiveModel.
     module ResourceHelpers # :nodoc:
-
       def self.included(base) #:nodoc:
         base.include(Rails::Generators::ModelHelpers)
         base.class_option :model_name, type: :string, desc: "ModelName to be used"
@@ -18,16 +17,20 @@ module Rails
         controller_name = name
         if options[:model_name]
           self.name = options[:model_name]
-          assign_names!(self.name)
+          assign_names!(name)
         end
 
         assign_controller_names!(controller_name.pluralize)
       end
 
+      # TODO Change this to private once we've dropped Ruby 2.2 support.
+      # Workaround for Ruby 2.2 "private attribute?" warning.
       protected
 
         attr_reader :controller_name, :controller_file_name
 
+      private
+
         def controller_class_path
           if options[:model_name]
             @controller_class_path
@@ -38,25 +41,25 @@ module Rails
 
         def assign_controller_names!(name)
           @controller_name = name
-          @controller_class_path = name.include?('/') ? name.split('/') : name.split('::')
+          @controller_class_path = name.include?("/") ? name.split("/") : name.split("::")
           @controller_class_path.map!(&:underscore)
           @controller_file_name = @controller_class_path.pop
         end
 
         def controller_file_path
-          @controller_file_path ||= (controller_class_path + [controller_file_name]).join('/')
+          @controller_file_path ||= (controller_class_path + [controller_file_name]).join("/")
         end
 
         def controller_class_name
-          (controller_class_path + [controller_file_name]).map!(&:camelize).join('::')
+          (controller_class_path + [controller_file_name]).map!(&:camelize).join("::")
         end
 
         def controller_i18n_scope
-          @controller_i18n_scope ||= controller_file_path.tr('/', '.')
+          @controller_i18n_scope ||= controller_file_path.tr("/", ".")
         end
 
         # Loads the ORM::Generators::ActiveModel class. This class is responsible
-        # to tell scaffold entities how to generate an specific method for the
+        # to tell scaffold entities how to generate a specific method for the
         # ORM. Check Rails::Generators::ActiveModel for more information.
         def orm_class
           @orm_class ||= begin
@@ -74,7 +77,7 @@ module Rails
         end
 
         # Initialize ORM::Generators::ActiveModel to access instance methods.
-        def orm_instance(name=singular_table_name)
+        def orm_instance(name = singular_table_name)
           @orm_instance ||= orm_class.new(name)
         end
     end

data/lib/rails/generators/test_case.rb

@@ -1,8 +1,8 @@
-require 'rails/generators'
-require 'rails/generators/testing/behaviour'
-require 'rails/generators/testing/setup_and_teardown'
-require 'rails/generators/testing/assertions'
-require 'fileutils'
+require "rails/generators"
+require "rails/generators/testing/behaviour"
+require "rails/generators/testing/setup_and_teardown"
+require "rails/generators/testing/assertions"
+require "fileutils"
 
 module Rails
   module Generators
@@ -30,7 +30,6 @@ module Rails
       include Rails::Generators::Testing::SetupAndTeardown
       include Rails::Generators::Testing::Assertions
       include FileUtils
-
     end
   end
 end

data/lib/rails/generators/test_unit.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/named_base'
+require "rails/generators/named_base"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:

data/lib/rails/generators/test_unit/controller/controller_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/test_unit'
+require "rails/generators/test_unit"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:
@@ -7,8 +7,8 @@ module TestUnit # :nodoc:
       check_class_collision suffix: "ControllerTest"
 
       def create_test_files
-        template 'functional_test.rb',
-                 File.join('test/controllers', class_path, "#{file_name}_controller_test.rb")
+        template "functional_test.rb",
+                 File.join("test/controllers", class_path, "#{file_name}_controller_test.rb")
       end
     end
   end

data/lib/rails/generators/test_unit/generator/generator_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/test_unit'
+require "rails/generators/test_unit"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:
@@ -9,10 +9,10 @@ module TestUnit # :nodoc:
                                desc: "Namespace generator under lib/generators/name"
 
       def create_generator_files
-        template 'generator_test.rb', File.join('test/lib/generators', class_path, "#{file_name}_generator_test.rb")
+        template "generator_test.rb", File.join("test/lib/generators", class_path, "#{file_name}_generator_test.rb")
       end
 
-    protected
+    private
 
       def generator_path
         if options[:namespace]

data/lib/rails/generators/test_unit/helper/helper_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/test_unit'
+require "rails/generators/test_unit"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:

data/lib/rails/generators/test_unit/integration/integration_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/test_unit'
+require "rails/generators/test_unit"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:
@@ -6,7 +6,7 @@ module TestUnit # :nodoc:
       check_class_collision suffix: "Test"
 
       def create_test_files
-        template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
+        template "integration_test.rb", File.join("test/integration", class_path, "#{file_name}_test.rb")
       end
     end
   end

data/lib/rails/generators/test_unit/job/job_generator.rb

@@ -1,12 +1,12 @@
-require 'rails/generators/test_unit'
+require "rails/generators/test_unit"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class JobGenerator < Base # :nodoc:
-      check_class_collision suffix: 'JobTest'
+      check_class_collision suffix: "JobTest"
 
       def create_test_file
-        template 'unit_test.rb.erb', File.join('test/jobs', class_path, "#{file_name}_job_test.rb")
+        template "unit_test.rb.erb", File.join("test/jobs", class_path, "#{file_name}_job_test.rb")
       end
     end
   end

data/lib/rails/generators/test_unit/mailer/mailer_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/test_unit'
+require "rails/generators/test_unit"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:
@@ -10,16 +10,16 @@ module TestUnit # :nodoc:
       end
 
       def create_test_files
-        template "functional_test.rb", File.join('test/mailers', class_path, "#{file_name}_mailer_test.rb")
+        template "functional_test.rb", File.join("test/mailers", class_path, "#{file_name}_mailer_test.rb")
       end
 
       def create_preview_files
-        template "preview.rb", File.join('test/mailers/previews', class_path, "#{file_name}_mailer_preview.rb")
+        template "preview.rb", File.join("test/mailers/previews", class_path, "#{file_name}_mailer_preview.rb")
       end
 
-      protected
+      private
         def file_name
-          @_file_name ||= super.gsub(/_mailer/i, '')
+          @_file_name ||= super.gsub(/_mailer/i, "")
         end
     end
   end

data/lib/rails/generators/test_unit/model/model_generator.rb

@@ -1,9 +1,8 @@
-require 'rails/generators/test_unit'
+require "rails/generators/test_unit"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:
     class ModelGenerator < Base # :nodoc:
-
       RESERVED_YAML_KEYWORDS = %w(y yes n no true false on off null)
 
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
@@ -12,14 +11,14 @@ module TestUnit # :nodoc:
       check_class_collision suffix: "Test"
 
       def create_test_file
-        template 'unit_test.rb', File.join('test/models', class_path, "#{file_name}_test.rb")
+        template "unit_test.rb", File.join("test/models", class_path, "#{file_name}_test.rb")
       end
 
       hook_for :fixture_replacement
 
       def create_fixture_file
         if options[:fixture] && options[:fixture_replacement].nil?
-          template 'fixtures.yml', File.join('test/fixtures', class_path, "#{fixture_file_name}.yml")
+          template "fixtures.yml", File.join("test/fixtures", class_path, "#{fixture_file_name}.yml")
         end
       end
 

data/lib/rails/generators/test_unit/plugin/plugin_generator.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/test_unit'
+require "rails/generators/test_unit"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:
@@ -6,7 +6,7 @@ module TestUnit # :nodoc:
       check_class_collision suffix: "Test"
 
       def create_test_files
-        directory '.', 'test'
+        directory ".", "test"
       end
     end
   end

data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb

@@ -1,5 +1,5 @@
-require 'rails/generators/test_unit'
-require 'rails/generators/resource_helpers'
+require "rails/generators/test_unit"
+require "rails/generators/resource_helpers"
 
 module TestUnit # :nodoc:
   module Generators # :nodoc:
@@ -39,7 +39,7 @@ module TestUnit # :nodoc:
             else
               "#{name}: @#{singular_table_name}.#{name}"
             end
-          end.sort.join(', ')
+          end.sort.join(", ")
         end
     end
   end

data/lib/rails/generators/test_unit/system/system_generator.rb

@@ -0,0 +1,17 @@
+require "rails/generators/test_unit"
+
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class SystemGenerator < Base # :nodoc:
+      check_class_collision suffix: "Test"
+
+      def create_test_files
+        if !File.exist?(File.join("test/application_system_test_case.rb"))
+          template "application_system_test_case.rb", File.join("test", "application_system_test_case.rb")
+        end
+
+        template "system_test.rb", File.join("test/system", "#{file_name.pluralize}_test.rb")
+      end
+    end
+  end
+end