pivotal-selenium-rc 1.5.20090512 → 1.6.20090512

data/CHANGES

@@ -0,0 +1,3 @@
+1.6.20090512
+  Properly terminate server when the process exits.
+  Fixed server blocking the process issue.

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
-:minor: 5
+:minor: 6
 :patch: 20090512
 :jar_url: http://nexus.openqa.org/content/repositories/snapshots/org/seleniumhq/selenium/selenium-remote-control/1.0-SNAPSHOT/selenium-remote-control-1.0-20090512.181627-79-dist.zip

data/lib/selenium_rc/server.rb

@@ -41,7 +41,9 @@ module SeleniumRC
       command << " -port #{self.class.port}"
       command << " #{argv.join(' ')}" if argv.length > 0
       log "Running: #{command}"
-      system(command)
+      Thread.start do
+        system(command)
+      end
     end
 
     def stop_at_exit

data/spec/install_and_run_spec.rb

@@ -10,21 +10,25 @@ describe "bin/selenium-rc" do
     end
   end
 
-  after do
-    SeleniumRC::Server.new.stop
-    TCPSocket.wait_for_service_termination(:host => "0.0.0.0", :port => 4444)
-  end
-
-  it "starts the SeleniumRC server from the downloaded jar file" do
+  it "starts the SeleniumRC server from the downloaded jar file and terminates it when finished" do
+    thread = nil
     Dir.chdir(root_dir) do
-      system("bin/selenium-rc &") || raise("bin/selenium-server failed")
+      thread = Thread.start do
+        system("bin/selenium-rc") || raise("bin/selenium-server failed")
+      end
     end
 
+    timeout {SeleniumRC::Server.service_is_running?}
+    thread.kill
+    timeout {!SeleniumRC::Server.service_is_running?}
+  end
+
+  def timeout
     start_time = Time.now
-    timeout = 15
-    until SeleniumRC::Server.service_is_running?
-      if Time.now > (start_time + timeout)
-        raise SocketError.new("Socket did not open within #{timeout} seconds")
+    timeout_length = 15
+    until yield
+      if Time.now > (start_time + timeout_length)
+        raise SocketError.new("Socket did not open within #{timeout_length} seconds")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-selenium-rc
 version: !ruby/object:Gem::Version 
-  version: 1.5.20090512
+  version: 1.6.20090512
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-05-13 00:00:00 -07:00
 default_executable: selenium-rc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,7 @@ extensions:
 extra_rdoc_files: 
 - README.markdown
 files: 
+- CHANGES
 - README.markdown
 - Rakefile
 - VERSION.yml