vendor/spartan-1.0/lib/spartan/default_test_case_generator.rb vendor/spartan-1.0/lib/spartan/rails23_test_case_generator.rb vendor/spartan-1.0/lib/spartan/test_definition_context.rb @@ -2,180 +2,211 @@ require File.expand_path(File.dirname(__FILE__) + '/../../unit_test_helper') unit_tests do - test "wait_for_text waits for the innerHTML content of an element when a locator is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(/findElement\('a_locator'\)/), anything) - client.wait_for_text "some text", :element => "a_locator" - end + describe "wait_for_text" do - test "wait_for_text waits for the page content when no locator is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(%r{document.body.innerHTML.match\(/some text/\)}m), anything) - client.wait_for_text "some text" - end + test "wait_for_text waits for the innerHTML content of an element when a locator is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(/findElement\('a_locator'\)/), anything) + client.wait_for_text "some text", :element => "a_locator" + end + + test "wait_for_text waits for the page content when no locator is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(%r{document.body.innerHTML.match\(/some text/\)}m), anything) + client.wait_for_text "some text" + end + + test "wait_for_text waits for the page content regexp when no locator is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(%r{document.body.innerHTML.match\(/some text/\)}m), anything) + client.wait_for_text(/some text/) + end + + test "wait_for_text uses default timeout when none is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(anything, nil) + client.wait_for_text "some text" + end + + test "wait_for_text uses explicit timeout when provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(anything, :explicit_timeout) + client.wait_for_text "some text", :timeout_in_seconds => :explicit_timeout + end - test "wait_for_text waits for the page content regexp when no locator is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(%r{document.body.innerHTML.match\(/some text/\)}m), anything) - client.wait_for_text(/some text/) - end - - test "wait_for_text uses default timeout when none is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(anything, nil) - client.wait_for_text "some text" - end - - test "wait_for_text uses explicit timeout when provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(anything, :explicit_timeout) - client.wait_for_text "some text", :timeout_in_seconds => :explicit_timeout - end - - test "wait_for_no_text waits for the innerHTML content of an element when a locator is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(/findElement\('a_locator'\)/), anything) - client.wait_for_no_text "some text", :element => "a_locator" - end - - test "wait_for_no_text waits for the page content for regexp when no locator is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(%r{document.body.innerHTML.match\(/some text/\)}m), anything) - client.wait_for_no_text(/some text/) - end - - test "wait_for_no_text waits for the page content when no locator is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(%r{document.body.innerHTML.match\(/some text/\)}m), anything) - client.wait_for_no_text "some text" - end - - test "wait_for_no_text uses default timeout when none is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(anything, nil) - client.wait_for_no_text "some text" - end - - test "wait_for_no_text uses explicit timeout when provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(anything, :explicit_timeout) - client.wait_for_no_text "some text", :timeout_in_seconds => :explicit_timeout - end - - test "wait_for_ajax uses Ajax.activeRequestCount when default js framework is prototype" do - client = Class.new { include Selenium::Client::Extensions }.new - client.stubs(:default_javascript_framework).returns(:prototype) - client.expects(:wait_for_condition).with("selenium.browserbot.getCurrentWindow().Ajax.activeRequestCount == 0;", anything) - client.wait_for_ajax - end - - test "wait_for_ajax uses jQuery.active when default js framework is jQuery" do - client = Class.new { include Selenium::Client::Extensions }.new - client.stubs(:default_javascript_framework).returns(:jquery) - client.expects(:wait_for_condition).with("selenium.browserbot.getCurrentWindow().jQuery.active == 0;", anything) - client.wait_for_ajax - end - - test "wait_for_ajax can override default js framework" do - client = Class.new { include Selenium::Client::Extensions }.new - client.stubs(:default_javascript_framework).returns(:prototype) - client.expects(:wait_for_condition).with("selenium.browserbot.getCurrentWindow().jQuery.active == 0;", anything) - client.wait_for_ajax :javascript_framework => :jquery - end - - test "wait_for_ajax uses default timeout when none is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.stubs(:default_javascript_framework).returns(:prototype) - client.expects(:wait_for_condition).with(anything, nil) - client.wait_for_ajax - end - - test "wait_for_ajax uses explicit timeout when provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.stubs(:default_javascript_framework).returns(:prototype) - client.expects(:wait_for_condition).with(anything, :explicit_timeout) - client.wait_for_ajax :timeout_in_seconds => :explicit_timeout - end - - test "wait_for_effect uses Effect.Queue.size() when default js framework is prototype" do - client = Class.new { include Selenium::Client::Extensions }.new - client.stubs(:default_javascript_framework).returns(:prototype) - client.expects(:wait_for_condition).with("selenium.browserbot.getCurrentWindow().Effect.Queue.size() == 0;", anything) - client.wait_for_effects - end - - test "wait_for_effects uses default timeout when none is provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.stubs(:default_javascript_framework).returns(:prototype) - client.expects(:wait_for_condition).with(anything, nil) - client.wait_for_effects - end - - test "wait_for_effects uses explicit timeout when provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.stubs(:default_javascript_framework).returns(:prototype) - client.expects(:wait_for_condition).with(anything, :explicit_timeout) - client.wait_for_effects :timeout_in_seconds => :explicit_timeout end - test "wait_for_field_value uses provided locator" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(/findElement\('a_locator'\)/), anything) - client.wait_for_field_value "a_locator", "a value" + describe "wait_for_no_text" do + + test "wait_for_no_text waits for the innerHTML content of an element when a locator is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(/findElement\('a_locator'\)/), anything) + client.wait_for_no_text "some text", :element => "a_locator" + end + + test "wait_for_no_text waits for the page content for regexp when no locator is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(%r{document.body.innerHTML.match\(/some text/\)}m), anything) + client.wait_for_no_text(/some text/) + end + + test "wait_for_no_text waits for the page content when no locator is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(%r{document.body.innerHTML.match\(/some text/\)}m), anything) + client.wait_for_no_text "some text" + end + + test "wait_for_no_text uses default timeout when none is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(anything, nil) + client.wait_for_no_text "some text" + end + + test "wait_for_no_text uses explicit timeout when provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(anything, :explicit_timeout) + client.wait_for_no_text "some text", :timeout_in_seconds => :explicit_timeout + end end - - test "wait_for_field_value uses provided field value" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(/element.value == 'a value'/), anything) - client.wait_for_field_value "a_locator", "a value" + + describe "wait_for_ajax" do + + test "wait_for_ajax uses Ajax.activeRequestCount when default js framework is prototype" do + client = Class.new { include Selenium::Client::Extensions }.new + client.stubs(:default_javascript_framework).returns(:prototype) + client.expects(:wait_for_condition).with("selenium.browserbot.getCurrentWindow().Ajax.activeRequestCount == 0;", anything) + client.wait_for_ajax + end + + test "wait_for_ajax uses jQuery.active when default js framework is jQuery" do + client = Class.new { include Selenium::Client::Extensions }.new + client.stubs(:default_javascript_framework).returns(:jquery) + client.expects(:wait_for_condition).with("selenium.browserbot.getCurrentWindow().jQuery.active == 0;", anything) + client.wait_for_ajax + end + + test "wait_for_ajax can override default js framework" do + client = Class.new { include Selenium::Client::Extensions }.new + client.stubs(:default_javascript_framework).returns(:prototype) + client.expects(:wait_for_condition).with("selenium.browserbot.getCurrentWindow().jQuery.active == 0;", anything) + client.wait_for_ajax :javascript_framework => :jquery + end + + test "wait_for_ajax uses default timeout when none is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.stubs(:default_javascript_framework).returns(:prototype) + client.expects(:wait_for_condition).with(anything, nil) + client.wait_for_ajax + end + + test "wait_for_ajax uses explicit timeout when provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.stubs(:default_javascript_framework).returns(:prototype) + client.expects(:wait_for_condition).with(anything, :explicit_timeout) + client.wait_for_ajax :timeout_in_seconds => :explicit_timeout + end + end - - test "wait_for_field_value uses explicit timeout when provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(anything, :the_timeout) - client.wait_for_field_value "a_locator", "a value", :timeout_in_seconds => :the_timeout + + describe "wait_for_effect" do + + test "wait_for_effect uses Effect.Queue.size() when default js framework is prototype" do + client = Class.new { include Selenium::Client::Extensions }.new + client.stubs(:default_javascript_framework).returns(:prototype) + client.expects(:wait_for_condition).with("selenium.browserbot.getCurrentWindow().Effect.Queue.size() == 0;", anything) + client.wait_for_effects + end + + test "wait_for_effects uses default timeout when none is provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.stubs(:default_javascript_framework).returns(:prototype) + client.expects(:wait_for_condition).with(anything, nil) + client.wait_for_effects + end + + test "wait_for_effects uses explicit timeout when provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.stubs(:default_javascript_framework).returns(:prototype) + client.expects(:wait_for_condition).with(anything, :explicit_timeout) + client.wait_for_effects :timeout_in_seconds => :explicit_timeout + end + end - - test "wait_for_no_field_value uses provided locator" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(/findElement\('a_locator'\)/), anything) - client.wait_for_no_field_value "a_locator", "a value" + + describe "wait_for_field_value" do + + test "wait_for_field_value uses provided locator" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(/findElement\('a_locator'\)/), anything) + client.wait_for_field_value "a_locator", "a value" + end + + test "wait_for_field_value uses provided field value" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(/element.value == 'a value'/), anything) + client.wait_for_field_value "a_locator", "a value" + end + + test "wait_for_field_value uses explicit timeout when provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(anything, :the_timeout) + client.wait_for_field_value "a_locator", "a value", :timeout_in_seconds => :the_timeout + end + end - - test "wait_for_no_field_value uses provided field value" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(regexp_matches(/element.value != 'a value'/), anything) - client.wait_for_no_field_value "a_locator", "a value" + + describe "wait_for_no_field_value" do + + test "wait_for_no_field_value uses provided locator" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(/findElement\('a_locator'\)/), anything) + client.wait_for_no_field_value "a_locator", "a value" + end + + test "wait_for_no_field_value uses provided field value" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(regexp_matches(/element.value != 'a value'/), anything) + client.wait_for_no_field_value "a_locator", "a value" + end + + test "wait_for_no_field_value uses explicit timeout when provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(anything, :the_timeout) + client.wait_for_no_field_value "a_locator", "a value", :timeout_in_seconds => :the_timeout + end + end - test "wait_for_no_field_value uses explicit timeout when provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(anything, :the_timeout) - client.wait_for_no_field_value "a_locator", "a value", :timeout_in_seconds => :the_timeout - end + describe "wait_for_visible" do - test "wait_for_visible uses provided locator" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with("selenium.isVisible('a_locator')", anything) - client.wait_for_visible "a_locator" - end + test "wait_for_visible uses provided locator" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with("selenium.isVisible('a_locator')", anything) + client.wait_for_visible "a_locator" + end - test "wait_for_visible uses explicit timeout when provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(anything, :the_timeout) - client.wait_for_visible "a_locator", :timeout_in_seconds => :the_timeout - end + test "wait_for_visible uses explicit timeout when provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(anything, :the_timeout) + client.wait_for_visible "a_locator", :timeout_in_seconds => :the_timeout + end - test "wait_for_not_visible uses provided locator" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with("!selenium.isVisible('a_locator')", anything) - client.wait_for_not_visible "a_locator" end + + describe "wait_for_not_visible" do + + test "wait_for_not_visible uses provided locator" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with("!selenium.isVisible('a_locator')", anything) + client.wait_for_not_visible "a_locator" + end + + test "wait_for_not_visible uses explicit timeout when provided" do + client = Class.new { include Selenium::Client::Extensions }.new + client.expects(:wait_for_condition).with(anything, :the_timeout) + client.wait_for_not_visible "a_locator", :timeout_in_seconds => :the_timeout + end - test "wait_for_not_visible uses explicit timeout when provided" do - client = Class.new { include Selenium::Client::Extensions }.new - client.expects(:wait_for_condition).with(anything, :the_timeout) - client.wait_for_not_visible "a_locator", :timeout_in_seconds => :the_timeout end end test/unit/selenium/client/extensions_tests.rb @@ -1,7 +1,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spartan/internals') -require File.expand_path(File.dirname(__FILE__) + '/spartan/object_extensions') +require File.expand_path(File.dirname(__FILE__) + '/spartan/test_definition_context') require File.expand_path(File.dirname(__FILE__) + '/spartan/test_case_extensions') +require File.expand_path(File.dirname(__FILE__) + '/spartan/default_test_case_generator') +require File.expand_path(File.dirname(__FILE__) + '/spartan/rails23_test_case_generator') require "test/unit" -Object.send :include, Spartan::ObjectExtensions +Object.send :include, Spartan::DefaultTestCaseGenerator Test::Unit::TestCase.send :extend, Spartan::TestCaseExtensions vendor/spartan-1.0/lib/spartan.rb @@ -14,11 +14,13 @@ module Spartan underscored.gsub(/(^(.)|_+(.))/) {|c| ($2 || $3).upcase} end - def self.define_test_class(suffix, &block) + def self.define_test_class(options, &block) + suffix = options[:suffix] || "Test" + base_class = options[:base_class] || Test::Unit::TestCase test_file_path = self.definition_file_path(&block) test_file_name = File.basename(test_file_path, "_tests.rb") test_class = Object.const_set "#{self.camelize(test_file_name)}#{suffix}", - Class.new(Test::Unit::TestCase) + Class.new(base_class) test_class.class_eval(&block) test_class end vendor/spartan-1.0/lib/spartan/internals.rb @@ -2,22 +2,21 @@ module Spartan module TestCaseExtensions def test(description, &block) - define_method test_method_name_for(description) do + define_method spartan_context.valid_test_method_name_for(description) do instance_eval(&block) end end - def test_method_name_for(description) - test_name = "test_#{description.gsub(/[ \.,;:\(\)-]+/, "_")}" - if duplicated_test_method?(test_name) - raise "'#{description}' is already defined in this test case (cut-and-paste?)" - end - test_name + def describe(description, &block) + spartan_context.descriptions_in_progress.push description + yield + spartan_context.descriptions_in_progress.pop end - def duplicated_test_method?(test_name) - instance_methods.include?(test_name) || - instance_methods.include?(test_name.to_sym) # Ruby 1.9 + # Dedicated test definition context to avoid polluting TestCase's namespace + def spartan_context + @spartan_context ||= TestDefinitionContext.new(self) end + end end \ No newline at end of file vendor/spartan-1.0/lib/spartan/test_case_extensions.rb vendor/spartan-1.0/lib/spartan/object_extensions.rb b278b56e099e373e3d5ca8818bb211e875e1eb03 Philippe Hanrigou philippe.hanrigou@gmail.com http://github.com/ph7/selenium-client/commit/4d7b165f77e67af0c4a7f64e4b65a8406861abea 4d7b165f77e67af0c4a7f64e4b65a8406861abea 2009-07-10T12:48:53-07:00 2009-07-10T12:48:53-07:00 Upgrading spartan d58a081864b65d66a41be9c04465f91f2b1646e3 Philippe Hanrigou philippe.hanrigou@gmail.com