aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/routing_test.rb4
-rw-r--r--actionpack/test/controller/selector_test.rb4
-rw-r--r--actionpack/test/controller/test_test.rb2
3 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index e784244c88..8f3709de3d 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -882,14 +882,14 @@ class DynamicSegmentTest < Test::Unit::TestCase
end
def test_build_pattern_non_optional_with_no_captures
- # Non optioanl
+ # Non optional
a_segment = ROUTING::DynamicSegment.new
a_segment.regexp = /\d+/ #number_of_captures is 0
assert_equal "(\\d+)stuff", a_segment.build_pattern('stuff')
end
def test_build_pattern_non_optional_with_captures
- # Non optioanl
+ # Non optional
a_segment = ROUTING::DynamicSegment.new
a_segment.regexp = /(\d+)(.*?)/ #number_of_captures is 2
assert_equal "((\\d+)(.*?))stuff", a_segment.build_pattern('stuff')
diff --git a/actionpack/test/controller/selector_test.rb b/actionpack/test/controller/selector_test.rb
index 6ae46594ae..ca106ba236 100644
--- a/actionpack/test/controller/selector_test.rb
+++ b/actionpack/test/controller/selector_test.rb
@@ -85,11 +85,11 @@ class SelectorTest < Test::Unit::TestCase
assert_equal 2, @matches.size
assert_equal "2", @matches[0].attributes["id"]
assert_equal "3", @matches[1].attributes["id"]
- # Match alement with attribute value.
+ # Match element with attribute value.
select("*[title=foo]")
assert_equal 1, @matches.size
assert_equal "3", @matches[0].attributes["id"]
- # Match alement with attribute and attribute value.
+ # Match element with attribute and attribute value.
select("[bar=foo][title]")
assert_equal 1, @matches.size
assert_equal "2", @matches[0].attributes["id"]
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 8fbe980eec..9b90d69e95 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -214,7 +214,7 @@ XML
def test_assert_tag_descendant
process :test_html_output
- # there is a tag with a decendant 'li' tag
+ # there is a tag with a descendant 'li' tag
assert_tag :descendant => { :tag => "li" }
# there is no tag with a descendant 'html' tag
assert_no_tag :descendant => { :tag => "html" }