Option name definition :model-name change to :model_name.
assert_match expectation use String instead of Regexp.
Revert a part of 9f64101634.
Rail::Generators::ResourceHelper#controller_name is no more used.