watir 6.10.0 → 6.10.1

data/lib/watirspec/remote_server.rb

@@ -1,39 +1,39 @@
-module WatirSpec
-  class RemoteServer
-    attr_reader :server
-
-    def start(port = 4444, args: [])
-      require 'selenium/server'
-
-      @server ||= Selenium::Server.new(jar,
-                                       port: Selenium::WebDriver::PortProber.above(port),
-                                       log: !!$DEBUG,
-                                       background: true,
-                                       timeout: 60)
-      args.each { |arg| @server << arg }
-      @server.start
-      at_exit { @server.stop }
-    end
-
-    private
-
-    def jar
-      if ENV['LOCAL_SELENIUM']
-        local = File.expand_path('../selenium/buck-out/gen/java/server/src/org/openqa/grid/selenium/selenium.jar')
-      end
-
-      if File.exist?(ENV['REMOTE_SERVER_BINARY'] || '')
-        ENV['REMOTE_SERVER_BINARY']
-      elsif ENV['LOCAL_SELENIUM'] && File.exists?(local)
-        local
-      elsif !Dir.glob('*selenium*.jar').empty?
-        Dir.glob('*selenium*.jar').first
-      else
-        Selenium::Server.download :latest
-      end
-    rescue SocketError
-      # not connected to internet
-      raise Watir::Exception::Error, "unable to find or download selenium-server-standalone jar"
-    end
-  end
+module WatirSpec
+  class RemoteServer
+    attr_reader :server
+
+    def start(port = 4444, args: [])
+      require 'selenium/server'
+
+      @server ||= Selenium::Server.new(jar,
+                                       port: Selenium::WebDriver::PortProber.above(port),
+                                       log: !!$DEBUG,
+                                       background: true,
+                                       timeout: 60)
+      args.each { |arg| @server << arg }
+      @server.start
+      at_exit { @server.stop }
+    end
+
+    private
+
+    def jar
+      if ENV['LOCAL_SELENIUM']
+        local = File.expand_path('../selenium/buck-out/gen/java/server/src/org/openqa/grid/selenium/selenium.jar')
+      end
+
+      if File.exist?(ENV['REMOTE_SERVER_BINARY'] || '')
+        ENV['REMOTE_SERVER_BINARY']
+      elsif ENV['LOCAL_SELENIUM'] && File.exists?(local)
+        local
+      elsif !Dir.glob('*selenium*.jar').empty?
+        Dir.glob('*selenium*.jar').first
+      else
+        Selenium::Server.download :latest
+      end
+    rescue SocketError
+      # not connected to internet
+      raise Watir::Exception::Error, "unable to find or download selenium-server-standalone jar"
+    end
+  end
 end

data/lib/watirspec/runner.rb

@@ -1,53 +1,53 @@
-module WatirSpec
-  module Runner
-
-    module BrowserHelper
-      def browser
-        $browser
-      end
-    end
-
-    module MessagesHelper
-      def messages
-        browser.div(id: 'messages').divs.map(&:text)
-      end
-    end
-
-    module_function
-
-    def execute
-      start_server
-      configure
-      add_guard_hook
-
-      @executed = true
-    end
-
-    def execute_if_necessary
-      execute unless @executed
-    end
-
-    def configure
-      Thread.abort_on_exception = true
-      return unless defined?(RSpec)
-
-      RSpec.configure do |config|
-        config.include(BrowserHelper)
-        config.include(MessagesHelper)
-
-        config.before(:suite) { $browser = WatirSpec.new_browser }
-        config.after(:suite) { $browser.close }
-      end
-    end
-
-    def start_server
-      WatirSpec::Server.run!
-    end
-
-    def add_guard_hook
-      return if WatirSpec.unguarded?
-      at_exit { WatirSpec::Guards.report }
-    end
-
-  end # SpecHelper
-end # WatirSpec
+module WatirSpec
+  module Runner
+
+    module BrowserHelper
+      def browser
+        $browser
+      end
+    end
+
+    module MessagesHelper
+      def messages
+        browser.div(id: 'messages').divs.map(&:text)
+      end
+    end
+
+    module_function
+
+    def execute
+      start_server
+      configure
+      add_guard_hook
+
+      @executed = true
+    end
+
+    def execute_if_necessary
+      execute unless @executed
+    end
+
+    def configure
+      Thread.abort_on_exception = true
+      return unless defined?(RSpec)
+
+      RSpec.configure do |config|
+        config.include(BrowserHelper)
+        config.include(MessagesHelper)
+
+        config.before(:suite) { $browser = WatirSpec.new_browser }
+        config.after(:suite) { $browser.close }
+      end
+    end
+
+    def start_server
+      WatirSpec::Server.run!
+    end
+
+    def add_guard_hook
+      return if WatirSpec.unguarded?
+      at_exit { WatirSpec::Guards.report }
+    end
+
+  end # SpecHelper
+end # WatirSpec

data/lib/watirspec/server.rb

@@ -1,99 +1,99 @@
-require 'socket'
-require 'watirspec/server/app'
-
-module WatirSpec
-  class Server
-    class << self
-      def run!
-        return if running?
-        Thread.new do
-          run_server
-          wait_for_connection
-        end
-      end
-
-      def port
-        @port ||= Selenium::WebDriver::PortProber.above(8180)
-      end
-
-      def bind
-        @bind ||= Selenium::WebDriver::Platform.windows? ? '127.0.0.1' : '0.0.0.0'
-      end
-
-      private
-
-      def running?
-        @running
-      end
-
-      def run_server
-        server = TCPServer.new(bind, port)
-        @running = true
-        loop do
-          Thread.start(server.accept) { |client| accept_client(client) }
-        end
-      end
-
-      def wait_for_connection
-        socket_poller = Selenium::WebDriver::SocketPoller.new(bind, port, 30)
-        return if socket_poller.connected?
-        raise 'Cannot start WatirSpec server.'
-      end
-
-      def app
-        @app ||= App.new
-      end
-
-      def accept_client(client)
-        start_line = client.gets
-        return unless start_line
-
-        _, path = start_line.split
-        status, headers, body = app.response(path, read_body(client))
-        headers = prepare_headers(headers, body)
-
-        client.write(response(status, headers, body))
-      rescue Errno::ECONNRESET
-        Watir.logger.warn 'Client reset connection, skipping.'
-      ensure
-        client.close
-      end
-
-      def read_body(client)
-        request_headers = read_headers(client)
-        client.read(request_headers['Content-Length'].to_i)
-      end
-
-      def read_headers(client)
-        headers = {}
-        while (line = client.gets.split(' ', 2))
-          break if line[0] == ''
-          headers[line[0].chop] = line[1].strip
-        end
-
-        headers
-      end
-
-      def prepare_headers(headers, body)
-        headers = default_headers.merge(headers)
-        headers['Content-Length'] = body.size.to_s
-        headers.to_a.map { |array| array.join(': ') }
-      end
-
-      def default_headers
-        {
-          'Cache-Control' => 'no-cache',
-          'Connection' => 'close',
-          'Content-Type' => 'text/html; charset=UTF-8',
-          'Server' => 'watirspec'
-        }
-      end
-
-      def response(status, headers, body)
-        response = ["HTTP/1.1 #{status}"] + headers
-        response = response.join("\r\n")
-        response << "\r\n\r\n#{body}\r\n"
-      end
-    end # class << Server
-  end # Server
-end # WatirSpec
+require 'socket'
+require 'watirspec/server/app'
+
+module WatirSpec
+  class Server
+    class << self
+      def run!
+        return if running?
+        Thread.new do
+          run_server
+          wait_for_connection
+        end
+      end
+
+      def port
+        @port ||= Selenium::WebDriver::PortProber.above(8180)
+      end
+
+      def bind
+        @bind ||= Selenium::WebDriver::Platform.windows? ? '127.0.0.1' : '0.0.0.0'
+      end
+
+      private
+
+      def running?
+        @running
+      end
+
+      def run_server
+        server = TCPServer.new(bind, port)
+        @running = true
+        loop do
+          Thread.start(server.accept) { |client| accept_client(client) }
+        end
+      end
+
+      def wait_for_connection
+        socket_poller = Selenium::WebDriver::SocketPoller.new(bind, port, 30)
+        return if socket_poller.connected?
+        raise 'Cannot start WatirSpec server.'
+      end
+
+      def app
+        @app ||= App.new
+      end
+
+      def accept_client(client)
+        start_line = client.gets
+        return unless start_line
+
+        _, path = start_line.split
+        status, headers, body = app.response(path, read_body(client))
+        headers = prepare_headers(headers, body)
+
+        client.write(response(status, headers, body))
+      rescue Errno::ECONNRESET
+        Watir.logger.warn 'Client reset connection, skipping.'
+      ensure
+        client.close
+      end
+
+      def read_body(client)
+        request_headers = read_headers(client)
+        client.read(request_headers['Content-Length'].to_i)
+      end
+
+      def read_headers(client)
+        headers = {}
+        while (line = client.gets.split(' ', 2))
+          break if line[0] == ''
+          headers[line[0].chop] = line[1].strip
+        end
+
+        headers
+      end
+
+      def prepare_headers(headers, body)
+        headers = default_headers.merge(headers)
+        headers['Content-Length'] = body.size.to_s
+        headers.to_a.map { |array| array.join(': ') }
+      end
+
+      def default_headers
+        {
+          'Cache-Control' => 'no-cache',
+          'Connection' => 'close',
+          'Content-Type' => 'text/html; charset=UTF-8',
+          'Server' => 'watirspec'
+        }
+      end
+
+      def response(status, headers, body)
+        response = ["HTTP/1.1 #{status}"] + headers
+        response = response.join("\r\n")
+        response << "\r\n\r\n#{body}\r\n"
+      end
+    end # class << Server
+  end # Server
+end # WatirSpec

data/lib/watirspec/server/app.rb

@@ -1,76 +1,76 @@
-module WatirSpec
-  class Server
-    class App
-      def response(path, data = nil)
-        case path
-        when '/'
-          respond(self.class.name)
-        when '/post_to_me'
-          respond("You posted the following content:\n#{data}")
-        when '/plain_text'
-          respond('This is text/plain', 'Content-Type' => 'text/plain')
-        when %r{/set_cookie}
-          respond("<html>C is for cookie, it's good enough for me</html>", 'Content-Type' => 'text/html', 'Set-Cookie' => 'monster=1')
-        when css_file?
-          respond(file_read(path), 'Content-Type' => 'text/css')
-        when js_file?
-          respond(file_read(path), 'Content-Type' => 'application/javascript')
-        when png_file?
-          respond(file_binread(path), 'Content-Type' => 'image/png')
-        when gif_file?
-          respond(file_read(path), 'Content-Type' => 'image/gif')
-        when static_file?
-          respond(file_read(path))
-        else
-          respond('')
-        end
-      end
-
-      private
-
-      def respond(body, headers = {}, status = '200 OK')
-        [status, headers, body]
-      end
-
-      def css_file?
-        proc { |path| static_file(path) && path.end_with?('.css') }
-      end
-
-      def js_file?
-        proc { |path| static_file(path) && path.end_with?('.js') }
-      end
-
-      def png_file?
-        proc { |path| static_file(path) && path.end_with?('.png') }
-      end
-
-      def gif_file?
-        proc { |path| static_file(path) && path.end_with?('.gif') }
-      end
-
-      def static_file?
-        proc { |path| static_file(path) }
-      end
-
-      def static_files
-        WatirSpec.htmls.flat_map do |html|
-          Dir["#{html}/**/*"]
-        end
-      end
-
-      def static_file(path)
-        static_files.find do |file|
-          file.end_with?(path)
-        end
-      end
-
-      def file_read(path)
-        File.read(static_file(path))
-      end
-
-      def file_binread(path)
-        File.binread(static_file(path))
-      end
-    end
-  end
-end
+module WatirSpec
+  class Server
+    class App
+      def response(path, data = nil)
+        case path
+        when '/'
+          respond(self.class.name)
+        when '/post_to_me'
+          respond("You posted the following content:\n#{data}")
+        when '/plain_text'
+          respond('This is text/plain', 'Content-Type' => 'text/plain')
+        when %r{/set_cookie}
+          respond("<html>C is for cookie, it's good enough for me</html>", 'Content-Type' => 'text/html', 'Set-Cookie' => 'monster=1')
+        when css_file?
+          respond(file_read(path), 'Content-Type' => 'text/css')
+        when js_file?
+          respond(file_read(path), 'Content-Type' => 'application/javascript')
+        when png_file?
+          respond(file_binread(path), 'Content-Type' => 'image/png')
+        when gif_file?
+          respond(file_read(path), 'Content-Type' => 'image/gif')
+        when static_file?
+          respond(file_read(path))
+        else
+          respond('')
+        end
+      end
+
+      private
+
+      def respond(body, headers = {}, status = '200 OK')
+        [status, headers, body]
+      end
+
+      def css_file?
+        proc { |path| static_file(path) && path.end_with?('.css') }
+      end
+
+      def js_file?
+        proc { |path| static_file(path) && path.end_with?('.js') }
+      end
+
+      def png_file?
+        proc { |path| static_file(path) && path.end_with?('.png') }
+      end
+
+      def gif_file?
+        proc { |path| static_file(path) && path.end_with?('.gif') }
+      end
+
+      def static_file?
+        proc { |path| static_file(path) }
+      end
+
+      def static_files
+        WatirSpec.htmls.flat_map do |html|
+          Dir["#{html}/**/*"]
+        end
+      end
+
+      def static_file(path)
+        static_files.find do |file|
+          file.end_with?(path)
+        end
+      end
+
+      def file_read(path)
+        File.read(static_file(path))
+      end
+
+      def file_binread(path)
+        File.binread(static_file(path))
+      end
+    end
+  end
+end