pivotal-selenium-rc 1.2.20090112 → 1.3.20090112

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
-:minor: 2
+:minor: 3
 :patch: 20090112
 :jar_url: http://release.seleniumhq.org/selenium-remote-control/1.0-beta-2/selenium-remote-control-1.0-beta-2-dist.zip

data/lib/selenium_rc/server.rb

@@ -14,10 +14,6 @@ module SeleniumRC
         ENV["SELENIUM_SERVER_PORT"] || "4444"
       end
 
-      def timeout
-        ENV["SELENIUM_SERVER_TIMEOUT"] || 15
-      end
-
       def service_is_running?
         begin
           socket = TCPSocket.new(host, port)
@@ -39,7 +35,6 @@ module SeleniumRC
     def start
       command = "java -jar \"#{jar_path}\""
       command << " -port #{self.class.port}"
-      command << " -timeout #{self.class.timeout}"
       puts "Running: #{command}"
       system(command)
     end
@@ -81,10 +76,6 @@ module SeleniumRC
       self.class.port
     end
 
-    def timeout
-      self.class.timeout
-    end
-
     def service_is_running?
       self.class.service_is_running?
     end
@@ -92,6 +83,7 @@ module SeleniumRC
     protected
     def wait_for_service_with_timeout
       start_time = Time.now
+      timeout = 15
 
       until self.class.service_is_running?
         if timeout && (Time.now > (start_time + timeout))

data/lib/selenium_rc.rb

@@ -1,3 +1,4 @@
 dir = File.dirname(__FILE__)
 require "socket"
 require "#{dir}/selenium_rc/server"
+require "net/http"

data/spec/install_and_run_spec.rb

@@ -11,7 +11,7 @@ describe "bin/selenium-rc" do
   end
 
   after do
-    system("lsof -i tcp:4444 | grep '(LISTEN)' | awk '{print $2}' | xargs kill -9")
+    SeleniumRC::Server.new.stop
     TCPSocket.wait_for_service_termination(:host => "0.0.0.0", :port => 4444)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-selenium-rc
 version: !ruby/object:Gem::Version 
-  version: 1.2.20090112
+  version: 1.3.20090112
 platform: ruby
 authors: 
 - Pivotal Labs