From f8edd2043e864aff0bde9289da550709532268a6 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 15 Dec 2015 16:45:57 -0300
Subject: Do not default to any Serializer

We will wait until 5.1 to make a decision
---
 railties/lib/rails/generators/app_base.rb                 | 4 +---
 railties/lib/rails/generators/rails/app/templates/Gemfile | 3 ---
 railties/test/generators/api_app_generator_test.rb        | 3 +--
 3 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 56c9d3e354..c243b0c60e 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -278,10 +278,8 @@ module Rails
       end
 
       def jbuilder_gemfile_entry
-        return [] if options[:api]
-
         comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder'
-        GemfileEntry.version('jbuilder', '~> 2.0', comment)
+        GemfileEntry.new 'jbuilder', '~> 2.0', comment, {}, options[:api]
       end
 
       def coffee_gemfile_entry
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 2f7ffc055d..4384d9b6eb 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -22,9 +22,6 @@ source 'https://rubygems.org'
 # gem 'capistrano-rails', group: :development
 
 <%- if options.api? -%>
-# Use ActiveModelSerializers to serialize JSON responses
-gem 'active_model_serializers', '~> 0.10.0.rc2'
-
 # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
 # gem 'rack-cors'
 
diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb
index be2cd3a853..2c24a6e46a 100644
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -37,9 +37,8 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
       assert_no_match(/gem 'coffee-rails'/, content)
       assert_no_match(/gem 'jquery-rails'/, content)
       assert_no_match(/gem 'sass-rails'/, content)
-      assert_no_match(/gem 'jbuilder'/, content)
       assert_no_match(/gem 'web-console'/, content)
-      assert_match(/gem 'active_model_serializers'/, content)
+      assert_match(/# gem 'jbuilder'/, content)
     end
 
     assert_file "config/application.rb" do |content|
-- 
cgit v1.2.3


From 98a039dcd987fd3a8c2c0cbd527c71ac3ffaaf06 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Tue, 27 Oct 2015 00:41:27 +0000
Subject: Update test generators to use ActionDispatch::IntegrationTest

In Rails 5.1 `ActionController::TestCase` will be moved out of Rails
into it's own gem. Please use `ActionDispatch::IntegrationTest` going
forward.

This changes the generators to use `ActionDispatch::IntegrationTest` and
the required URL setup (rather than symbols) for each of the controller
actions.

Updated fix to #22076.
---
 railties/lib/rails/generators/named_base.rb        | 12 +++++++++++
 .../controller/templates/functional_test.rb        |  8 +++-----
 .../scaffold/templates/api_functional_test.rb      | 19 +++++++++---------
 .../scaffold/templates/functional_test.rb          | 23 +++++++++++-----------
 .../test/generators/namespaced_generators_test.rb  |  8 ++++----
 .../test/generators/resource_generator_test.rb     |  2 +-
 .../scaffold_controller_generator_test.rb          | 18 ++++++++---------
 .../test/generators/scaffold_generator_test.rb     | 20 +++++++++----------
 8 files changed, 61 insertions(+), 49 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 243694f38e..658d883883 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -129,6 +129,18 @@ module Rails
           uncountable? ? "#{plural_table_name}_index" : plural_table_name
         end
 
+        def show_helper
+          "#{singular_table_name}_url(@#{singular_table_name})"
+        end
+
+        def edit_helper
+          "edit_#{show_helper}"
+        end
+
+        def new_helper
+          "new_#{singular_table_name}_url"
+        end
+
         def singular_table_name
           @singular_table_name ||= (pluralize_table_names? ? table_name.singularize : table_name)
         end
diff --git a/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
index 5a8a3ca5e0..4f2ceb8589 100644
--- a/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
@@ -1,11 +1,9 @@
 require 'test_helper'
 
 <% module_namespacing do -%>
-class <%= class_name %>ControllerTest < ActionController::TestCase
+class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
 <% if mountable_engine? -%>
-  setup do
-    @routes = Engine.routes
-  end
+  include Engine.routes.url_helpers
 
 <% end -%>
 <% if actions.empty? -%>
@@ -15,7 +13,7 @@ class <%= class_name %>ControllerTest < ActionController::TestCase
 <% else -%>
 <% actions.each do |action| -%>
   test "should get <%= action %>" do
-    get :<%= action %>
+    get <%= file_name %>_<%= action %>_url
     assert_response :success
   end
 
diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb
index f302cd6c3d..de5814eae9 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb
@@ -1,40 +1,41 @@
 require 'test_helper'
 
 <% module_namespacing do -%>
-class <%= controller_class_name %>ControllerTest < ActionController::TestCase
+class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest
+  <% if mountable_engine? -%>
+  include Engine.routes.url_helpers
+
+  <% end -%>
   setup do
     @<%= singular_table_name %> = <%= fixture_name %>(:one)
-<% if mountable_engine? -%>
-    @routes = Engine.routes
-<% end -%>
   end
 
   test "should get index" do
-    get :index
+    get <%= index_helper %>_url
     assert_response :success
   end
 
   test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
+      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
     end
 
     assert_response 201
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, params: { id: <%= "@#{singular_table_name}" %> }
+    get <%= show_helper %>
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    patch :update, params: { id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
+    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
     assert_response 200
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, params: { id: <%= "@#{singular_table_name}" %> }
+      delete <%= show_helper %>
     end
 
     assert_response 204
diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
index 50b98b2631..1989d84c79 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
@@ -1,50 +1,51 @@
 require 'test_helper'
 
 <% module_namespacing do -%>
-class <%= controller_class_name %>ControllerTest < ActionController::TestCase
+class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest
+  <%- if mountable_engine? -%>
+  include Engine.routes.url_helpers
+  <% end -%>
+
   setup do
     @<%= singular_table_name %> = <%= fixture_name %>(:one)
-<% if mountable_engine? -%>
-    @routes = Engine.routes
-<% end -%>
   end
 
   test "should get index" do
-    get :index
+    get <%= index_helper %>_url
     assert_response :success
   end
 
   test "should get new" do
-    get :new
+    get <%= new_helper %>
     assert_response :success
   end
 
   test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
+      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
     end
 
     assert_redirected_to <%= singular_table_name %>_path(<%= class_name %>.last)
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, params: { id: <%= "@#{singular_table_name}" %> }
+    get <%= show_helper %>
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, params: { id: <%= "@#{singular_table_name}" %> }
+    get <%= edit_helper %>
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    patch :update, params: { id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
+    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
     assert_redirected_to <%= singular_table_name %>_path(<%= "@#{singular_table_name}" %>)
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, params: { id: <%= "@#{singular_table_name}" %> }
+      delete <%= show_helper %>
     end
 
     assert_redirected_to <%= index_helper %>_path
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 918faae74b..d76759a7d1 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -218,7 +218,7 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
                 /class ProductLinesController < ApplicationController/
 
     assert_file "test/controllers/test_app/product_lines_controller_test.rb",
-                /module TestApp\n  class ProductLinesControllerTest < ActionController::TestCase/
+                /module TestApp\n  class ProductLinesControllerTest < ActionDispatch::IntegrationTest/
 
     # Views
     %w(index edit new show _form).each do |view|
@@ -285,7 +285,7 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
     end
 
     assert_file "test/controllers/test_app/admin/roles_controller_test.rb",
-                /module TestApp\n  class Admin::RolesControllerTest < ActionController::TestCase/
+                /module TestApp\n  class Admin::RolesControllerTest < ActionDispatch::IntegrationTest/
 
     # Views
     %w(index edit new show _form).each do |view|
@@ -352,7 +352,7 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
     end
 
     assert_file "test/controllers/test_app/admin/user/special/roles_controller_test.rb",
-                /module TestApp\n  class Admin::User::Special::RolesControllerTest < ActionController::TestCase/
+                /module TestApp\n  class Admin::User::Special::RolesControllerTest < ActionDispatch::IntegrationTest/
 
     # Views
     %w(index edit new show _form).each do |view|
@@ -418,6 +418,6 @@ class NamespacedScaffoldGeneratorTest < NamespacedGeneratorTestCase
       assert_match(%r(require_dependency "test_app/application_controller"), content)
     end
     assert_file "test/controllers/test_app/admin/roles_controller_test.rb",
-                /module TestApp\n  class Admin::RolesControllerTest < ActionController::TestCase/
+                /module TestApp\n  class Admin::RolesControllerTest < ActionDispatch::IntegrationTest/
   end
 end
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index 581d80d60e..addaf83bc8 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -33,7 +33,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
   def test_resource_controller_with_pluralized_class_name
     run_generator
     assert_file "app/controllers/accounts_controller.rb", /class AccountsController < ApplicationController/
-    assert_file "test/controllers/accounts_controller_test.rb", /class AccountsControllerTest < ActionController::TestCase/
+    assert_file "test/controllers/accounts_controller_test.rb", /class AccountsControllerTest < ActionDispatch::IntegrationTest/
 
     assert_file "app/helpers/accounts_helper.rb", /module AccountsHelper/
   end
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index b4ba101017..c37e289f4b 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -104,10 +104,10 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     run_generator ["User", "name:string", "age:integer", "organization:references{polymorphic}"]
 
     assert_file "test/controllers/users_controller_test.rb" do |content|
-      assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
+      assert_match(/class UsersControllerTest < ActionDispatch::IntegrationTest/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, params: \{ user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content)
-      assert_match(/patch :update, params: \{ id: @user, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content)
+      assert_match(/post users_url, params: \{ user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content)
+      assert_match(/patch user_url\(@user\), params: \{ user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content)
     end
   end
 
@@ -115,10 +115,10 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     run_generator ["User"]
 
     assert_file "test/controllers/users_controller_test.rb" do |content|
-      assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
+      assert_match(/class UsersControllerTest < ActionDispatch::IntegrationTest/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, params: \{ user: \{  \} \}/, content)
-      assert_match(/patch :update, params: \{ id: @user, user: \{  \} \}/, content)
+      assert_match(/post users_url, params: \{ user: \{  \} \}/, content)
+      assert_match(/patch user_url\(@user\), params: \{ user: \{  \} \}/, content)
     end
   end
 
@@ -236,10 +236,10 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
     run_generator ["User", "name:string", "age:integer", "organization:references{polymorphic}", "--api"]
 
     assert_file "test/controllers/users_controller_test.rb" do |content|
-      assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
+      assert_match(/class UsersControllerTest < ActionDispatch::IntegrationTest/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, params: \{ user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content)
-      assert_match(/patch :update, params: \{ id: @user, user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content)
+      assert_match(/post users_url, params: \{ user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content)
+      assert_match(/patch user_url\(@user\), params: \{ user: \{ age: @user\.age, name: @user\.name, organization_id: @user\.organization_id, organization_type: @user\.organization_type \} \}/, content)
       assert_no_match(/assert_redirected_to/, content)
     end
   end
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 0c3808a9a0..eb81ea3d0e 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -57,9 +57,9 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     end
 
     assert_file "test/controllers/product_lines_controller_test.rb" do |test|
-      assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, test)
-      assert_match(/post :create, params: \{ product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \} \}/, test)
-      assert_match(/patch :update, params: \{ id: @product_line, product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \} \}/, test)
+      assert_match(/class ProductLinesControllerTest < ActionDispatch::IntegrationTest/, test)
+      assert_match(/post product_lines_url, params: \{ product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \} \}/, test)
+      assert_match(/patch product_line_url\(@product_line\), params: \{ product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \} \}/, test)
     end
 
     # Views
@@ -135,9 +135,9 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     end
 
     assert_file "test/controllers/product_lines_controller_test.rb" do |test|
-      assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, test)
-      assert_match(/post :create, params: \{ product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \} \}/, test)
-      assert_match(/patch :update, params: \{ id: @product_line, product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \} \}/, test)
+      assert_match(/class ProductLinesControllerTest < ActionDispatch::IntegrationTest/, test)
+      assert_match(/post product_lines_url, params: \{ product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \} \}/, test)
+      assert_match(/patch product_line_url\(@product_line\), params: \{ product_line: \{ product_id: @product_line\.product_id, title: @product_line\.title, user_id: @product_line\.user_id \} \}/, test)
       assert_no_match(/assert_redirected_to/, test)
     end
 
@@ -161,10 +161,10 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     run_generator ["product_line"]
 
     assert_file "test/controllers/product_lines_controller_test.rb" do |content|
-      assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, content)
+      assert_match(/class ProductLinesControllerTest < ActionDispatch::IntegrationTest/, content)
       assert_match(/test "should get index"/, content)
-      assert_match(/post :create, params: \{ product_line: \{  \} \}/, content)
-      assert_match(/patch :update, params: \{ id: @product_line, product_line: \{  \} \}/, content)
+      assert_match(/post product_lines_url, params: \{ product_line: \{  \} \}/, content)
+      assert_match(/patch product_line_url\(@product_line\), params: \{ product_line: \{  \} \}/, content)
     end
   end
 
@@ -250,7 +250,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     end
 
     assert_file "test/controllers/admin/roles_controller_test.rb",
-                /class Admin::RolesControllerTest < ActionController::TestCase/
+                /class Admin::RolesControllerTest < ActionDispatch::IntegrationTest/
 
     # Views
     %w(index edit new show _form).each do |view|
-- 
cgit v1.2.3


From becf1bcb1d6e72e782995507ebc89d75db357184 Mon Sep 17 00:00:00 2001
From: eileencodes <eileencodes@gmail.com>
Date: Tue, 15 Dec 2015 13:56:47 -0500
Subject: Run railties generated app tests in test env

Running railties generated app tests in development env can cause unintended
consequences. The environments are different and tests aren't meant to be
run in development mode.

The changes to the generator exposed this issue where the random test
order in the generated apps could cause problems when those tests are
run in development mode.

Particularly we saw failures in `railties/test/application/rake_test.rb`
generated apps that used the scaffold to create applications and then
run the migration and immediately run the tests. The error we saw was
`ActiveRecord::RecordNotFound: Couldn't find User with 'id'=980190962`
and seemed to only occur if the destroy test ran first. I'm not entirely
sure _why_ this causes that error to be thrown but I believe it is
related to the environments being different.
---
 railties/test/application/rake_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties')

diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 0da0928b48..1d3550add9 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -186,7 +186,7 @@ module ApplicationTests
     def test_scaffold_tests_pass_by_default
       output = Dir.chdir(app_path) do
         `bin/rails generate scaffold user username:string password:string;
-         bin/rake db:migrate test`
+         RAILS_ENV=test bin/rake db:migrate test`
       end
 
       assert_match(/7 runs, 12 assertions, 0 failures, 0 errors/, output)
@@ -205,7 +205,7 @@ module ApplicationTests
 
       output = Dir.chdir(app_path) do
         `bin/rails generate scaffold user username:string password:string;
-         bin/rake db:migrate test`
+         RAILS_ENV=test bin/rake db:migrate test`
       end
 
       assert_match(/5 runs, 7 assertions, 0 failures, 0 errors/, output)
@@ -218,7 +218,7 @@ module ApplicationTests
 
       output = Dir.chdir(app_path) do
         `bin/rails generate scaffold LineItems product:references cart:belongs_to;
-         bin/rake db:migrate test`
+         RAILS_ENV=test bin/rake db:migrate test`
       end
 
       assert_match(/7 runs, 12 assertions, 0 failures, 0 errors/, output)
-- 
cgit v1.2.3


From 2067fff9e38df4e37bdbfc021cd6bb0c2d393a2a Mon Sep 17 00:00:00 2001
From: Genadi Samokovarov <gsamokovarov@gmail.com>
Date: Sat, 12 Dec 2015 14:25:00 +0100
Subject: Introduce ApplicationRecord, an Active Record layer supertype

It's pretty common for folks to monkey patch `ActiveRecord::Base` to
work around an issue or introduce extra functionality. Instead of
shoving even more stuff in `ActiveRecord::Base`, `ApplicationRecord` can
hold all those custom work the apps may need.

Now, we don't wanna encourage all of the application models to inherit
from `ActiveRecord::Base`, but we can encourage all the models that do,
to inherit from `ApplicationRecord`.

Newly generated applications have `app/models/application_record.rb`
present by default. The model generators are smart enough to recognize
that newly generated models have to inherit from `ApplicationRecord`,
but only if it's present.
---
 railties/lib/rails/generators/rails/app/app_generator.rb      |  6 ++++++
 .../rails/app/templates/app/models/application_record.rb      |  3 +++
 .../plugin/templates/app/models/application_record.rb.tt      |  6 ++++++
 railties/test/application/configuration_test.rb               |  1 +
 railties/test/application/rake_test.rb                        |  2 +-
 railties/test/generators/app_generator_test.rb                |  1 +
 railties/test/generators/model_generator_test.rb              | 11 +++++++++++
 7 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 railties/lib/rails/generators/rails/app/templates/app/models/application_record.rb
 create mode 100644 railties/lib/rails/generators/rails/plugin/templates/app/models/application_record.rb.tt

(limited to 'railties')

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 889154494d..9997cf3b35 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -293,6 +293,12 @@ module Rails
         end
       end
 
+      def delete_application_record_skipping_active_record
+        if options[:skip_active_record]
+          remove_file 'app/models/application_record.rb'
+        end
+      end
+
       def delete_active_record_initializers_skipping_active_record
         if options[:skip_active_record]
           remove_file 'config/initializers/active_record_belongs_to_required_by_default.rb'
diff --git a/railties/lib/rails/generators/rails/app/templates/app/models/application_record.rb b/railties/lib/rails/generators/rails/app/templates/app/models/application_record.rb
new file mode 100644
index 0000000000..10a4cba84d
--- /dev/null
+++ b/railties/lib/rails/generators/rails/app/templates/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/railties/lib/rails/generators/rails/plugin/templates/app/models/application_record.rb.tt b/railties/lib/rails/generators/rails/plugin/templates/app/models/application_record.rb.tt
new file mode 100644
index 0000000000..8aa3de78f1
--- /dev/null
+++ b/railties/lib/rails/generators/rails/plugin/templates/app/models/application_record.rb.tt
@@ -0,0 +1,6 @@
+<%= wrap_in_modules <<-rb.strip_heredoc
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+rb
+%>
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 25e749ac14..87e28288ee 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -228,6 +228,7 @@ module ApplicationTests
     end
 
     test "the application can be eager loaded even when there are no frameworks" do
+      FileUtils.rm_rf("#{app_path}/app/models/application_record.rb")
       FileUtils.rm_rf("#{app_path}/config/environments")
       add_to_config <<-RUBY
         config.eager_load = true
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index 0da0928b48..1b009e0742 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -98,7 +98,7 @@ module ApplicationTests
     end
 
     def test_code_statistics_sanity
-      assert_match "Code LOC: 7     Test LOC: 0     Code to Test Ratio: 1:0.0",
+      assert_match "Code LOC: 10     Test LOC: 0     Code to Test Ratio: 1:0.0",
         Dir.chdir(app_path){ `bin/rake stats` }
     end
 
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index dd2e931c5c..3f2ac3d2b6 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -334,6 +334,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
     run_generator [destination_root, "--skip-active-record"]
     assert_no_file "config/database.yml"
     assert_no_file "config/initializers/active_record_belongs_to_required_by_default.rb"
+    assert_no_file "app/models/application_record.rb"
     assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
     assert_file "test/test_helper.rb" do |helper_content|
       assert_no_match(/fixtures :all/, helper_content)
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index e1722b84b3..fb502ec0c5 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -35,6 +35,17 @@ class ModelGeneratorTest < Rails::Generators::TestCase
     assert_no_migration "db/migrate/create_accounts.rb"
   end
 
+  def test_model_with_existent_application_record
+    mkdir_p "#{destination_root}/app/models"
+    touch "#{destination_root}/app/models/application_record.rb"
+
+    Dir.chdir(destination_root) do
+      run_generator ["account"]
+    end
+
+    assert_file "app/models/account.rb", /class Account < ApplicationRecord/
+  end
+
   def test_plural_names_are_singularized
     content = run_generator ["accounts".freeze]
     assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/
-- 
cgit v1.2.3


From 877a411d0c16baa4e670dae9a28f5cfcc201adc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 16 Dec 2015 16:30:58 -0200
Subject: Use sprockets 3 in the Rails 5 release

---
 railties/lib/rails/generators/app_base.rb         | 2 --
 railties/test/application/asset_debugging_test.rb | 5 +++--
 railties/test/application/assets_test.rb          | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index c243b0c60e..bc5c8052dc 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -218,8 +218,6 @@ module Rails
       def rails_gemfile_entry
         dev_edge_common = [
             GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'),
-            GemfileEntry.github('sprockets', 'rails/sprockets'),
-            GemfileEntry.github('sass-rails', 'rails/sass-rails'),
             GemfileEntry.github('arel', 'rails/arel'),
             GemfileEntry.github('rack', 'rack/rack')
           ]
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index 8b83784ed6..0659110ac0 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -58,7 +58,7 @@ module ApplicationTests
       assert_no_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js"><\/script>/, last_response.body)
     end
 
-    test "assets are served with sourcemaps when compile is true and debug_assets params is true" do
+    test "assets aren't concatenated when compile is true is on and debug_assets params is true" do
       add_to_env_config "production", "config.assets.compile = true"
 
       # Load app env
@@ -67,7 +67,8 @@ module ApplicationTests
       class ::PostsController < ActionController::Base ; end
 
       get '/posts?debug_assets=true'
-      assert_match(/<script src="\/assets\/application(\.debug)?-([0-z]+)\.js"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/application(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
+      assert_match(/<script src="\/assets\/xmlhr(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
     end
   end
 end
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 18882e1855..7e9a9a5f3b 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -174,7 +174,7 @@ module ApplicationTests
 
       precompile!
 
-      assert_file_exists("#{app_path}/public/assets/something-*.js")
+      assert_file_exists("#{app_path}/public/assets/something/index-*.js")
     end
 
     test 'precompile use assets defined in app env config' do
@@ -410,7 +410,7 @@ module ApplicationTests
 
       precompile!
 
-      assert_equal "Post\n;\n", File.read(Dir["#{app_path}/public/assets/application-*.js"].first)
+      assert_equal "Post;\n", File.read(Dir["#{app_path}/public/assets/application-*.js"].first)
     end
 
     test "initialization on the assets group should set assets_dir" do
@@ -458,9 +458,9 @@ module ApplicationTests
       class ::PostsController < ActionController::Base; end
 
       get '/posts', {}, {'HTTPS'=>'off'}
-      assert_match('src="http://example.com/assets/application.debug.js', last_response.body)
+      assert_match('src="http://example.com/assets/application.self.js', last_response.body)
       get '/posts', {}, {'HTTPS'=>'on'}
-      assert_match('src="https://example.com/assets/application.debug.js', last_response.body)
+      assert_match('src="https://example.com/assets/application.self.js', last_response.body)
     end
 
     test "asset urls should be protocol-relative if no request is in scope" do
-- 
cgit v1.2.3