From d643cbe7f8b85db222feed4be14821cfe338cc6c Mon Sep 17 00:00:00 2001 From: Pavel Pravosud Date: Fri, 11 Jan 2013 10:20:43 +0700 Subject: Changed if ! to unless --- railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb index 9a7ea1f657..36589d65e2 100644 --- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb @@ -10,7 +10,7 @@ module Rails class_option :stylesheet_engine, desc: "Engine for Stylesheets" def handle_skip - @options = @options.merge(stylesheet_engine: false) if !options[:stylesheets] + @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] end hook_for :scaffold_controller, required: true -- cgit v1.2.3 From cca17296de14048b2a2a67576224b8cc29395ede Mon Sep 17 00:00:00 2001 From: Pavel Pravosud Date: Fri, 11 Jan 2013 10:26:39 +0700 Subject: More consistent quotes in scaffold generator --- .../generators/rails/scaffold_controller/templates/controller.rb | 4 ++-- railties/test/generators/scaffold_controller_generator_test.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb index 6f7eb07229..e813437d75 100644 --- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb @@ -31,7 +31,7 @@ class <%= controller_class_name %>Controller < ApplicationController if @<%= orm_instance.save %> redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %> else - render action: "new" + render action: 'new' end end @@ -40,7 +40,7 @@ class <%= controller_class_name %>Controller < ApplicationController if @<%= orm_instance.update("#{singular_table_name}_params") %> redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %> else - render action: "edit" + render action: 'edit' end end diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb index bd99e78644..c34ce285e3 100644 --- a/railties/test/generators/scaffold_controller_generator_test.rb +++ b/railties/test/generators/scaffold_controller_generator_test.rb @@ -162,7 +162,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase def test_new_hash_style run_generator assert_file "app/controllers/users_controller.rb" do |content| - assert_match(/render action: "new"/, content) + assert_match(/render action: 'new'/, content) end end end -- cgit v1.2.3