spec_helper.rb in twitter-stream-0.1.7

- old
+ new

@@ -1,13 +1,14 @@
 require 'rubygems'
-lib_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+$:.unshift File.expand_path("../../lib", __FILE__)
 
-gem 'rspec'
+gem 'rspec', '= 1.3.0'
 require 'spec'
 require 'spec/mocks'
 
+require 'twitter/json_stream'
+
 def fixture_path(path)
   File.join(File.dirname(__FILE__), '..', 'fixtures', path)
 end
 
 def read_fixture(path)
@@ -16,10 +17,12 @@
 
 def connect_stream(opts={}, &blk)
   EM.run {
     opts.merge!(:host => Host, :port => Port)
     stop_in = opts.delete(:stop_in) || 0.5
-    EM.start_server Host, Port, JSONServer
+    unless opts[:start_server] == false
+      EM.start_server Host, Port, JSONServer
+    end
     @stream = JSONStream.connect(opts)
     blk.call if blk
     EM.add_timer(stop_in){ EM.stop }
   }
 end
\ No newline at end of file