Correct indentation in a couple spots. Closes #10671 [l.guidi, rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8527 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
001fe6a435
commit
14f6440ed6
|
@ -1,5 +1,7 @@
|
||||||
*SVN*
|
*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]
|
* 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]
|
* Ensure that test case setup is run even if overridden. #10382 [Josh Peek]
|
||||||
|
|
|
@ -204,9 +204,9 @@ class SanitizerTest < Test::Unit::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_should_sanitize_with_trailing_space
|
def test_should_sanitize_with_trailing_space
|
||||||
raw = "display:block; "
|
raw = "display:block; "
|
||||||
expected = "display: block;"
|
expected = "display: block;"
|
||||||
assert_equal expected, sanitize_css(raw)
|
assert_equal expected, sanitize_css(raw)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_should_sanitize_xul_style_attributes
|
def test_should_sanitize_xul_style_attributes
|
||||||
|
|
|
@ -310,26 +310,26 @@ HELP
|
||||||
logger.exists relative_path
|
logger.exists relative_path
|
||||||
else
|
else
|
||||||
logger.create relative_path
|
logger.create relative_path
|
||||||
unless options[:pretend]
|
unless options[:pretend]
|
||||||
FileUtils.mkdir_p(path)
|
FileUtils.mkdir_p(path)
|
||||||
|
|
||||||
# Subversion doesn't do path adds, so we need to add
|
# Subversion doesn't do path adds, so we need to add
|
||||||
# each directory individually.
|
# each directory individually.
|
||||||
# So stack up the directory tree and add the paths to
|
# So stack up the directory tree and add the paths to
|
||||||
# subversion in order without recursion.
|
# subversion in order without recursion.
|
||||||
if options[:svn]
|
if options[:svn]
|
||||||
stack=[relative_path]
|
stack=[relative_path]
|
||||||
until File.dirname(stack.last) == stack.last # dirname('.') == '.'
|
until File.dirname(stack.last) == stack.last # dirname('.') == '.'
|
||||||
stack.push File.dirname(stack.last)
|
stack.push File.dirname(stack.last)
|
||||||
end
|
end
|
||||||
stack.reverse_each do |rel_path|
|
stack.reverse_each do |rel_path|
|
||||||
svn_path = destination_path(rel_path)
|
svn_path = destination_path(rel_path)
|
||||||
system("svn add -N #{svn_path}") unless File.directory?(File.join(svn_path, '.svn'))
|
system("svn add -N #{svn_path}") unless File.directory?(File.join(svn_path, '.svn'))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Display a README.
|
# Display a README.
|
||||||
def readme(*relative_sources)
|
def readme(*relative_sources)
|
||||||
|
|
Loading…
Reference in New Issue