capybara 1.1.4 → 2.0.0

data/spec/server_spec.rb

@@ -12,9 +12,19 @@ describe Capybara::Server do
   end
 
   it "should do nothing when no server given" do
-    running do
+    expect do
       @server = Capybara::Server.new(nil).boot
-    end.should_not raise_error
+    end.not_to raise_error
+  end
+
+  it "should bind to the specified host" do
+    Capybara.server_host = '0.0.0.0'
+
+    app = proc { |env| [200, {}, "Hello Server!"]}
+    server = Capybara::Server.new(app).boot
+    server.host.should == '0.0.0.0'
+
+    Capybara.server_host = nil
   end
 
   it "should use specified port" do
@@ -29,6 +39,16 @@ describe Capybara::Server do
     Capybara.server_port = nil
   end
 
+  it "should use given port" do
+    @app = proc { |env| [200, {}, "Hello Server!"]}
+    @server = Capybara::Server.new(@app, 22790).boot
+
+    @res = Net::HTTP.start(@server.host, 22790) { |http| http.get('/') }
+    @res.body.should include('Hello Server')
+
+    Capybara.server_port = nil
+  end
+
   it "should find an available port" do
     @app1 = proc { |env| [200, {}, "Hello Server!"]}
     @app2 = proc { |env| [200, {}, "Hello Second Server!"]}
@@ -62,28 +82,20 @@ describe Capybara::Server do
     @server2a.port.should == @server2b.port
   end
 
-  it "should wait specified time for the app to boot" do
-    pending 'this test does not work: https://groups.google.com/d/msg/ruby-capybara/QrSKTbjh5rY/egvcVFYiWZMJ'
-
-    @slow_app = proc { |env| sleep(1); [200, {}, "Hello Slow Server!"] }
-
-    Capybara.server_boot_timeout = 1.5
-    @server = Capybara::Server.new(@slow_app).boot
-
-    @res = Net::HTTP.start(@server.host, @server.port) { |http| http.get('/') }
-    @res.body.should include('Hello Slow Server')
-  end
-
-  it "should raise an exception if boot timeout is exceeded" do
-    pending 'this test does not work: https://groups.google.com/d/msg/ruby-capybara/QrSKTbjh5rY/egvcVFYiWZMJ'
-
-    @slow_app = proc { |env| sleep(1); [200, {}, "Hello Slow Server!"] }
-
-    Capybara.server_boot_timeout = 0.5
-    server = Capybara::Server.new(@slow_app)
-    server.stub(:exit).and_return(:timeout)
-    server.stub(:puts)
-    server.boot.should == :timeout
+  it "should raise server errors when the server errors before the timeout" do
+    begin
+      Capybara.server do
+        sleep 0.1
+        raise 'kaboom'
+      end
+
+      proc do
+        Capybara::Server.new(proc {|e|}).boot
+      end.should raise_error(RuntimeError, 'kaboom')
+    ensure
+      # TODO refactor out the defaults so it's reliant on unset state instead of
+      # a one-time call in capybara.rb
+      Capybara.server {|app, port| Capybara.run_default_server(app, port)}
+    end
   end
-
 end

data/spec/spec_helper.rb

@@ -1,30 +1 @@
-$:.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
-
-require 'rubygems'
-require "bundler/setup"
-
-require 'rspec'
-require 'capybara'
-
-RSpec.configure do |config|
-  config.before do
-    Capybara.configure do |config|
-      config.default_selector = :xpath
-    end
-  end
-end
-
-# Required here instead of in rspec_spec to avoid RSpec deprecation warning
-require 'capybara/rspec'
-
-require 'capybara/spec/driver'
-require 'capybara/spec/session'
-
-alias :running :lambda
-
-Capybara.default_wait_time = 0 # less timeout so tests run faster
-
-module TestSessions
-  RackTest = Capybara::Session.new(:rack_test, TestApp)
-  Selenium = Capybara::Session.new(:selenium, TestApp)
-end
+require 'capybara/spec/spec_helper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,13 +138,13 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.4
   type: :development
@@ -152,7 +152,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.4
 - !ruby/object:Gem::Dependency
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -225,13 +225,13 @@ email:
 - jonas.nicklas@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
 - lib/capybara/cucumber.rb
 - lib/capybara/driver/base.rb
 - lib/capybara/driver/node.rb
 - lib/capybara/dsl.rb
+- lib/capybara/helpers.rb
 - lib/capybara/node/actions.rb
 - lib/capybara/node/base.rb
 - lib/capybara/node/document.rb
@@ -239,11 +239,13 @@ files:
 - lib/capybara/node/finders.rb
 - lib/capybara/node/matchers.rb
 - lib/capybara/node/simple.rb
+- lib/capybara/query.rb
 - lib/capybara/rack_test/browser.rb
 - lib/capybara/rack_test/driver.rb
 - lib/capybara/rack_test/form.rb
 - lib/capybara/rack_test/node.rb
 - lib/capybara/rails.rb
+- lib/capybara/result.rb
 - lib/capybara/rspec/features.rb
 - lib/capybara/rspec/matchers.rb
 - lib/capybara/rspec.rb
@@ -252,19 +254,24 @@ files:
 - lib/capybara/selenium/node.rb
 - lib/capybara/server.rb
 - lib/capybara/session.rb
-- lib/capybara/spec/driver.rb
+- lib/capybara/spec/fixtures/another_test_file.txt
 - lib/capybara/spec/fixtures/capybara.jpg
 - lib/capybara/spec/fixtures/test_file.txt
+- lib/capybara/spec/public/jquery-ui.js
+- lib/capybara/spec/public/jquery.js
 - lib/capybara/spec/public/test.js
 - lib/capybara/spec/session/all_spec.rb
+- lib/capybara/spec/session/assert_selector.rb
 - lib/capybara/spec/session/attach_file_spec.rb
+- lib/capybara/spec/session/body_spec.rb
 - lib/capybara/spec/session/check_spec.rb
 - lib/capybara/spec/session/choose_spec.rb
 - lib/capybara/spec/session/click_button_spec.rb
 - lib/capybara/spec/session/click_link_or_button_spec.rb
 - lib/capybara/spec/session/click_link_spec.rb
-- lib/capybara/spec/session/current_host_spec.rb
 - lib/capybara/spec/session/current_url_spec.rb
+- lib/capybara/spec/session/evaluate_script_spec.rb
+- lib/capybara/spec/session/execute_script_spec.rb
 - lib/capybara/spec/session/fill_in_spec.rb
 - lib/capybara/spec/session/find_button_spec.rb
 - lib/capybara/spec/session/find_by_id_spec.rb
@@ -273,23 +280,31 @@ files:
 - lib/capybara/spec/session/find_spec.rb
 - lib/capybara/spec/session/first_spec.rb
 - lib/capybara/spec/session/has_button_spec.rb
-- lib/capybara/spec/session/has_content_spec.rb
 - lib/capybara/spec/session/has_css_spec.rb
 - lib/capybara/spec/session/has_field_spec.rb
 - lib/capybara/spec/session/has_link_spec.rb
 - lib/capybara/spec/session/has_select_spec.rb
 - lib/capybara/spec/session/has_selector_spec.rb
 - lib/capybara/spec/session/has_table_spec.rb
+- lib/capybara/spec/session/has_text_spec.rb
 - lib/capybara/spec/session/has_xpath_spec.rb
 - lib/capybara/spec/session/headers.rb
-- lib/capybara/spec/session/javascript.rb
+- lib/capybara/spec/session/html_spec.rb
+- lib/capybara/spec/session/node_spec.rb
+- lib/capybara/spec/session/reset_session_spec.rb
 - lib/capybara/spec/session/response_code.rb
+- lib/capybara/spec/session/save_page_spec.rb
+- lib/capybara/spec/session/screenshot.rb
 - lib/capybara/spec/session/select_spec.rb
+- lib/capybara/spec/session/source_spec.rb
 - lib/capybara/spec/session/text_spec.rb
 - lib/capybara/spec/session/uncheck_spec.rb
 - lib/capybara/spec/session/unselect_spec.rb
+- lib/capybara/spec/session/visit_spec.rb
+- lib/capybara/spec/session/within_frame_spec.rb
 - lib/capybara/spec/session/within_spec.rb
-- lib/capybara/spec/session.rb
+- lib/capybara/spec/session/within_window_spec.rb
+- lib/capybara/spec/spec_helper.rb
 - lib/capybara/spec/test_app.rb
 - lib/capybara/spec/views/buttons.erb
 - lib/capybara/spec/views/fieldsets.erb
@@ -309,35 +324,28 @@ files:
 - lib/capybara/spec/views/with_simple_html.erb
 - lib/capybara/spec/views/within_frames.erb
 - lib/capybara/spec/views/within_popups.erb
-- lib/capybara/util/save_and_open_page.rb
-- lib/capybara/util/timeout.rb
 - lib/capybara/version.rb
 - lib/capybara.rb
 - spec/basic_node_spec.rb
 - spec/capybara_spec.rb
-- spec/driver/rack_test_driver_spec.rb
-- spec/driver/selenium_driver_spec.rb
 - spec/dsl_spec.rb
 - spec/fixtures/selenium_driver_rspec_failure.rb
 - spec/fixtures/selenium_driver_rspec_success.rb
+- spec/rack_test_spec.rb
+- spec/result_spec.rb
 - spec/rspec/features_spec.rb
 - spec/rspec/matchers_spec.rb
 - spec/rspec_spec.rb
-- spec/save_and_open_page_spec.rb
+- spec/selenium_spec.rb
 - spec/server_spec.rb
-- spec/session/rack_test_session_spec.rb
-- spec/session/selenium_session_spec.rb
 - spec/spec_helper.rb
-- spec/string_spec.rb
-- spec/timeout_spec.rb
-- README.rdoc
-- History.txt
+- README.md
+- History.md
+- License.txt
 homepage: http://github.com/jnicklas/capybara
 licenses: []
 post_install_message: 
-rdoc_options:
-- --main
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement