genghisapp 2.1.0.alpha.1 → 2.1.0.rc.1

data/spec/spec_helper.rb

@@ -1,11 +1,7 @@
 require 'rspec/autorun'
-require 'capybara/rspec'
-require 'capybara/poltergeist'
 require 'json_expressions/rspec'
 require 'net/http'
-
-Capybara.default_driver = :poltergeist
-Capybara.run_server     = false
+require_relative '../genghis.rb'
 
 RSpec.configure do |config|
   def find_available_port
@@ -15,14 +11,24 @@ RSpec.configure do |config|
     server.close if server
   end
 
-  config.before :all do
+  def start_backend(backend)
     @genghis_port = find_available_port
-    @genghis_pid  = spawn 'php', '-S', "localhost:#{@genghis_port}", 'genghis.php', :out => '/dev/null'
-    Capybara.app_host = "http://localhost:#{@genghis_port}"
-    sleep 0.1
+
+    case backend
+    when :php
+      @genghis_pid = spawn 'php', '-S', "localhost:#{@genghis_port}", 'genghis.php', :out => '/dev/null'
+      sleep 0.1
+      Faraday.new url: "http://localhost:#{@genghis_port}"
+    when :ruby
+      Faraday.new do |conn|
+        conn.adapter :rack, Genghis::Server.new
+      end
+    end
   end
 
   config.after :all do
-    Process.kill('HUP', @genghis_pid)
+    # Kill any outstanding Genghis backend
+    Process.kill('HUP', @genghis_pid) unless @genghis_pid.nil?
+    @genghis_pid = nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genghisapp
 version: !ruby/object:Gem::Version
-  version: 2.1.0.alpha.1
+  version: 2.1.0.rc.1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vegas