http-testing 0.1.0 → 0.1.1

data/lib/http_testing.rb

@@ -1,4 +1,7 @@
 module HttpTesting
+  class HttpTestingError < StandardError
+  end
+  
   autoload :Context, 'http_testing/context'
   autoload :VERSION, 'http_testing/version'
 end

data/lib/http_testing/context.rb

@@ -3,23 +3,27 @@ require 'monitor'
 
 class HttpTesting::Context
   include WEBrick
+  # extend MonitorMixin
   
-  WAIT_TIMEOUT = 0 #Works with no timeout :)
-  
-  def initialize(port)
+  def initialize(port, options = {})
+    @options = {
+      :wait_timeout => 3 #seconds
+    }.merge options
     @port = port
     
-    @monitor = Monitor.new
+    @monitor      = Monitor.new
     @completed_cond = @monitor.new_cond
-    @started_cond = @monitor.new_cond
+    @started_cond   = @monitor.new_cond
     
+    @started   = false
     @completed = false
-    @error = nil
+    @error     = nil
   end
   
   def start(&block)
+    @started   = false
     @completed = false
-    @error = nil
+    @error     = nil
     
     #Starting separate thread for the server
     @main = Thread.start do
@@ -36,24 +40,25 @@ class HttpTesting::Context
           @completed_cond.signal
         end
       end
-      
+      @started = true
+      @monitor.synchronize do
+        @started_cond.signal
+      end
       @server.start
     end
     
     #Waiting for server to start
     @monitor.synchronize do
-      @started_cond.wait(WAIT_TIMEOUT)
+      @started_cond.wait_until { @started }
     end
   end
   
   def wait
     @monitor.synchronize do
-      @completed_cond.wait(WAIT_TIMEOUT)
+      @completed_cond.wait(@options[:wait_timeout]) unless @completed
     end
-    
     @server.shutdown
-    
-    raise "HTTP Connection was not completed within #{WAIT_TIMEOUT} seconds" unless @completed
+    raise HttpTesting::HttpTestingError.new "HTTP Connection was not completed within #{@options[:wait_timeout]} seconds" unless @completed
     raise @error if @error
   end
-end
+end

data/lib/http_testing/version.rb

@@ -1,3 +1,3 @@
 module HttpTesting
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

data/spec/context_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe HttpTesting::Context do
+  def context(options = {})
+    HttpTesting::Context.new(30013, options)
+  end
+  
+  it "should start web server at specified port" do
+    started = false
+    c = context
+    c.start do |request, response|
+      started = true
+    end
+    Net::HTTP.get(URI.parse('http://localhost:30013/'))
+    c.wait
+    started.should be_true
+  end
+  
+  describe "wait" do
+    it "should raise exception if no request received withing wait_timeout" do
+      c = context(:wait_timeout => 0)
+      c.start do |request, response| end
+      lambda { c.wait }.should raise_error(HttpTesting::HttpTestingError)
+    end
+    
+    it "should reraise exception that was raised in start block" do
+      c = context(:wait_timeout => 0)
+      c.start do |request, response| 
+        raise "Error in start block"
+      end
+      Net::HTTP.get(URI.parse('http://localhost:30013/'))
+      lambda { c.wait }.should raise_error(RuntimeError)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'net/http'
+require 'rspec'
+require 'http_testing'
+
+RSpec.configure do |config|
+  config.color_enabled = true
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Evgeny Myasishchev
@@ -49,6 +49,8 @@ files:
 - lib/http_testing.rb
 - lib/http_testing/context.rb
 - lib/http_testing/version.rb
+- spec/context_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/evgeny-myasishchev/http-testing
 licenses: []
@@ -79,5 +81,6 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for testing HTTP requests in Ruby.
-test_files: []
-
+test_files: 
+- spec/context_spec.rb
+- spec/spec_helper.rb