mkuklis-webrat 0.5.1 → 0.6.rc1

data/lib/webrat/selenium/matchers/have_selector.rb

@@ -1,49 +1,49 @@
-module Webrat
-  module Selenium
-    module Matchers
-      class HaveSelector
-        def initialize(expected)
-          @expected = expected
-        end
-
-        def matches?(response)
-          response.session.wait_for do
-            response.selenium.is_element_present("css=#{@expected}")
-          end
-          rescue Webrat::TimeoutError
-            false
-        end
-
-        # ==== Returns
-        # String:: The failure message.
-        def failure_message
-          "expected following text to match selector #{@expected}:\n#{@document}"
-        end
-
-        # ==== Returns
-        # String:: The failure message to be displayed in negative matches.
-        def negative_failure_message
-          "expected following text to not match selector #{@expected}:\n#{@document}"
-        end
-      end
-
-      def have_selector(content)
-        HaveSelector.new(content)
-      end
-
-      # Asserts that the body of the response contains
-      # the supplied selector
-      def assert_have_selector(expected)
-        hs = HaveSelector.new(expected)
-        assert hs.matches?(response), hs.failure_message
-      end
-
-      # Asserts that the body of the response
-      # does not contain the supplied string or regepx
-      def assert_have_no_selector(expected)
-        hs = HaveSelector.new(expected)
-        assert !hs.matches?(response), hs.negative_failure_message
-      end
-    end
-  end
-end
+module Webrat
+  module Selenium
+    module Matchers
+      class HaveSelector
+        def initialize(expected)
+          @expected = expected
+        end
+
+        def matches?(response)
+          response.session.wait_for do
+            response.selenium.is_element_present("css=#{@expected}")
+          end
+          rescue Webrat::TimeoutError
+            false
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match selector #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected following text to not match selector #{@expected}:\n#{@document}"
+        end
+      end
+
+      def have_selector(content)
+        HaveSelector.new(content)
+      end
+
+      # Asserts that the body of the response contains
+      # the supplied selector
+      def assert_have_selector(expected)
+        hs = HaveSelector.new(expected)
+        assert hs.matches?(response), hs.failure_message
+      end
+
+      # Asserts that the body of the response
+      # does not contain the supplied string or regepx
+      def assert_have_no_selector(expected)
+        hs = HaveSelector.new(expected)
+        assert !hs.matches?(response), hs.negative_failure_message
+      end
+    end
+  end
+end

data/lib/webrat/selenium/matchers/have_tag.rb

@@ -1,72 +1,72 @@
-module Webrat
-  module Selenium
-    module Matchers
-
-      class HaveTag < HaveSelector #:nodoc:
-        # ==== Returns
-        # String:: The failure message.
-        def failure_message
-          "expected following output to contain a #{tag_inspect} tag:\n#{@document}"
-        end
-
-        # ==== Returns
-        # String:: The failure message to be displayed in negative matches.
-        def negative_failure_message
-          "expected following output to omit a #{tag_inspect}:\n#{@document}"
-        end
-
-        def tag_inspect
-          options = @expected.last.dup
-          content = options.delete(:content)
-
-          html = "<#{@expected.first}"
-          options.each do |k,v|
-            html << " #{k}='#{v}'"
-          end
-
-          if content
-            html << ">#{content}</#{@expected.first}>"
-          else
-            html << "/>"
-          end
-
-          html
-        end
-
-        def query
-          options  = @expected.last.dup
-          selector = @expected.first.to_s
-
-          selector << ":contains('#{options.delete(:content)}')" if options[:content]
-
-          options.each do |key, value|
-            selector << "[#{key}='#{value}']"
-          end
-
-          Nokogiri::CSS.parse(selector).map { |ast| ast.to_xpath }
-        end
-      end
-
-      def have_tag(name, attributes = {}, &block)
-        HaveTag.new([name, attributes], &block)
-      end
-
-      alias_method :match_tag, :have_tag
-
-      # Asserts that the body of the response contains
-      # the supplied tag with the associated selectors
-      def assert_have_tag(name, attributes = {})
-        ht = HaveTag.new([name, attributes])
-        assert ht.matches?(response), ht.failure_message
-      end
-
-      # Asserts that the body of the response
-      # does not contain the supplied string or regepx
-      def assert_have_no_tag(name, attributes = {})
-        ht = HaveTag.new([name, attributes])
-        assert !ht.matches?(response), ht.negative_failure_message
-      end
-
-    end
-  end
-end
+module Webrat
+  module Selenium
+    module Matchers
+
+      class HaveTag < HaveSelector #:nodoc:
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following output to contain a #{tag_inspect} tag:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected following output to omit a #{tag_inspect}:\n#{@document}"
+        end
+
+        def tag_inspect
+          options = @expected.last.dup
+          content = options.delete(:content)
+
+          html = "<#{@expected.first}"
+          options.each do |k,v|
+            html << " #{k}='#{v}'"
+          end
+
+          if content
+            html << ">#{content}</#{@expected.first}>"
+          else
+            html << "/>"
+          end
+
+          html
+        end
+
+        def query
+          options  = @expected.last.dup
+          selector = @expected.first.to_s
+
+          selector << ":contains('#{options.delete(:content)}')" if options[:content]
+
+          options.each do |key, value|
+            selector << "[#{key}='#{value}']"
+          end
+
+          Nokogiri::CSS.parse(selector).map { |ast| ast.to_xpath }
+        end
+      end
+
+      def have_tag(name, attributes = {}, &block)
+        HaveTag.new([name, attributes], &block)
+      end
+
+      alias_method :match_tag, :have_tag
+
+      # Asserts that the body of the response contains
+      # the supplied tag with the associated selectors
+      def assert_have_tag(name, attributes = {})
+        ht = HaveTag.new([name, attributes])
+        assert ht.matches?(response), ht.failure_message
+      end
+
+      # Asserts that the body of the response
+      # does not contain the supplied string or regepx
+      def assert_have_no_tag(name, attributes = {})
+        ht = HaveTag.new([name, attributes])
+        assert !ht.matches?(response), ht.negative_failure_message
+      end
+
+    end
+  end
+end

data/lib/webrat/selenium/matchers/have_xpath.rb

@@ -1,45 +1,45 @@
-module Webrat
-  module Selenium
-    module Matchers
-      class HaveXpath
-        def initialize(expected)
-          @expected = expected
-        end
-
-        def matches?(response)
-          response.session.wait_for do
-            response.selenium.is_element_present("xpath=#{@expected}")
-          end
-          rescue Webrat::TimeoutError
-            false
-        end
-
-        # ==== Returns
-        # String:: The failure message.
-        def failure_message
-          "expected following text to match xpath #{@expected}:\n#{@document}"
-        end
-
-        # ==== Returns
-        # String:: The failure message to be displayed in negative matches.
-        def negative_failure_message
-          "expected following text to not match xpath #{@expected}:\n#{@document}"
-        end
-      end
-
-      def have_xpath(xpath)
-        HaveXpath.new(xpath)
-      end
-
-      def assert_have_xpath(expected)
-        hs = HaveXpath.new(expected)
-        assert hs.matches?(response), hs.failure_message
-      end
-
-      def assert_have_no_xpath(expected)
-        hs = HaveXpath.new(expected)
-        assert !hs.matches?(response), hs.negative_failure_message
-      end
-    end
-  end
-end
+module Webrat
+  module Selenium
+    module Matchers
+      class HaveXpath
+        def initialize(expected)
+          @expected = expected
+        end
+
+        def matches?(response)
+          response.session.wait_for do
+            response.selenium.is_element_present("xpath=#{@expected}")
+          end
+          rescue Webrat::TimeoutError
+            false
+        end
+
+        # ==== Returns
+        # String:: The failure message.
+        def failure_message
+          "expected following text to match xpath #{@expected}:\n#{@document}"
+        end
+
+        # ==== Returns
+        # String:: The failure message to be displayed in negative matches.
+        def negative_failure_message
+          "expected following text to not match xpath #{@expected}:\n#{@document}"
+        end
+      end
+
+      def have_xpath(xpath)
+        HaveXpath.new(xpath)
+      end
+
+      def assert_have_xpath(expected)
+        hs = HaveXpath.new(expected)
+        assert hs.matches?(response), hs.failure_message
+      end
+
+      def assert_have_no_xpath(expected)
+        hs = HaveXpath.new(expected)
+        assert !hs.matches?(response), hs.negative_failure_message
+      end
+    end
+  end
+end

data/lib/webrat/selenium/matchers.rb

@@ -1,4 +1,4 @@
-require "webrat/selenium/matchers/have_xpath"
-require "webrat/selenium/matchers/have_selector"
-# require "webrat/selenium/matchers/have_tag"
-require "webrat/selenium/matchers/have_content"
+require "webrat/selenium/matchers/have_xpath"
+require "webrat/selenium/matchers/have_selector"
+# require "webrat/selenium/matchers/have_tag"
+require "webrat/selenium/matchers/have_content"

data/lib/webrat/selenium/selenium_extensions.js

@@ -1,6 +1,6 @@
-PatternMatcher.strategies['evalregex'] = function(regexpString) {
-  this.regexp = eval(regexpString);
-  this.matches = function(actual) {
-    return this.regexp.test(actual);
-  };
+PatternMatcher.strategies['evalregex'] = function(regexpString) {
+  this.regexp = eval(regexpString);
+  this.matches = function(actual) {
+    return this.regexp.test(actual);
+  };
 };

data/lib/webrat/selenium/selenium_rc_server.rb

@@ -1,86 +1,86 @@
-module Webrat
-  module Selenium
-
-    class SeleniumRCServer
-
-      include Webrat::Selenium::SilenceStream
-
-      def self.boot
-        new.boot
-      end
-
-      def boot
-        return if selenium_grid?
-
-        start
-        wait
-        stop_at_exit
-      end
-
-      def start
-        silence_stream(STDOUT) do
-          remote_control.start :background => true
-        end
-      end
-
-      def stop_at_exit
-        at_exit do
-          stop
-        end
-      end
-
-      def remote_control
-        return @remote_control if @remote_control
-
-        @remote_control = ::Selenium::RemoteControl::RemoteControl.new("127.0.0.1",
-                                                                       Webrat.configuration.selenium_server_port,
-                                                                       :timeout => Webrat.configuration.selenium_browser_startup_timeout)
-        @remote_control.jar_file = jar_path
-
-        return @remote_control
-      end
-
-      def jar_path
-        File.expand_path(__FILE__ + "../../../../../vendor/selenium-server.jar")
-      end
-
-      def selenium_grid?
-        Webrat.configuration.selenium_server_address
-      end
-
-      def wait
-        $stderr.print "==> Waiting for Selenium RC server on port #{Webrat.configuration.selenium_server_port}... "
-        wait_for_socket
-        $stderr.print "Ready!\n"
-      rescue SocketError
-        fail
-      end
-
-      def wait_for_socket
-        silence_stream(STDOUT) do
-          TCPSocket.wait_for_service_with_timeout \
-            :host     => (Webrat.configuration.selenium_server_address || "127.0.0.1"),
-            :port     => Webrat.configuration.selenium_server_port,
-            :timeout  => 15 # seconds
-        end
-      end
-
-      def fail
-        $stderr.puts
-        $stderr.puts
-        $stderr.puts "==> Failed to boot the Selenium RC server... exiting!"
-        exit
-      end
-
-      def stop
-        silence_stream(STDOUT) do
-          ::Selenium::RemoteControl::RemoteControl.new("127.0.0.1",
-                                                       Webrat.configuration.selenium_server_port,
-                                                       :timeout => 5).stop
-        end
-      end
-
-    end
-
-  end
-end
+module Webrat
+  module Selenium
+
+    class SeleniumRCServer
+
+      include Webrat::Selenium::SilenceStream
+
+      def self.boot
+        new.boot
+      end
+
+      def boot
+        return if selenium_grid?
+
+        start
+        wait
+        stop_at_exit
+      end
+
+      def start
+        silence_stream(STDOUT) do
+          remote_control.start :background => true
+        end
+      end
+
+      def stop_at_exit
+        at_exit do
+          stop
+        end
+      end
+
+      def remote_control
+        return @remote_control if @remote_control
+
+        @remote_control = ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
+                                                                       Webrat.configuration.selenium_server_port,
+                                                                       :timeout => Webrat.configuration.selenium_browser_startup_timeout)
+        @remote_control.jar_file = jar_path
+
+        return @remote_control
+      end
+
+      def jar_path
+        File.expand_path(__FILE__ + "../../../../../vendor/selenium-server.jar")
+      end
+
+      def selenium_grid?
+        Webrat.configuration.selenium_server_address
+      end
+
+      def wait
+        $stderr.print "==> Waiting for Selenium RC server on port #{Webrat.configuration.selenium_server_port}... "
+        wait_for_socket
+        $stderr.print "Ready!\n"
+      rescue SocketError
+        fail
+      end
+
+      def wait_for_socket
+        silence_stream(STDOUT) do
+          TCPSocket.wait_for_service_with_timeout \
+            :host     => (Webrat.configuration.selenium_server_address || "0.0.0.0"),
+            :port     => Webrat.configuration.selenium_server_port,
+            :timeout  => 15 # seconds
+        end
+      end
+
+      def fail
+        $stderr.puts
+        $stderr.puts
+        $stderr.puts "==> Failed to boot the Selenium RC server... exiting!"
+        exit
+      end
+
+      def stop
+        silence_stream(STDOUT) do
+          ::Selenium::RemoteControl::RemoteControl.new("0.0.0.0",
+                                                       Webrat.configuration.selenium_server_port,
+                                                       :timeout => 5).stop
+        end
+      end
+
+    end
+
+  end
+end