@@ -7,4 +7,4 @@ require "webrick" require File.expand_path(File.dirname(__FILE__) + "/../lib/testjour") require "testjour/http_queue" -Rack::Handler::WEBrick.run Testjour::HttpQueue, :Port => Testjour::HttpQueue.port \ No newline at end of file +Testjour::HttpQueue.run_on(Rack::Handler::WEBrick) \ No newline at end of file bin/httpq @@ -1,6 +1,5 @@ require "testjour/commands/command" require "testjour/http_queue" -require "testjour/core_extensions/wait_for_service" require "systemu" module Testjour @@ -21,7 +20,7 @@ module Commands Process.kill("INT", pid) end - TCPSocket.wait_for_service :host => "0.0.0.0", :port => Testjour::HttpQueue.port + HttpQueue.wait_for_service status, stdout, stderr = systemu(cmd) lib/testjour/commands/run.rb @@ -1,6 +1,20 @@ +require "testjour/core_extensions/wait_for_service" + module Testjour class HttpQueue + def self.run_on(handler) + handler.run self, :Port => port + end + + def self.wait_for_service + TCPSocket.wait_for_service :host => "0.0.0.0", :port => port + end + + def self.with_net_http(&block) + Net::HTTP.start("0.0.0.0", port, &block) + end + def self.port 15434 end lib/testjour/http_queue.rb @@ -4,7 +4,6 @@ require "fileutils" require "net/http" require File.expand_path(File.dirname(__FILE__) + "/../lib/testjour") -require "testjour/core_extensions/wait_for_service" require "testjour/http_queue" Spec::Runner.configure do |config| @@ -15,7 +14,7 @@ Spec::Runner.configure do |config| exec "ruby httpq" end - TCPSocket.wait_for_service :host => "0.0.0.0", :port => Testjour::HttpQueue.port + Testjour::HttpQueue.wait_for_service end def shutdown_queue @@ -24,24 +23,20 @@ Spec::Runner.configure do |config| end def get(path) - with_http do |http| + Testjour::HttpQueue.with_net_http do |http| get = Net::HTTP::Get.new(path) @response = http.request(get) end end def post(path, data = {}) - with_http do |http| + Testjour::HttpQueue.with_net_http do |http| post = Net::HTTP::Post.new(path) post.form_data = data @response = http.request(post) end end - def with_http(&block) - Net::HTTP.start("0.0.0.0", Testjour::HttpQueue.port, &block) - end - def response @response end spec/spec_helper.rb cefc6a8de4f362435a3274b3e07bf2832ccfb3bb Bryan Helmkamp bryan@brynary.com http://github.com/brynary/testjour/commit/bdbf1c797978815eafce4c224c62df4dde38e456 bdbf1c797978815eafce4c224c62df4dde38e456 2009-02-02T22:28:39-08:00 2009-02-02T22:28:39-08:00 Pushing logic into HttpQueue a8b81238e72aabda84c966cd33acc0d97d8947b0 Bryan Helmkamp bryan@brynary.com