capybara 0.4.1.2 → 1.0.0.beta1

data/spec/rspec_spec.rb

@@ -3,8 +3,8 @@ require 'capybara/rspec'
 
 Capybara.app = TestApp
 
-describe 'capybara/rspec', :type => :acceptance do
-  it "should include Capybara in rpsec" do
+describe 'capybara/rspec', :type => :request do
+  it "should include Capybara in rspec" do
     visit('/foo')
     page.body.should include('Another World')
   end
@@ -45,3 +45,10 @@ describe 'capybara/rspec', :type => :other do
     expect { visit('/') }.to raise_error(NoMethodError)
   end
 end
+
+feature "Feature DSL" do
+  scenario "is pulled in" do
+    visit('/foo')
+    page.body.should include('Another World')
+  end
+end

data/spec/save_and_open_page_spec.rb

@@ -3,10 +3,8 @@ require 'spec_helper'
 require 'capybara/util/save_and_open_page'
 require 'launchy'
 describe Capybara do
-  describe ".save_and_open_page" do
+  describe ".save_page & .save_and_open_page" do
     before do
-      @time = Time.new.strftime("%Y%m%d%H%M%S")
-
       @temp_file = mock("FILE")
       @temp_file.stub!(:write)
       @temp_file.stub!(:close)
@@ -41,9 +39,7 @@ describe Capybara do
     end
 
     def default_file_expectations
-      @name = "capybara-#{@time}.html"
-
-      @temp_file.stub!(:path).and_return(@name)
+      @temp_file.stub!(:path).and_return('page.html')
 
       File.should_receive(:exist?).and_return true
       File.should_receive(:new).and_return @temp_file
@@ -56,19 +52,19 @@ describe Capybara do
 
       it "should create a new temporary file" do
         @temp_file.should_receive(:write).with @html
-        Capybara.save_and_open_page @html
+        Capybara.save_page @html, 'page.html'
       end
 
       it "should open the file in the browser" do
-        Capybara.should_receive(:open_in_browser).with(@name)
-        Capybara.save_and_open_page @html
+        Capybara.should_receive(:open_in_browser).with('page.html')
+        Capybara.save_and_open_page @html, 'page.html'
       end
     end
 
     describe "custom output path" do
       before do
         @custom_path = File.join('tmp', 'capybara')
-        @custom_name = File.join(@custom_path, "capybara-#{@time}.html")
+        @custom_name = File.join(@custom_path, 'page.html')
 
         @temp_file.stub!(:path).and_return(@custom_name)
 
@@ -81,12 +77,12 @@ describe Capybara do
         File.should_receive(:new).and_return @temp_file
 
         @temp_file.should_receive(:write).with @html
-        Capybara.save_and_open_page @html
+        Capybara.save_page @html, 'page.html'
       end
 
       it "should open the file - in the custom path - in the browser" do
         Capybara.should_receive(:open_in_browser).with(@custom_name)
-        Capybara.save_and_open_page @html
+        Capybara.save_and_open_page @html, 'page.html'
       end
 
       it "should be possible to configure output path" do
@@ -140,7 +136,7 @@ describe Capybara do
       def test_with_directories(directories)
         @temp_file.should_receive(:write) \
           .with expected_html_for_asset_root_with(directories)
-        Capybara.save_and_open_page @html
+        Capybara.save_page @html, 'page.html'
       end
 
       context "asset_root contains some directories" do

data/spec/server_spec.rb

@@ -63,6 +63,8 @@ describe Capybara::Server do
   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
@@ -73,6 +75,8 @@ describe Capybara::Server do
   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

data/spec/session/rack_test_session_spec.rb

@@ -8,7 +8,7 @@ describe Capybara::Session do
 
     describe '#driver' do
       it "should be a rack test driver" do
-        @session.driver.should be_an_instance_of(Capybara::Driver::RackTest)
+        @session.driver.should be_an_instance_of(Capybara::RackTest::Driver)
       end
     end
 
@@ -22,7 +22,7 @@ describe Capybara::Session do
       it "should use data-method if available" do
         @session.visit "/with_html"
         @session.click_link "A link with data-method"
-        @session.body.should == 'The requested object was deleted'
+        @session.body.should include('The requested object was deleted')
       end
     end
 

data/spec/session/selenium_session_spec.rb

@@ -8,7 +8,7 @@ describe Capybara::Session do
 
     describe '#driver' do
       it "should be a selenium driver" do
-        @session.driver.should be_an_instance_of(Capybara::Driver::Selenium)
+        @session.driver.should be_an_instance_of(Capybara::Selenium::Driver)
       end
     end
 

data/spec/spec_helper.rb

@@ -15,23 +15,9 @@ 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)
-  Culerity = Capybara::Session.new(:culerity, TestApp)
-  Celerity = Capybara::Session.new(:celerity, TestApp)
 end
 
 RSpec.configure do |config|
-
-  running_with_jruby = RUBY_PLATFORM =~ /java/
-  jruby_installed = `which jruby` && $?.success?
-
-  warn "** Skipping Celerity specs because platform is not Java" unless running_with_jruby
-  warn "** Skipping Culerity specs because JRuby is not installed" unless jruby_installed
-
-  config.filter_run_excluding(:jruby => lambda { |value|
-    return true if value == :platform && !running_with_jruby
-    return true if value == :installed && !jruby_installed
-  })
-
   config.before do
     Capybara.configure do |config|
       config.default_selector = :xpath

data/spec/string_spec.rb

@@ -64,7 +64,7 @@ describe Capybara do
       string.find('//h1').path.should == '/html/body/div/div[1]/h1'
     end
 
-    it "allows finding elements and extracting the path" do
+    it "allows finding elements and extracting the value" do
       string.find('//input').value.should == 'bar'
       string.find('//select').value.should == 'Capybara'
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capybara
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 0
-  - 4
   - 1
-  - 2
-  version: 0.4.1.2
+  - 0
+  - 0
+  - beta1
+  version: 1.0.0.beta1
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,40 +47,10 @@ dependencies:
         version: "1.16"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: culerity
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 4
-        version: 0.2.4
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: celerity
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 9
-        version: 0.7.9
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: selenium-webdriver
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,11 +61,11 @@ dependencies:
         - 27
         version: 0.0.27
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,11 +76,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,11 +91,11 @@ dependencies:
         - 4
         version: 0.5.4
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: xpath
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,14 +103,14 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 4
+        version: 0.1.4
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,11 +121,11 @@ dependencies:
         - 4
         version: 0.9.4
   type: :development
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -166,11 +136,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: launchy
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -181,11 +151,11 @@ dependencies:
         - 5
         version: 0.3.5
   type: :development
-  version_requirements: *id011
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,11 +166,11 @@ dependencies:
         - 8
         version: 0.5.8
   type: :development
-  version_requirements: *id012
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: fuubar
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -211,7 +181,21 @@ dependencies:
         - 1
         version: 0.0.1
   type: :development
-  version_requirements: *id013
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        version: "0.10"
+  type: :development
+  version_requirements: *id012
 description: Capybara is an integration testing tool for rack based web applications. It simulates how a user would interact with a website
 email: 
 - jonas.nicklas@gmail.com
@@ -224,11 +208,7 @@ extra_rdoc_files:
 files: 
 - lib/capybara/cucumber.rb
 - lib/capybara/driver/base.rb
-- lib/capybara/driver/celerity_driver.rb
-- lib/capybara/driver/culerity_driver.rb
 - lib/capybara/driver/node.rb
-- lib/capybara/driver/rack_test_driver.rb
-- lib/capybara/driver/selenium_driver.rb
 - lib/capybara/dsl.rb
 - lib/capybara/node/actions.rb
 - lib/capybara/node/base.rb
@@ -237,9 +217,17 @@ files:
 - lib/capybara/node/finders.rb
 - lib/capybara/node/matchers.rb
 - lib/capybara/node/simple.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/rspec/features.rb
+- lib/capybara/rspec/matchers.rb
 - lib/capybara/rspec.rb
 - lib/capybara/selector.rb
+- lib/capybara/selenium/driver.rb
+- lib/capybara/selenium/node.rb
 - lib/capybara/server.rb
 - lib/capybara/session.rb
 - lib/capybara/spec/driver.rb
@@ -255,6 +243,7 @@ files:
 - 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/fill_in_spec.rb
 - lib/capybara/spec/session/find_button_spec.rb
@@ -276,6 +265,7 @@ files:
 - lib/capybara/spec/session/javascript.rb
 - lib/capybara/spec/session/response_code.rb
 - lib/capybara/spec/session/select_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/within_spec.rb
@@ -286,11 +276,14 @@ files:
 - lib/capybara/spec/views/form.erb
 - lib/capybara/spec/views/frame_one.erb
 - lib/capybara/spec/views/frame_two.erb
+- lib/capybara/spec/views/header_links.erb
+- lib/capybara/spec/views/host_links.erb
 - lib/capybara/spec/views/popup_one.erb
 - lib/capybara/spec/views/popup_two.erb
 - lib/capybara/spec/views/postback.erb
 - lib/capybara/spec/views/tables.erb
 - lib/capybara/spec/views/with_html.erb
+- lib/capybara/spec/views/with_html_entities.erb
 - lib/capybara/spec/views/with_js.erb
 - lib/capybara/spec/views/with_scope.erb
 - lib/capybara/spec/views/with_simple_html.erb
@@ -302,18 +295,14 @@ files:
 - lib/capybara.rb
 - spec/basic_node_spec.rb
 - spec/capybara_spec.rb
-- spec/driver/celerity_driver_spec.rb
-- spec/driver/culerity_driver_spec.rb
 - spec/driver/rack_test_driver_spec.rb
-- spec/driver/remote_culerity_driver_spec.rb
-- spec/driver/remote_selenium_driver_spec.rb
 - spec/driver/selenium_driver_spec.rb
 - spec/dsl_spec.rb
+- spec/rspec/features_spec.rb
+- spec/rspec/matchers_spec.rb
 - spec/rspec_spec.rb
 - spec/save_and_open_page_spec.rb
 - spec/server_spec.rb
-- spec/session/celerity_session_spec.rb
-- spec/session/culerity_session_spec.rb
 - spec/session/rack_test_session_spec.rb
 - spec/session/selenium_session_spec.rb
 - spec/spec_helper.rb
@@ -342,11 +331,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: capybara