polonium 0.1.0 → 0.1.1

data/CHANGES

@@ -1,3 +1,4 @@
+0.1.0
 * Renamed to Polonium
 * Methods renamed to match Test::Unit assertions
 * Page and Element delegate to Driver [Paired with Jeff Whitmore]

data/Rakefile

@@ -26,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "polonium"
-PKG_VERSION = "0.1.0"
+PKG_VERSION = "0.1.1"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/lib/polonium/adapters/rspec.rb

@@ -0,0 +1,21 @@
+class Spec::Runner::Options
+  attr_accessor :selenium_configuration, :selenium_app_runner
+
+  def run_examples_with_selenium_runner(*args)
+    success = run_examples_without_selenium_runner(*args)
+    selenium_app_runner.stop
+    selenium_configuration.stop_driver_if_necessary(success)
+    success
+  end
+  alias_method_chain :run_examples, :selenium_runner
+end
+
+rspec_options.selenium_configuration = Polonium::Configuration.instance
+rspec_options.selenium_app_runner = nil
+
+Spec::Example::ExampleMethods.before(:all) do
+  unless rspec_options.selenium_app_runner
+    rspec_options.selenium_app_runner = rspec_options.selenium_configuration.create_server_runner
+    rspec_options.selenium_app_runner.start
+  end
+end

data/lib/polonium/{extensions/testrunnermediator.rb → adapters/test_unit.rb}

@@ -1,11 +1,11 @@
 class Test::Unit::UI::TestRunnerMediator
-  alias_method :run_suite_without_seleniumrc, :run_suite
   def run_suite_with_seleniumrc
     start_app_server
     result = run_suite_without_seleniumrc
     stop_app_server(result)
     result
   end
+  alias_method :run_suite_without_seleniumrc, :run_suite
   alias_method :run_suite, :run_suite_with_seleniumrc
 
   protected

data/lib/polonium/configuration.rb

@@ -49,8 +49,8 @@ module Polonium
 
       private
       def establish_environment
-        @instance.rails_env = env['RAILS_ENV'] if env.include?('RAILS_ENV')
-        @instance.rails_root = Object.const_get(:RAILS_ROOT) if Object.const_defined?(:RAILS_ROOT)
+        instance.rails_env = env['RAILS_ENV'] if env.include?('RAILS_ENV')
+        instance.rails_root = Object.const_get(:RAILS_ROOT) if Object.const_defined?(:RAILS_ROOT)
         [
           'selenium_server_host',
           'selenium_server_port',
@@ -61,7 +61,7 @@ module Polonium
           'external_app_server_port'
         ].each do |env_key|
           if env.include?(env_key)
-            @instance.send("#{env_key}=", env[env_key])
+            instance.send("#{env_key}=", env[env_key])
           end
         end
         [
@@ -69,35 +69,37 @@ module Polonium
           'verify_remote_app_server_is_running'
         ].each do |env_key|
           if env.include?(env_key)
-            @instance.send("#{env_key}=", env[env_key].to_s != false.to_s)
+            instance.send("#{env_key}=", env[env_key].to_s != false.to_s)
           end
         end
-        @instance.browser = env['browser'] if env.include?('browser')
+        instance.browser = env['browser'] if env.include?('browser')
       end
 
       def env
-        @instance.env
+        instance.env
       end
     end
 
-        attr_accessor :configuration,
-                  :env,
-                  :rails_env,
-                  :rails_root,
-                  :browser,
-                  :driver,
-                  :browser_mode,
-                  :selenium_server_host,
-                  :selenium_server_port,
-                  :app_server_engine,
-                  :internal_app_server_host,
-                  :internal_app_server_port,
-                  :external_app_server_host,
-                  :external_app_server_port,
-                  :server_engine,
-                  :keep_browser_open_on_failure,
-                  :verify_remote_app_server_is_running,
-                  :app_server_initialization
+    attr_accessor(
+      :configuration,
+      :env,
+      :rails_env,
+      :rails_root,
+      :browser,
+      :driver,
+      :browser_mode,
+      :selenium_server_host,
+      :selenium_server_port,
+      :app_server_engine,
+      :internal_app_server_host,
+      :internal_app_server_port,
+      :external_app_server_host,
+      :external_app_server_port,
+      :server_engine,
+      :keep_browser_open_on_failure,
+      :verify_remote_app_server_is_running,
+      :app_server_initialization
+    )
 
     def initialize
       self.verify_remote_app_server_is_running = true
@@ -164,7 +166,7 @@ module Polonium
       @driver ||= create_and_initialize_driver
     end
 
-    def stop_driver_if_necessary(suite_passed) # nodoc
+    def stop_driver_if_necessary(suite_passed) #:nodoc:
       failure_has_occurred unless suite_passed
       if @driver && stop_driver?(suite_passed)
         @driver.stop
@@ -172,19 +174,19 @@ module Polonium
       end
     end
 
-    def stop_driver?(passed) # nodoc
+    def stop_driver?(passed) #:nodoc:
       return true if passed
       return !keep_browser_open_on_failure
     end
 
-    def create_and_initialize_driver # nodoc
+    def create_and_initialize_driver #:nodoc:
       driver = create_driver
       driver.start
       notify_after_driver_started(driver)
       driver
     end
 
-    def create_driver # nodoc
+    def create_driver #:nodoc:
       return ::Polonium::Driver.new(
         selenium_server_host,
         selenium_server_port,
@@ -194,7 +196,7 @@ module Polonium
       )
     end
 
-    def create_server_runner # nodoc
+    def create_server_runner #:nodoc:
       case @app_server_engine.to_sym
       when :mongrel
         create_mongrel_runner
@@ -205,7 +207,7 @@ module Polonium
       end
     end
 
-    def create_webrick_runner # nodoc
+    def create_webrick_runner #:nodoc:
       require 'webrick_server'
       runner = WebrickSeleniumServerRunner.new
       runner.configuration = self
@@ -216,7 +218,7 @@ module Polonium
       runner
     end
 
-    def create_webrick_server # nodoc
+    def create_webrick_server #:nodoc:
       WEBrick::HTTPServer.new({
         :Port => @internal_app_server_port,
         :BindAddress => @internal_app_server_host,
@@ -231,14 +233,14 @@ module Polonium
       Logger.new(StringIO.new)
     end
 
-    def create_mongrel_runner # nodoc
+    def create_mongrel_runner #:nodoc:
       runner = MongrelSeleniumServerRunner.new
       runner.configuration = self
       runner.thread_class = Thread
       runner
     end
 
-    def create_mongrel_configurator # nodoc
+    def create_mongrel_configurator #:nodoc:
       dir = File.dirname(__FILE__)
       require 'mongrel/rails'
       settings = {

data/lib/polonium/dsl/selenium_dsl.rb

@@ -21,11 +21,14 @@ module Polonium
     end
 
     protected
-    Driver.public_instance_methods(false).each do |method_name|
-      delegate method_name, :to => :selenium_driver
+    def method_missing(method_name, *args, &block)
+      selenium_driver.__send__(method_name, *args, &block)
     end
+    delegate :open,
+             :type,
+             :to => :selenium_driver
 
-    def should_stop_driver?
+    def stop_driver?
       return false unless configuration.test_browser_mode?
       configuration.stop_driver?(passed?)
     end

data/lib/polonium/dsl/test_unit_dsl.rb

@@ -30,7 +30,6 @@ module Polonium
     deprecate :assert_location_ends_in, :assert_location_ends_with
 
     element_assertion :value
-    element_assertion :attribute   # yes, it's a little weird... in this case element is really an attribute
     element_assertion :selected
     element_assertion :checked
     element_assertion :not_checked
@@ -42,6 +41,10 @@ module Polonium
     element_assertion :visible
     element_assertion :not_visible
 
+    def assert_attribute(element_locator, attribute_name, expected_value)
+      element(element_locator).assert_attribute(attribute_name, expected_value)
+    end
+
     # Assert and wait for locator element to contain text.
     def assert_element_contains(locator, text, options = {})
       element(locator).assert_contains(text, options)

data/lib/polonium/element.rb

@@ -1,6 +1,6 @@
 module Polonium
   class Element
-    include WaitFor
+    include WaitFor, ValuesMatch
     attr_reader :driver, :locator
 
     def initialize(driver, locator)
@@ -25,12 +25,13 @@ module Polonium
       end
     end
 
-    def assert_attribute(expected_value)
+    def assert_attribute(expected_name, expected_value)
       assert_element_present
+      attr_locator = "#{locator}@#{expected_name}"
       wait_for do |configuration|
-        actual = driver.get_attribute(locator)  #todo: actual value
-        configuration.message = "Expected attribute '#{locator}' to be '#{expected_value}' but was '#{actual}'"
-        expected_value == actual
+        actual = driver.get_attribute(attr_locator)  #todo: actual value
+        configuration.message = "Expected attribute '#{attr_locator}' to be '#{expected_value}' but was '#{actual}'"
+        values_match? actual, expected_value
       end
     end
 
@@ -39,7 +40,7 @@ module Polonium
       wait_for do |configuration|
         actual = driver.get_selected_label(locator)
         configuration.message = "Expected '#{locator}' to be selected with '#{expected_value}' but was '#{actual}"
-        expected_value == actual
+        values_match? actual, expected_value
       end
     end
 
@@ -72,7 +73,7 @@ module Polonium
 
     def assert_not_checked
       assert_element_present
-      wait_for(:message => "Expected '#{locator}' to be checked") do
+      wait_for(:message => "Expected '#{locator}' to not be checked") do
         !driver.is_checked(locator)
       end
     end
@@ -82,7 +83,7 @@ module Polonium
       wait_for(options) do |configuration|
         actual = driver.get_text(locator)
         configuration.message = "Expected text '#{expected_text}' to be full contents of #{locator} but was '#{actual}')"
-        expected_text == actual
+        values_match? actual, expected_text
       end
     end
 
@@ -100,7 +101,7 @@ module Polonium
     def assert_does_not_contain(expected_text, options={})
       assert_element_present
       wait_for(options) do
-        !inner_html.include?(expected_text)
+        !contains?(expected_text)
       end
     end
 
@@ -157,7 +158,7 @@ module Polonium
     end
 
     def contains?(text)
-      inner_html.include?(text)
+      inner_html.match(text) ? true : false
     end
 
     def ==(other)
@@ -176,7 +177,7 @@ module Polonium
         super
       end
     end
-    
+
     def find_text_order_error_fragments(html, text_fragments)
       fragments_not_found = []
       fragments_out_of_order = []
@@ -204,4 +205,4 @@ module Polonium
       }
     end
   end
-end
+end

data/lib/polonium/page.rb

@@ -1,6 +1,6 @@
 module Polonium
   class Page
-    include WaitFor
+    include WaitFor, ValuesMatch
     attr_reader :driver
     PAGE_LOADED_COMMAND = "this.browserbot.getDocument().body ? true : false"
 
@@ -17,7 +17,7 @@ module Polonium
       wait_for(params) do |configuration|
         actual_title = title
         configuration.message = "Expected title '#{expected_title}' but was '#{actual_title}'"
-        expected_title == actual_title
+        values_match?(actual_title, expected_title)
       end
     end
     def title
@@ -33,7 +33,12 @@ module Polonium
       end
     end
     def is_text_present?(expected_text)
-      page_loaded? && driver.is_text_present(expected_text)
+      if expected_text.is_a?(Regexp)
+        text_finder = "regexp:#{expected_text.source}"
+      else
+        text_finder = expected_text
+      end
+      page_loaded? && driver.is_text_present(text_finder)
     end
 
     def assert_text_not_present(unexpected_text, options = {})
@@ -45,7 +50,12 @@ module Polonium
       end
     end
     def is_text_not_present?(unexpected_text)
-      page_loaded? && !driver.is_text_present(unexpected_text)
+      if unexpected_text.is_a?(Regexp)
+        text_finder = "regexp:#{unexpected_text.source}"
+      else
+        text_finder = unexpected_text
+      end
+      page_loaded? && !driver.is_text_present(text_finder)
     end
 
     def page_loaded?

data/lib/polonium/test_case.rb

@@ -2,46 +2,12 @@ module Polonium
   # The Test Case class that runs your Selenium tests.
   # You are able to use all methods provided by Selenium::SeleneseInterpreter with some additions.
   class TestCase < Test::Unit::TestCase
-    module ClassMethods
-      def subclasses
-        @subclasses ||= []
-      end
-
-      def inherited(subclass)
-        # keep a list of all subclasses on the fly, so we can run them all later from the Runner
-        subclasses << subclass unless subclasses.include?(subclass)
-        super
-      end
-
-      def all_subclasses_as_suite(configuration)
-        suite = Test::Unit::TestSuite.new
-        all_descendant_classes.each do |test_case_class|
-          test_case_class.suite.tests.each do |test_case|
-            test_case.configuration = configuration
-            suite << test_case
-          end
-        end
-        suite
-      end
-
-      def all_descendant_classes
-        extract_subclasses(self)
-      end
-
-      def extract_subclasses(parent_class)
-        classes = []
-        parent_class.subclasses.each do |subclass|
-          classes << subclass
-          classes.push(*extract_subclasses(subclass))
-        end
-        classes
-      end
-
+    class << self
       unless Object.const_defined?(:RAILS_ROOT)
         attr_accessor :use_transactional_fixtures, :use_instantiated_fixtures
       end
     end
-    extend ClassMethods
+    undef_method 'default_test' if instance_methods.include?('default_test')
 
     self.use_transactional_fixtures = false
     self.use_instantiated_fixtures  = true
@@ -71,7 +37,7 @@ module Polonium
     end
 
     def teardown
-      selenium_driver.stop if should_stop_driver?
+      selenium_driver.stop if stop_driver?
       super
       if @beginning
         duration = (time_class.now - @beginning).to_f

data/lib/polonium/values_match.rb

@@ -0,0 +1,9 @@
+module ValuesMatch
+  def values_match?(actual, expected)
+    if expected.is_a? Regexp
+      (actual =~ expected) ? true : false
+    else
+      expected == actual
+    end
+  end  
+end

data/lib/polonium.rb

@@ -11,7 +11,6 @@ require 'test/unit/ui/testrunnermediator'
 
 require "selenium"
 require "polonium/extensions/module"
-require "polonium/extensions/testrunnermediator"
 require "polonium/wait_for"
 require "polonium/driver"
 require "polonium/server_runner"
@@ -20,9 +19,15 @@ require "polonium/webrick_selenium_server_runner"
 require "polonium/dsl/selenium_dsl"
 require "polonium/dsl/test_unit_dsl"
 require "polonium/configuration"
+require "polonium/values_match"
 require "polonium/page"
 require "polonium/element"
 require "polonium/test_case"
 require "polonium/tasks/selenium_test_task"
 
 require 'webrick_server' if self.class.const_defined? :RAILS_ROOT
+
+require "polonium/adapters/test_unit"
+if Object.const_defined?(:Spec)
+  require "polonium/adapters/rspec"
+end

data/spec/main_spec_suite.rb

@@ -0,0 +1,11 @@
+require File.expand_path("#{File.dirname(__FILE__)}/spec_suite")
+
+class MainSpecSuite < SpecSuite
+  def files
+    Dir["#{File.dirname(__FILE__)}/polonium/**/*_spec.rb"]
+  end
+end
+
+if $0 == __FILE__
+  MainSpecSuite.new.run
+end