Skip to content
This repository
Browse code

Use right option for excerpt text helper in tests, fix build

`excerpt` text helper uses `:radius`, not `line_width` (that is used by
`word_wrap` helper).

Also cleanup some whitespaces.
  • Loading branch information...
commit c5205041f65206a1490063b08915e7b2a2151a61 1 parent 879611f
Carlos Antonio da Silva authored
4  actionpack/lib/action_view/helpers/text_helper.rb
@@ -113,7 +113,7 @@ def highlight(text, phrases, *args)
113 113
         unless args.empty?
114 114
           ActiveSupport::Deprecation.warn "Calling highlight with a highlighter as an argument is deprecated. " \
115 115
           "Please call with :highlighter => '#{args[0]}' instead.", caller
116  
-          
  116
+
117 117
           options[:highlighter] = args[0] || '<strong class="highlight">\1</strong>'
118 118
         end
119 119
         options.reverse_merge!(:highlighter => '<strong class="highlight">\1</strong>')
@@ -161,7 +161,7 @@ def excerpt(text, phrase, *args)
161 161
         unless args.empty?
162 162
           ActiveSupport::Deprecation.warn "Calling excerpt with radius and omission as arguments is deprecated. " \
163 163
           "Please call with :radius => #{args[0]}#{", :omission => '#{args[1]}'" if args[1]} instead.", caller
164  
-          
  164
+
165 165
           options[:radius] = args[0] || 100
166 166
           options[:omission] = args[1] || "..."
167 167
         end
16  actionpack/test/template/text_helper_test.rb
@@ -130,10 +130,10 @@ def test_highlight
130 130
 
131 131
     assert_equal '   ', highlight('   ', 'blank text is returned verbatim')
132 132
   end
133  
-  
  133
+
134 134
   def test_highlight_old_api_is_depcrecated
135 135
     assert_deprecated("Calling highlight with a highlighter as an argument is deprecated. Please call with :highlighter => '<mark>\\1</mark>' instead.") do
136  
-      highlight("This is a beautiful morning", "beautiful", '<mark>\1</mark>') 
  136
+      highlight("This is a beautiful morning", "beautiful", '<mark>\1</mark>')
137 137
     end
138 138
   end
139 139
 
@@ -205,13 +205,13 @@ def test_excerpt
205 205
     assert_equal("...iful morning", excerpt("This is a beautiful morning", "morning", :radius => 5))
206 206
     assert_nil excerpt("This is a beautiful morning", "day")
207 207
   end
208  
-  
  208
+
209 209
   def test_excerpt_old_api_is_depcrecated
210 210
     assert_deprecated("Calling excerpt with radius and omission as arguments is deprecated. Please call with :radius => 5 instead.") do
211  
-      excerpt("This is a beautiful morning", "morning", 5) 
  211
+      excerpt("This is a beautiful morning", "morning", 5)
212 212
     end
213 213
     assert_deprecated("Calling excerpt with radius and omission as arguments is deprecated. Please call with :radius => 5, :omission => 'mor' instead.") do
214  
-      excerpt("This is a beautiful morning", "morning", 5, "mor") 
  214
+      excerpt("This is a beautiful morning", "morning", 5, "mor")
215 215
     end
216 216
   end
217 217
 
@@ -253,10 +253,10 @@ def test_excerpt_with_omission
253 253
   if RUBY_VERSION < '1.9'
254 254
     def test_excerpt_with_utf8
255 255
       with_kcode('u') do
256  
-        assert_equal("...\357\254\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', :line_width => 8))
  256
+        assert_equal("...\357\254\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', :radius => 8))
257 257
       end
258 258
       with_kcode('none') do
259  
-        assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', :line_width => 8))
  259
+        assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', :radius => 8))
260 260
       end
261 261
     end
262 262
   else
@@ -270,7 +270,7 @@ def test_excerpt_with_utf8
270 270
   def test_word_wrap
271 271
     assert_equal("my very very\nvery long\nstring", word_wrap("my very very very long string", :line_width => 15))
272 272
   end
273  
-  
  273
+
274 274
   def test_word_wrap_old_api_is_depcrecated
275 275
     assert_deprecated("Calling word_wrap with line_width as an argument is deprecated. Please call with :line_width => 15 instead.") do
276 276
       word_wrap("my very very very long string", 15)

0 notes on commit c520504

Please sign in to comment.
Something went wrong with that request. Please try again.