Merge pull request #3 from djanowski/mock-server-stop

Add ability to stop MockServer again

lib/mock_server.rb

@@ -23,6 +23,14 @@ def start
     self
   end
 
+  def stop
+    Rack::Handler::WEBrick.shutdown
+
+    wait_for_shutdown("0.0.0.0", @port)
+
+    self
+  end
+
   module Methods
     def mock_server(*args, &block)
       app = Class.new(Sinatra::Base)
@@ -45,6 +53,7 @@ def listening?(host, port)
       socket.close unless socket.nil?
       true
     rescue Errno::ECONNREFUSED,
+      Errno::ECONNRESET,
       Errno::EBADF,           # Windows
       Errno::EADDRNOTAVAIL    # Windows
       false
@@ -62,4 +71,16 @@ def wait_for_service(host, port, timeout = 5)
 
     true
   end
+
+  def wait_for_shutdown(host, port, timeout = 5)
+    start_time = Time.now
+
+    until !listening?(host, port)
+      if timeout && (Time.now > (start_time + timeout))
+        raise SocketError.new("Socket did not close within #{timeout} seconds")
+      end
+    end
+
+    true
+  end
 end

test/mock_server_test.rb

@@ -50,3 +50,20 @@ def test_server
     assert_equal "Goodbye", open("http://localhost:4002").read
   end
 end
+
+class MockServerStopTest < Test::Unit::TestCase
+  def setup
+    @server = MockServer.new(HelloWorldSinatra, 4003)
+    @server.start
+  end
+
+  def test_stop_server
+    assert_equal "Hello", open("http://localhost:4003").read
+
+    @server.stop
+
+    assert_raises(Errno::ECONNREFUSED) {
+      open("http://localhost:4003").read
+    }
+  end
+end