Skip to content
Browse files

Fixed tests

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@767 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 41ea696 commit fd6abf0a59c91717ce30f5728ee6150184241d78 @dhh dhh committed Feb 23, 2005
View
4 actionpack/test/template/form_options_helper_test.rb
@@ -1,7 +1,7 @@
require 'test/unit'
require File.dirname(__FILE__) + '/../../lib/action_view/helpers/form_options_helper'
-class TimeZone
+class MockTimeZone
attr_reader :name
def initialize( name )
@@ -21,6 +21,8 @@ def to_s
end
end
+ActionView::Helpers::FormOptionsHelper::TimeZone = MockTimeZone
+
class FormOptionsHelperTest < Test::Unit::TestCase
include ActionView::Helpers::FormOptionsHelper
View
7 actionpack/test/template/url_helper_test.rb
@@ -2,6 +2,8 @@
require File.dirname(__FILE__) + '/../../lib/action_view/helpers/url_helper'
require File.dirname(__FILE__) + '/../../lib/action_view/helpers/tag_helper'
+RequestMock = Struct.new("Request", :request_uri)
+
class UrlHelperTest < Test::Unit::TestCase
include ActionView::Helpers::UrlHelper
include ActionView::Helpers::TagHelper
@@ -40,11 +42,12 @@ def test_link_to_image
end
def test_link_unless_current
- @params = { "controller" => "weblog", "action" => "show"}
+ @request = RequestMock.new("http://www.world.com")
assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog")
+ @request = RequestMock.new("http://www.notworld.com")
assert "<a href=\"http://www.world.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
- @params = { "controller" => "weblog", "action" => "show", "id" => "1"}
+ @request = RequestMock.new("http://www.world.com")
assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog", :id => 1)
end

0 comments on commit fd6abf0

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