diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/html-scanner/sanitizer_test.rb | 6 | ||||
| -rw-r--r-- | railties/lib/rails_generator/commands.rb | 38 |
3 files changed, 24 insertions, 22 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index bb310d3792..d4668b175a 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Correct indentation in tests. Closes #10671 [l.guidi] + * Fix that auto_link looks for ='s in url paths (Amazon urls have them). Closes #10640 [bgreenlee] * Ensure that test case setup is run even if overridden. #10382 [Josh Peek] diff --git a/actionpack/test/controller/html-scanner/sanitizer_test.rb b/actionpack/test/controller/html-scanner/sanitizer_test.rb index a9f4e88742..fc39a2a0de 100644 --- a/actionpack/test/controller/html-scanner/sanitizer_test.rb +++ b/actionpack/test/controller/html-scanner/sanitizer_test.rb @@ -204,9 +204,9 @@ class SanitizerTest < Test::Unit::TestCase end def test_should_sanitize_with_trailing_space - raw = "display:block; " - expected = "display: block;" - assert_equal expected, sanitize_css(raw) + raw = "display:block; " + expected = "display: block;" + assert_equal expected, sanitize_css(raw) end def test_should_sanitize_xul_style_attributes diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb index 6f90a44b8a..cbedd36d0e 100644 --- a/railties/lib/rails_generator/commands.rb +++ b/railties/lib/rails_generator/commands.rb @@ -310,26 +310,26 @@ HELP logger.exists relative_path else logger.create relative_path - unless options[:pretend] - FileUtils.mkdir_p(path) + unless options[:pretend] + FileUtils.mkdir_p(path) - # Subversion doesn't do path adds, so we need to add - # each directory individually. - # So stack up the directory tree and add the paths to - # subversion in order without recursion. - if options[:svn] - stack=[relative_path] - until File.dirname(stack.last) == stack.last # dirname('.') == '.' - stack.push File.dirname(stack.last) - end - stack.reverse_each do |rel_path| - svn_path = destination_path(rel_path) - system("svn add -N #{svn_path}") unless File.directory?(File.join(svn_path, '.svn')) - end - end - end - end - end + # Subversion doesn't do path adds, so we need to add + # each directory individually. + # So stack up the directory tree and add the paths to + # subversion in order without recursion. + if options[:svn] + stack=[relative_path] + until File.dirname(stack.last) == stack.last # dirname('.') == '.' + stack.push File.dirname(stack.last) + end + stack.reverse_each do |rel_path| + svn_path = destination_path(rel_path) + system("svn add -N #{svn_path}") unless File.directory?(File.join(svn_path, '.svn')) + end + end + end + end + end # Display a README. def readme(*relative_sources) |