Skip to content

Commit 1233fc6

Browse files
Fix scaffold controller generator tests
1 parent 7d42317 commit 1233fc6

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

railties/test/generators/scaffold_controller_generator_test.rb

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,13 @@ def test_controller_skeleton_is_created
2020
assert_match(/@users = User\.all/, m)
2121
end
2222

23-
assert_instance_method :show, content do |m|
24-
assert_match(/@user = User\.find\(params\[:id\]\)/, m)
25-
end
23+
assert_instance_method :show, content
2624

2725
assert_instance_method :new, content do |m|
2826
assert_match(/@user = User\.new/, m)
2927
end
3028

31-
assert_instance_method :edit, content do |m|
32-
assert_match(/@user = User\.find\(params\[:id\]\)/, m)
33-
end
29+
assert_instance_method :edit, content
3430

3531
assert_instance_method :create, content do |m|
3632
assert_match(/@user = User\.new\(user_params\)/, m)
@@ -39,16 +35,18 @@ def test_controller_skeleton_is_created
3935
end
4036

4137
assert_instance_method :update, content do |m|
42-
assert_match(/@user = User\.find\(params\[:id\]\)/, m)
4338
assert_match(/@user\.update_attributes\(user_params\)/, m)
4439
assert_match(/@user\.errors/, m)
4540
end
4641

4742
assert_instance_method :destroy, content do |m|
48-
assert_match(/@user = User\.find\(params\[:id\]\)/, m)
4943
assert_match(/@user\.destroy/, m)
5044
end
5145

46+
assert_instance_method :set_user, content do |m|
47+
assert_match(/@user = User\.find\(params\[:id\]\)/, m)
48+
end
49+
5250
assert_match(/def user_params/, content)
5351
assert_match(/params\.require\(:user\)\.permit\(:name, :age\)/, content)
5452
end

0 commit comments

Comments
 (0)