aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-07 19:55:29 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-07 19:55:29 -0500
commit0994d11f26c318e63dd4189ea2dfec409132e529 (patch)
tree885415e88c615376a7385abba887699f04b3a172 /actionpack/test
parentc77e6ace66b34390e9c1e173c580d86e88915267 (diff)
parent1767c4b2da21379862a9ab1a4316d8da6b820a2a (diff)
downloadrails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.gz
rails-0994d11f26c318e63dd4189ea2dfec409132e529.tar.bz2
rails-0994d11f26c318e63dd4189ea2dfec409132e529.zip
Merge branch 'master' into testing
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/template/text_helper_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 5f9f715819..095c952d67 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -221,6 +221,7 @@ class TextHelperTest < ActionView::TestCase
http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
http://en.wikipedia.org/wiki/Sprite_(computer_graphics)
http://en.wikipedia.org/wiki/Texas_hold'em
+ https://www.google.com/doku.php?id=gps:resource:scs:start
)
urls.each do |url|