kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #5546 from mptre/master

Browse source 
Fixed missing space bug introduces in rails/rails@9299bfd
This commit is contained in:
Piotr Sarnacki 2012-03-23 03:06:42 -07:00
commit 39961f8099
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/lib/rails/source_annotation_extractor.rb
View file

@ -22,7 +22,7 @@ class SourceAnnotationExtractor
# If +options+ has a flag <tt>:tag</tt> the tag is shown as in the example above. # If +options+ has a flag <tt>:tag</tt> the tag is shown as in the example above.
# Otherwise the string contains just line and text. # Otherwise the string contains just line and text.
def to_s(options={}) def to_s(options={})
s = "[#{line.to_s.rjust(options[:indent])}]" s = "[#{line.to_s.rjust(options[:indent])}] "
s << "[#{tag}] " if options[:tag] s << "[#{tag}] " if options[:tag]
s << text s << text
end end

7
railties/test/application/rake/notes_test.rb
View file

@ -28,7 +28,7 @@ module ApplicationTests
Dir.chdir(app_path) do Dir.chdir(app_path) do
output = `bundle exec rake notes` output = `bundle exec rake notes`
lines = output.scan(/\[([0-9\s]+)\]/).flatten lines = output.scan(/\[([0-9\s]+)\](\s)/)
assert_match /note in erb/, output assert_match /note in erb/, output
assert_match /note in haml/, output assert_match /note in haml/, output
@ -38,8 +38,9 @@ module ApplicationTests
assert_equal 5, lines.size assert_equal 5, lines.size
lines.each do |line_number| lines.each do |line|
assert_equal 4, line_number.size assert_equal 4, line[0].size
assert_equal ' ', line[1]
end end
end end