Skip to content

Commit

Permalink
Fix end alignment
Browse files Browse the repository at this point in the history
  • Loading branch information
kamipo committed Mar 21, 2021
1 parent 1dcad65 commit 043184d
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 22 deletions.
8 changes: 4 additions & 4 deletions actionpack/test/controller/resources_test.rb
Expand Up @@ -782,11 +782,11 @@ def test_multiple_with_path_segment_and_controller
with_routing do |set|
set.draw do
resources :products do
resources :product_reviews, path: "reviews", controller: "messages"
end
resources :product_reviews, path: "reviews", controller: "messages"
end
resources :tutors do
resources :tutor_reviews, path: "reviews", controller: "comments"
end
resources :tutor_reviews, path: "reviews", controller: "comments"
end
end

assert_simply_restful_for :product_reviews, controller: "messages", as: "reviews", name_prefix: "product_", path_prefix: "products/1/", options: { product_id: "1" }
Expand Down
6 changes: 3 additions & 3 deletions activerecord/test/activejob/destroy_association_async_test.rb
Expand Up @@ -74,10 +74,10 @@ class DestroyAssociationAsyncTest < ActiveRecord::TestCase
parent.destroy

assert_difference -> { DlKeyedJoin.count }, -2 do
assert_difference -> { DlKeyedHasManyThrough.count }, -2 do
perform_enqueued_jobs only: ActiveRecord::DestroyAssociationAsyncJob
assert_difference -> { DlKeyedHasManyThrough.count }, -2 do
perform_enqueued_jobs only: ActiveRecord::DestroyAssociationAsyncJob
end
end
end
ensure
DlKeyedHasManyThrough.delete_all
DestroyAsyncParent.delete_all
Expand Down
29 changes: 14 additions & 15 deletions activerecord/test/schema/schema.rb
Expand Up @@ -323,32 +323,31 @@
end

create_table :dl_keyed_belongs_to_soft_deletes, force: true do |t|
t.references :destroy_async_parent_soft_delete,
index: { name: :soft_del_parent }
t.references :destroy_async_parent_soft_delete, index: { name: :soft_del_parent }
t.boolean :deleted
end

create_table :dl_keyed_has_ones, force: true, id: false do |t|
t.primary_key :has_one_key
t.primary_key :has_one_key

t.references :destroy_async_parent
t.references :destroy_async_parent_soft_delete
end
t.references :destroy_async_parent
t.references :destroy_async_parent_soft_delete
end

create_table :dl_keyed_has_manies, force: true, id: false do |t|
t.primary_key :many_key
t.references :destroy_async_parent
end
t.primary_key :many_key
t.references :destroy_async_parent
end

create_table :dl_keyed_has_many_throughs, force: true, id: false do |t|
t.primary_key :through_key
end
t.primary_key :through_key
end

create_table :dl_keyed_joins, force: true, id: false do |t|
t.primary_key :joins_key
t.references :destroy_async_parent
t.references :dl_keyed_has_many_through
end
t.primary_key :joins_key
t.references :destroy_async_parent
t.references :dl_keyed_has_many_through
end

create_table :developers, force: true do |t|
t.string :name
Expand Down

0 comments on commit 043184d

Please sign in to comment.