TeX and CSS tweaks.
Sync with latest Instiki Trunk (Updates Rails to 1.2.2)
This commit is contained in:
Jacques Distler
parent
0ac586ee25
commit
c358389f25
443 changed files with 24218 additions and 9823 deletions
|
|
@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../lib/action_view/helpers/url_helper'
|
|||
require File.dirname(__FILE__) + '/../../lib/action_view/helpers/asset_tag_helper'
|
||||
require File.dirname(__FILE__) + '/../../lib/action_view/helpers/tag_helper'
|
||||
|
||||
RequestMock = Struct.new("Request", :request_uri)
|
||||
RequestMock = Struct.new("Request", :request_uri, :protocol, :host_with_port)
|
||||
|
||||
class UrlHelperTest < Test::Unit::TestCase
|
||||
include ActionView::Helpers::AssetTagHelper
|
||||
|
|
@ -13,7 +13,7 @@ class UrlHelperTest < Test::Unit::TestCase
|
|||
|
||||
def setup
|
||||
@controller = Class.new do
|
||||
attr_accessor :url
|
||||
attr_accessor :url, :request
|
||||
def url_for(options, *parameters_for_method_reference)
|
||||
url
|
||||
end
|
||||
|
|
@ -28,7 +28,7 @@ class UrlHelperTest < Test::Unit::TestCase
|
|||
assert_equal "http://www.example.com?a=b&c=d", url_for(:a => 'b', :c => 'd', :escape => true)
|
||||
assert_equal "http://www.example.com?a=b&c=d", url_for(:a => 'b', :c => 'd', :escape => false)
|
||||
end
|
||||
|
||||
|
||||
# todo: missing test cases
|
||||
def test_button_to_with_straight_url
|
||||
assert_dom_equal "<form method=\"post\" action=\"http://www.example.com\" class=\"button-to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com")
|
||||
|
|
@ -38,6 +38,10 @@ class UrlHelperTest < Test::Unit::TestCase
|
|||
assert_dom_equal "<form method=\"post\" action=\"http://www.example.com/q1=v1&q2=v2\" class=\"button-to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com/q1=v1&q2=v2")
|
||||
end
|
||||
|
||||
def test_button_to_with_escaped_query
|
||||
assert_dom_equal "<form method=\"post\" action=\"http://www.example.com/q1=v1&q2=v2\" class=\"button-to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com/q1=v1&q2=v2")
|
||||
end
|
||||
|
||||
def test_button_to_with_query_and_no_name
|
||||
assert_dom_equal "<form method=\"post\" action=\"http://www.example.com?q1=v1&q2=v2\" class=\"button-to\"><div><input type=\"submit\" value=\"http://www.example.com?q1=v1&q2=v2\" /></div></form>", button_to(nil, "http://www.example.com?q1=v1&q2=v2")
|
||||
end
|
||||
|
|
@ -59,6 +63,20 @@ class UrlHelperTest < Test::Unit::TestCase
|
|||
button_to("Hello", "http://www.example.com", :disabled => true)
|
||||
)
|
||||
end
|
||||
|
||||
def test_button_to_with_method_delete
|
||||
assert_dom_equal(
|
||||
"<form method=\"post\" action=\"http://www.example.com\" class=\"button-to\"><div><input type=\"hidden\" name=\"_method\" value=\"delete\" /><input type=\"submit\" value=\"Hello\" /></div></form>",
|
||||
button_to("Hello", "http://www.example.com", :method => :delete)
|
||||
)
|
||||
end
|
||||
|
||||
def test_button_to_with_method_get
|
||||
assert_dom_equal(
|
||||
"<form method=\"get\" action=\"http://www.example.com\" class=\"button-to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>",
|
||||
button_to("Hello", "http://www.example.com", :method => :get)
|
||||
)
|
||||
end
|
||||
|
||||
def test_link_tag_with_straight_url
|
||||
assert_dom_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", "http://www.example.com")
|
||||
|
|
@ -125,22 +143,38 @@ class UrlHelperTest < Test::Unit::TestCase
|
|||
)
|
||||
end
|
||||
|
||||
def test_link_tag_with_post_is_deprecated
|
||||
assert_deprecated 'post' do
|
||||
assert_dom_equal(
|
||||
"<a href='http://www.example.com' onclick=\"var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;f.submit();return false;\">Hello</a>",
|
||||
link_to("Hello", "http://www.example.com", :post => true)
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def test_link_tag_using_post_javascript
|
||||
assert_dom_equal(
|
||||
"<a href=\"http://www.example.com\" onclick=\"var f = document.createElement('form'); this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href; f.submit();return false;\">Hello</a>",
|
||||
link_to("Hello", "http://www.example.com", :post => true)
|
||||
"<a href='http://www.example.com' onclick=\"var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;f.submit();return false;\">Hello</a>",
|
||||
link_to("Hello", "http://www.example.com", :method => :post)
|
||||
)
|
||||
end
|
||||
|
||||
def test_link_tag_using_delete_javascript
|
||||
assert_dom_equal(
|
||||
"<a href='http://www.example.com' onclick=\"var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'delete'); f.appendChild(m);f.submit();return false;\">Destroy</a>",
|
||||
link_to("Destroy", "http://www.example.com", :method => :delete)
|
||||
)
|
||||
end
|
||||
|
||||
def test_link_tag_using_post_javascript_and_confirm
|
||||
assert_dom_equal(
|
||||
"<a href=\"http://www.example.com\" onclick=\"if (confirm('Are you serious?')) { var f = document.createElement('form'); this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href; f.submit(); };return false;\">Hello</a>",
|
||||
link_to("Hello", "http://www.example.com", :post => true, :confirm => "Are you serious?")
|
||||
"<a href=\"http://www.example.com\" onclick=\"if (confirm('Are you serious?')) { var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;f.submit(); };return false;\">Hello</a>",
|
||||
link_to("Hello", "http://www.example.com", :method => :post, :confirm => "Are you serious?")
|
||||
)
|
||||
end
|
||||
|
||||
def test_link_tag_using_post_javascript_and_popup
|
||||
assert_raises(ActionView::ActionViewError) { link_to("Hello", "http://www.example.com", :popup => true, :post => true, :confirm => "Are you serious?") }
|
||||
assert_raises(ActionView::ActionViewError) { link_to("Hello", "http://www.example.com", :popup => true, :method => :post, :confirm => "Are you serious?") }
|
||||
end
|
||||
|
||||
def test_link_to_unless
|
||||
|
|
@ -164,16 +198,20 @@ class UrlHelperTest < Test::Unit::TestCase
|
|||
assert_equal "Showing", link_to_if(false, "Showing", :action => "show", :controller => "weblog", :id => 1)
|
||||
end
|
||||
|
||||
def xtest_link_unless_current
|
||||
@request = RequestMock.new("http://www.example.com")
|
||||
assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog")
|
||||
@request = RequestMock.new("http://www.example.org")
|
||||
assert "<a href=\"http://www.example.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
|
||||
def test_link_unless_current
|
||||
@controller.request = RequestMock.new("http://www.example.com/weblog/show")
|
||||
@controller.url = "http://www.example.com/weblog/show"
|
||||
assert_equal "Showing", link_to_unless_current("Showing", { :action => "show", :controller => "weblog" })
|
||||
assert_equal "Showing", link_to_unless_current("Showing", "http://www.example.com/weblog/show")
|
||||
|
||||
@request = RequestMock.new("http://www.example.com")
|
||||
assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog", :id => 1)
|
||||
@controller.request = RequestMock.new("http://www.example.com/weblog/show")
|
||||
@controller.url = "http://www.example.com/weblog/list"
|
||||
assert_equal "<a href=\"http://www.example.com/weblog/list\">Listing</a>",
|
||||
link_to_unless_current("Listing", :action => "list", :controller => "weblog")
|
||||
assert_equal "<a href=\"http://www.example.com/weblog/list\">Listing</a>",
|
||||
link_to_unless_current("Listing", "http://www.example.com/weblog/list")
|
||||
end
|
||||
|
||||
|
||||
def test_mail_to
|
||||
assert_dom_equal "<a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>", mail_to("david@loudthinking.com")
|
||||
assert_dom_equal "<a href=\"mailto:david@loudthinking.com\">David Heinemeier Hansson</a>", mail_to("david@loudthinking.com", "David Heinemeier Hansson")
|
||||
|
|
@ -212,3 +250,117 @@ class UrlHelperTest < Test::Unit::TestCase
|
|||
assert_dom_equal "<script type=\"text/javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript", :replace_at => "(at)", :replace_dot => "(dot)")
|
||||
end
|
||||
end
|
||||
|
||||
class UrlHelperWithControllerTest < Test::Unit::TestCase
|
||||
class UrlHelperController < ActionController::Base
|
||||
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
|
||||
|
||||
def self.controller_path; 'url_helper_with_controller' end
|
||||
|
||||
def show_url_for
|
||||
render :inline => "<%= url_for :controller => 'url_helper_with_controller', :action => 'show_url_for' %>"
|
||||
end
|
||||
|
||||
def show_named_route
|
||||
render :inline => "<%= show_named_route_#{params[:kind]} %>"
|
||||
end
|
||||
|
||||
def rescue_action(e) raise e end
|
||||
end
|
||||
|
||||
include ActionView::Helpers::UrlHelper
|
||||
|
||||
def setup
|
||||
@request = ActionController::TestRequest.new
|
||||
@response = ActionController::TestResponse.new
|
||||
@controller = UrlHelperController.new
|
||||
end
|
||||
|
||||
def test_url_for_shows_only_path
|
||||
get :show_url_for
|
||||
assert_equal '/url_helper_with_controller/show_url_for', @response.body
|
||||
end
|
||||
|
||||
def test_named_route_shows_host_and_path
|
||||
with_url_helper_routing do
|
||||
get :show_named_route, :kind => 'url'
|
||||
assert_equal 'http://test.host/url_helper_with_controller/show_named_route', @response.body
|
||||
end
|
||||
end
|
||||
|
||||
def test_named_route_path_shows_only_path
|
||||
with_url_helper_routing do
|
||||
get :show_named_route, :kind => 'path'
|
||||
assert_equal '/url_helper_with_controller/show_named_route', @response.body
|
||||
end
|
||||
end
|
||||
|
||||
protected
|
||||
def with_url_helper_routing
|
||||
with_routing do |set|
|
||||
set.draw do |map|
|
||||
map.show_named_route 'url_helper_with_controller/show_named_route', :controller => 'url_helper_with_controller', :action => 'show_named_route'
|
||||
end
|
||||
yield
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
class LinkToUnlessCurrentWithControllerTest < Test::Unit::TestCase
|
||||
class TasksController < ActionController::Base
|
||||
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
|
||||
|
||||
def self.controller_path; 'tasks' end
|
||||
|
||||
def index
|
||||
render_default
|
||||
end
|
||||
|
||||
def show
|
||||
render_default
|
||||
end
|
||||
|
||||
def rescue_action(e) raise e end
|
||||
|
||||
protected
|
||||
def render_default
|
||||
render :inline =>
|
||||
"<%= link_to_unless_current(\"tasks\", tasks_path) %>\n" +
|
||||
"<%= link_to_unless_current(\"tasks\", tasks_url) %>"
|
||||
end
|
||||
end
|
||||
|
||||
include ActionView::Helpers::UrlHelper
|
||||
|
||||
def setup
|
||||
@request = ActionController::TestRequest.new
|
||||
@response = ActionController::TestResponse.new
|
||||
@controller = TasksController.new
|
||||
end
|
||||
|
||||
def test_link_to_unless_current_to_current
|
||||
with_restful_routing do
|
||||
get :index
|
||||
assert_equal "tasks\ntasks", @response.body
|
||||
end
|
||||
end
|
||||
|
||||
def test_link_to_unless_current_shows_link
|
||||
with_restful_routing do
|
||||
get :show, :id => 1
|
||||
assert_equal "<a href=\"/tasks\">tasks</a>\n" +
|
||||
"<a href=\"#{@request.protocol}#{@request.host_with_port}/tasks\">tasks</a>",
|
||||
@response.body
|
||||
end
|
||||
end
|
||||
|
||||
protected
|
||||
def with_restful_routing
|
||||
with_routing do |set|
|
||||
set.draw do |map|
|
||||
map.resources :tasks
|
||||
end
|
||||
yield
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue