mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Revert "Merge pull request #22569 from seuros/remove-test-case"
This reverts commit9712a7a12b
, reversing changes made to3e65c3d388
. Reverting because this caused test failures and while we have a followup branch there is still one failure that happens randomly and isn't straight forward to fix.
This commit is contained in:
parent
0b224ddd55
commit
2dd64a7bbb
9 changed files with 30 additions and 31 deletions
|
@ -1,7 +1,7 @@
|
|||
require 'test_helper'
|
||||
|
||||
<% module_namespacing do -%>
|
||||
class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
|
||||
class <%= class_name %>ControllerTest < ActionController::TestCase
|
||||
<% if mountable_engine? -%>
|
||||
setup do
|
||||
@routes = Engine.routes
|
||||
|
@ -15,7 +15,7 @@ class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
|
|||
<% else -%>
|
||||
<% actions.each do |action| -%>
|
||||
test "should get <%= action %>" do
|
||||
get url_for(action: :<%= action %>)
|
||||
get :<%= action %>
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'test_helper'
|
||||
|
||||
<% module_namespacing do -%>
|
||||
class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest
|
||||
class <%= controller_class_name %>ControllerTest < ActionController::TestCase
|
||||
setup do
|
||||
@<%= singular_table_name %> = <%= fixture_name %>(:one)
|
||||
<% if mountable_engine? -%>
|
||||
|
@ -10,31 +10,31 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
|
|||
end
|
||||
|
||||
test "should get index" do
|
||||
get url_for( controller: :<%= controller_name %>, action: :index )
|
||||
get :index
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should create <%= singular_table_name %>" do
|
||||
assert_difference('<%= class_name %>.count') do
|
||||
post url_for( controller: :<%= controller_name %>, action: :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %> )
|
||||
post :create, params: { <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
|
||||
end
|
||||
|
||||
assert_response 201
|
||||
end
|
||||
|
||||
test "should show <%= singular_table_name %>" do
|
||||
get url_for( controller: :<%= controller_name %>, action: :show, id: <%= "@#{singular_table_name}" %> )
|
||||
get :show, params: { id: <%= "@#{singular_table_name}" %> }
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should update <%= singular_table_name %>" do
|
||||
patch url_for( controller: :<%= controller_name %>, action: :update, id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %> )
|
||||
patch :update, params: { id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %> }
|
||||
assert_response 200
|
||||
end
|
||||
|
||||
test "should destroy <%= singular_table_name %>" do
|
||||
assert_difference('<%= class_name %>.count', -1) do
|
||||
delete url_for( controller: :<%= controller_name %>, action: :destroy, id: <%= "@#{singular_table_name}" %> )
|
||||
delete :destroy, params: { id: <%= "@#{singular_table_name}" %> }
|
||||
end
|
||||
|
||||
assert_response 204
|
||||
|
|
|
@ -1,51 +1,50 @@
|
|||
require 'test_helper'
|
||||
|
||||
<% module_namespacing do -%>
|
||||
class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest
|
||||
class <%= controller_class_name %>ControllerTest < ActionController::TestCase
|
||||
setup do
|
||||
@<%= singular_table_name %> = <%= fixture_name %>(:one)
|
||||
<% if mountable_engine? -%>
|
||||
|
||||
@routes = Engine.routes
|
||||
<% end -%>
|
||||
end
|
||||
|
||||
test "should get index" do
|
||||
get url_for( controller: :<%= controller_name %>, action: :index )
|
||||
get :index
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should get new" do
|
||||
get url_for( controller: :<%= controller_name %>, action: :new )
|
||||
get :new
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should create <%= singular_table_name %>" do
|
||||
assert_difference('<%= class_name %>.count') do
|
||||
post url_for( controller: :<%= controller_name %>, action: :create, <%= "#{singular_table_name}: { #{attributes_hash} }" %> )
|
||||
post :create, 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 url_for( controller: :<%= controller_name %>, action: :show, id: <%= "@#{singular_table_name}" %> )
|
||||
get :show, params: { id: <%= "@#{singular_table_name}" %> }
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should get edit" do
|
||||
get url_for( controller: :<%= controller_name %>, action: :edit, id: <%= "@#{singular_table_name}" %> )
|
||||
get :edit, params: { id: <%= "@#{singular_table_name}" %> }
|
||||
assert_response :success
|
||||
end
|
||||
|
||||
test "should update <%= singular_table_name %>" do
|
||||
patch url_for( controller: :<%= controller_name %>, action: :update, id: <%= "@#{singular_table_name}" %>, <%= "#{singular_table_name}: { #{attributes_hash} }" %> )
|
||||
patch :update, params: { id: <%= "@#{singular_table_name}" %>, <%= "#{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 url_for( controller: :<%= controller_name %>, action: :destroy, id: <%= "@#{singular_table_name}" %> )
|
||||
delete :destroy, params: { id: <%= "@#{singular_table_name}" %> }
|
||||
end
|
||||
|
||||
assert_redirected_to <%= index_helper %>_path
|
||||
|
|
|
@ -26,7 +26,7 @@ class CodeStatisticsCalculatorTest < ActiveSupport::TestCase
|
|||
|
||||
test 'count number of methods in MiniTest file' do
|
||||
code = <<-RUBY
|
||||
class FooTest < ActionDispatch::IntegrationTest
|
||||
class FooTest < ActionController::TestCase
|
||||
test 'expectation' do
|
||||
assert true
|
||||
end
|
||||
|
|
|
@ -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 < ActionDispatch::IntegrationTest/
|
||||
/module TestApp\n class ProductLinesControllerTest < ActionController::TestCase/
|
||||
|
||||
# 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 < ActionDispatch::IntegrationTest/
|
||||
/module TestApp\n class Admin::RolesControllerTest < ActionController::TestCase/
|
||||
|
||||
# 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 < ActionDispatch::IntegrationTest/
|
||||
/module TestApp\n class Admin::User::Special::RolesControllerTest < ActionController::TestCase/
|
||||
|
||||
# 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 < ActionDispatch::IntegrationTest/
|
||||
/module TestApp\n class Admin::RolesControllerTest < ActionController::TestCase/
|
||||
end
|
||||
end
|
||||
|
|
|
@ -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 < ActionDispatch::IntegrationTest/
|
||||
assert_file "test/controllers/accounts_controller_test.rb", /class AccountsControllerTest < ActionController::TestCase/
|
||||
|
||||
assert_file "app/helpers/accounts_helper.rb", /module AccountsHelper/
|
||||
end
|
||||
|
|
|
@ -104,7 +104,7 @@ 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 < ActionDispatch::IntegrationTest/, content)
|
||||
assert_match(/class UsersControllerTest < ActionController::TestCase/, 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)
|
||||
|
@ -115,7 +115,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
|
|||
run_generator ["User"]
|
||||
|
||||
assert_file "test/controllers/users_controller_test.rb" do |content|
|
||||
assert_match(/class UsersControllerTest < ActionDispatch::IntegrationTest/, content)
|
||||
assert_match(/class UsersControllerTest < ActionController::TestCase/, content)
|
||||
assert_match(/test "should get index"/, content)
|
||||
assert_match(/post :create, params: \{ user: \{ \} \}/, content)
|
||||
assert_match(/patch :update, params: \{ id: @user, user: \{ \} \}/, content)
|
||||
|
@ -236,7 +236,7 @@ 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 < ActionDispatch::IntegrationTest/, content)
|
||||
assert_match(/class UsersControllerTest < ActionController::TestCase/, 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)
|
||||
|
|
|
@ -57,7 +57,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
|
|||
end
|
||||
|
||||
assert_file "test/controllers/product_lines_controller_test.rb" do |test|
|
||||
assert_match(/class ProductLinesControllerTest < ActionDispatch::IntegrationTest/, 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)
|
||||
end
|
||||
|
@ -135,7 +135,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
|
|||
end
|
||||
|
||||
assert_file "test/controllers/product_lines_controller_test.rb" do |test|
|
||||
assert_match(/class ProductLinesControllerTest < ActionDispatch::IntegrationTest/, 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_no_match(/assert_redirected_to/, test)
|
||||
|
@ -161,7 +161,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
|
|||
run_generator ["product_line"]
|
||||
|
||||
assert_file "test/controllers/product_lines_controller_test.rb" do |content|
|
||||
assert_match(/class ProductLinesControllerTest < ActionDispatch::IntegrationTest/, content)
|
||||
assert_match(/class ProductLinesControllerTest < ActionController::TestCase/, 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)
|
||||
|
@ -250,7 +250,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
|
|||
end
|
||||
|
||||
assert_file "test/controllers/admin/roles_controller_test.rb",
|
||||
/class Admin::RolesControllerTest < ActionDispatch::IntegrationTest/
|
||||
/class Admin::RolesControllerTest < ActionController::TestCase/
|
||||
|
||||
# Views
|
||||
%w(index edit new show _form).each do |view|
|
||||
|
|
|
@ -6,7 +6,7 @@ module ActionController
|
|||
end
|
||||
end
|
||||
|
||||
class InfoControllerTest < ActionDispatch::IntegrationTest
|
||||
class InfoControllerTest < ActionController::TestCase
|
||||
tests Rails::InfoController
|
||||
|
||||
def setup
|
||||
|
|
Loading…
Reference in a new issue