From 9acb1f95c9853dba704be7c690c4c0746ca8e8d6 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 16 Sep 2005 08:44:38 +0000 Subject: Make upload progress not throw JavaScript errors when there is no progress bar #2208 [Thomas Fuchs] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2252 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../test/template/upload_progress_helper_testx.rb | 144 +-------------------- 1 file changed, 4 insertions(+), 140 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/template/upload_progress_helper_testx.rb b/actionpack/test/template/upload_progress_helper_testx.rb index 84ee607cbd..b22b6a67b4 100644 --- a/actionpack/test/template/upload_progress_helper_testx.rb +++ b/actionpack/test/template/upload_progress_helper_testx.rb @@ -32,142 +32,6 @@ class MockProgress end end -class UploadProgressHelperTest < Test::Unit::TestCase - include ActionView::Helpers::DateHelper - include ActionView::Helpers::NumberHelper - include ActionView::Helpers::AssetTagHelper - include ActionView::Helpers::FormTagHelper - include ActionView::Helpers::TagHelper - include ActionView::Helpers::UrlHelper - include ActionView::Helpers::JavaScriptHelper - include ActionView::Helpers::UploadProgressHelper - - def next_upload_id; @upload_id = last_upload_id.succ; end - def last_upload_id; @upload_id ||= 0; end - def current_upload_id; last_upload_id; end - def upload_progress(upload_id = nil); @upload_progress or MockProgress.new(false, true); end - - def setup - @controller = Class.new do - def url_for(options, *parameters_for_method_reference) - "http://www.example.com" - end - end - @controller = @controller.new - end - - def test_upload_status_tag - assert_equal( - '

', - upload_status_tag - ) - end - - def test_upload_status_text_tag - assert_equal( - '

Starting

', - upload_status_text_tag('Starting', :class => 'my-upload', :id => 'my-id') - ) - end - - - def test_upload_progress_text - @upload_progress = MockProgress.new(false, false) - assert_equal( - "Upload starting...", - upload_progress_text - ) - - @upload_progress = MockProgress.new(true, false) - assert_equal( - "828.7 MB of 456.2 MB at 990.1 MB/s; 10227 days remaining", - upload_progress_text - ) - - @upload_progress = MockProgress.new(true, true) - assert_equal( - "Upload finished. A message", - upload_progress_text - ) - end - - def test_upload_progress_update_bar_js - assert_equal( - "$('UploadProgressBar0').firstChild.firstChild.style.width='0%';", - upload_progress_update_bar_js - ) - - assert_equal( - "$('UploadProgressBar0').firstChild.firstChild.style.width='50%';", - upload_progress_update_bar_js(50) - ) - end - - def test_finish_upload_status - assert_equal( - "", - finish_upload_status - ) - - assert_equal( - "", - finish_upload_status(:client_js_argument => 123) - ) - - assert_equal( - "", - finish_upload_status(:redirect_to => '/redirected/') - ) - end - - def test_form_tag_with_upload_progress - assert_equal( - "

", - form_tag_with_upload_progress - ) - end - - def test_form_tag_with_upload_progress_custom - assert_equal( - "", - form_tag_with_upload_progress({:upload_id => 5}, {:begin => "alert('foo')", :finish => "alert('bar')", :frequency => 6, :decay => 7, :target => 'awindow'}) - ) - end -end -require File.dirname(__FILE__) + '/../abstract_unit' - -require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper' -require File.dirname(__FILE__) + '/../../lib/action_view/helpers/number_helper' -require File.dirname(__FILE__) + '/../../lib/action_view/helpers/asset_tag_helper' -require File.dirname(__FILE__) + '/../../lib/action_view/helpers/form_tag_helper' -require File.dirname(__FILE__) + '/../../lib/action_view/helpers/tag_helper' -require File.dirname(__FILE__) + '/../../lib/action_view/helpers/javascript_helper' -require File.dirname(__FILE__) + '/../../lib/action_view/helpers/upload_progress_helper' -require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/hash' #for stringify keys - -class MockProgress - def initialize(started, finished) - @started, @finished = [started, finished] - end - - def started? - @started - end - - def finished? - @finished - end - - def message - "A message" - end - - def method_missing(meth, *args) - # Just return some consitant number - meth.to_s.hash.to_i.abs + args.hash.to_i.abs - end -end - class UploadProgressHelperTest < Test::Unit::TestCase include ActionView::Helpers::DateHelper include ActionView::Helpers::NumberHelper @@ -229,12 +93,12 @@ class UploadProgressHelperTest < Test::Unit::TestCase def test_upload_progress_update_bar_js assert_equal( - "$('UploadProgressBar0').firstChild.firstChild.style.width='0%'", + "if($('UploadProgressBar0')){$('UploadProgressBar0').firstChild.firstChild.style.width='0%'}", upload_progress_update_bar_js ) assert_equal( - "$('UploadProgressBar0').firstChild.firstChild.style.width='50%'", + "if($('UploadProgressBar0')){$('UploadProgressBar0').firstChild.firstChild.style.width='50%'}", upload_progress_update_bar_js(50) ) end @@ -258,14 +122,14 @@ class UploadProgressHelperTest < Test::Unit::TestCase def test_form_tag_with_upload_progress assert_equal( - "", + "", form_tag_with_upload_progress ) end def test_form_tag_with_upload_progress_custom assert_equal( - "", + "", form_tag_with_upload_progress({:upload_id => 5}, {:begin => "alert('foo')", :finish => "alert('bar')", :frequency => 6, :decay => 7, :target => 'awindow'}) ) end -- cgit v1.2.3