test/javascript/assets/builder.js test/javascript/assets/controls.js test/javascript/assets/dragdrop.js test/javascript/assets/effects.js test/javascript/assets/slider.js test/javascript/assets/sound.js test/javascript/fixtures/translate_eight.xml test/javascript/fixtures/translate_five.xml test/javascript/fixtures/translate_four.xml test/javascript/fixtures/translate_lorem.xml test/javascript/fixtures/translate_lorem_area.xml test/javascript/fixtures/translate_one.xml test/javascript/fixtures/translate_seven.xml test/javascript/fixtures/translate_six.xml test/javascript/fixtures/translate_three.xml test/javascript/fixtures/translate_two.xml test/javascript/fixtures/translate_unformatted_eight.xml test/javascript/fixtures/translate_unformatted_five.xml test/javascript/fixtures/translate_unformatted_four.xml test/javascript/fixtures/translate_unformatted_lorem.xml test/javascript/fixtures/translate_unformatted_lorem_area.xml test/javascript/fixtures/translate_unformatted_one.xml test/javascript/fixtures/translate_unformatted_seven.xml test/javascript/fixtures/translate_unformatted_six.xml test/javascript/fixtures/translate_unformatted_three.xml test/javascript/fixtures/translate_unformatted_two.xml test/javascript/fixtures/translations.json @@ -49,8 +49,7 @@ namespace :test do t.load_tests(tests_to_run) t.prepare_tests - t.mount_assets - t.mount_test_paths + t.mount_paths %w( safari firefox ie konqueror opera ).each do |browser| t.browser(browser.to_sym) unless browsers_to_test && !browsers_to_test.include?(browser) Rakefile @@ -6,45 +6,85 @@ body { font-size:0.8em; } +.navigation { + background: #9DC569; + color: #fff; +} + +.navigation h1 { + font-size: 20px; +} + +.navigation h2 { + font-size: 16px; + font-weight: normal; + margin: 0; + border: 1px solid #e8a400; + border-bottom: 0; + background: #ffc; + color: #E8A400; + padding: 8px; + padding-bottom: 0; +} + +.navigation ul { + margin-top: 0; + border: 1px solid #E8A400; + border-top: none; + background: #ffc; + padding: 8px; + margin-left: 0; +} + +.navigation ul li { + font-size: 12px; + list-style-type: none; + margin-top: 1px; + margin-bottom: 1px; + color: #555; +} + +.navigation a { + color: #ffc; +} + +.navigation ul li a { + color: #000; +} + #log { padding-bottom: 1em; border-bottom: 2px solid #000; margin-bottom: 2em; } -.logsummary { - margin-top: 1em; +#logsummary { margin-bottom: 1em; padding: 1ex; border: 1px solid #000; font-weight: bold; } -.logtable { +#logtable { width:100%; border-collapse: collapse; border: 1px dotted #666; } -.logtable td, .logtable th { +#logtable td, #logtable th { text-align: left; padding: 3px 8px; border: 1px dotted #666; } -.logtable .passed { +#logtable .passed { background-color: #cfc; } -.logtable .failed, .logtable .error { +#logtable .failed, #logtable .error { background-color: #fcc; } -.logtable td div.action_buttons { - display: inline; -} - -.logtable td div.action_buttons input { - margin: 0 5px; - font-size: 10px; +#logtable .nameCell { + cursor: pointer; } test/javascript/assets/test.css @@ -27,8 +27,8 @@ var TestUtil = { bindElement: function(id, text, selector) { text = text || 'paragraph '+id; selector = selector || 'input[type~=text]'; - ClickToGlobalize.DefaultOptions.translateUrl = 'fixtures/translate_'+id+'.xml'; - ClickToGlobalize.DefaultOptions.translateUnformattedUrl = 'fixtures/translate_unformatted_'+id+'.xml'; + ClickToGlobalize.DefaultOptions.translateUrl = '/fixtures/translate_'+id+'.xml'; + ClickToGlobalize.DefaultOptions.translateUnformattedUrl = '/fixtures/translate_unformatted_'+id+'.xml'; element = $$$(text).first(); test/javascript/functional/ajax_inplaceeditor_test.js @@ -389,13 +389,11 @@ class ClickToGlobalizeJavaScriptTestTask < JavaScriptTestTask @test_builder.setup end - def mount_assets - mount "/", TEST_ASSETS_PATH - mount "/assets", ASSETS_PATH - end - - def mount_test_paths - mount "/test", TMP_TEST_PATH + def mount_paths + mount "/", TEST_ASSETS_PATH + mount "/assets", ASSETS_PATH + mount "/fixtures", FIXTURES_PATH + mount "/test", TMP_TEST_PATH end end test/javascript/lib/jstest.rb @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <title>Prototype Unit test file | <%= @test_case.title %></title> + <title>Click to Globalize test file | <%= @test_case.title %></title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <script type="text/javascript" charset="utf-8"> var eventResults = {}; @@ -13,10 +13,10 @@ <script src="/unittest.js" type="text/javascript"></script> <link rel="stylesheet" href="/test.css" type="text/css" /> - <script src="/assets/click_to_globalize.js" type="text/javascript"></script> + <script src="/assets/javascripts/click_to_globalize.js" type="text/javascript"></script> </head> <body> -<h1>Prototype Unit test file</h1> +<h1>Click to Globalize test file</h1> <h2><%= @test_case.title %></h2> <!-- Log output start --> test/javascript/templates/template.erb @@ -24,7 +24,7 @@ new Test.Unit.Runner({ authenticityToken = '45c0a7bf277d5e40d490438f41a67069e5334d96'; requestForgeryProtectionToken = 'authenticity_token'; clickToGlobalize = new ClickToGlobalize(authenticityToken, requestForgeryProtectionToken, - {translationsUrl: 'fixtures/translations.json'}); + {translationsUrl: '/fixtures/translations.json'}); document.fire("dom:loaded"); }, testRespondTo: function() { test/javascript/unit/click_to_globalize_test.js test/javascript/functional/fixtures/translate_eight.xml test/javascript/functional/fixtures/translate_five.xml test/javascript/functional/fixtures/translate_four.xml test/javascript/functional/fixtures/translate_lorem.xml test/javascript/functional/fixtures/translate_lorem_area.xml test/javascript/functional/fixtures/translate_one.xml test/javascript/functional/fixtures/translate_seven.xml test/javascript/functional/fixtures/translate_six.xml test/javascript/functional/fixtures/translate_three.xml test/javascript/functional/fixtures/translate_two.xml test/javascript/functional/fixtures/translate_unformatted_eight.xml test/javascript/functional/fixtures/translate_unformatted_five.xml test/javascript/functional/fixtures/translate_unformatted_four.xml test/javascript/functional/fixtures/translate_unformatted_lorem.xml test/javascript/functional/fixtures/translate_unformatted_lorem_area.xml test/javascript/functional/fixtures/translate_unformatted_one.xml test/javascript/functional/fixtures/translate_unformatted_seven.xml test/javascript/functional/fixtures/translate_unformatted_six.xml test/javascript/functional/fixtures/translate_unformatted_three.xml test/javascript/functional/fixtures/translate_unformatted_two.xml test/javascript/unit/fixtures/translations.json a7fbd6e0535d922fe6e59e9152d3c5381a68f71a Luca Guidi guidi.luca@gmail.com http://github.com/jodosha/click-to-globalize/commit/436319b640a25bda2d453ff33ef05ac94ed3d27d 436319b640a25bda2d453ff33ef05ac94ed3d27d 2009-04-08T11:07:16-07:00 2009-04-08T11:07:16-07:00 Make Javascript test running properly a50ba1c22b9f2609276b2077a27a6ef14ac19bb1 Luca Guidi guidi.luca@gmail.com