capybara 2.2.1 → 2.3.0

data/spec/rspec_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-describe 'capybara/rspec', :type => :feature do
+RSpec.describe 'capybara/rspec', :type => :feature do
   it "should include Capybara in rspec" do
     visit('/foo')
-    page.body.should include('Another World')
+    expect(page.body).to include('Another World')
   end
 
   context "resetting session" do
     it "sets a cookie in one example..." do
       visit('/set_cookie')
-      page.body.should include('Cookie set to test_cookie')
+      expect(page.body).to include('Cookie set to test_cookie')
     end
 
-    it "...then it is not availbable in the next" do
+    it "...then it is not available in the next" do
       visit('/get_cookie')
-      page.body.should_not include('test_cookie')
+      expect(page.body).not_to include('test_cookie')
     end
   end
 
@@ -24,20 +24,20 @@ describe 'capybara/rspec', :type => :feature do
     end
 
     it "...then it has returned to the default in the next example" do
-      Capybara.current_driver.should == :rack_test
+      expect(Capybara.current_driver).to eq(:rack_test)
     end
   end
 
   it "switches to the javascript driver when giving it as metadata", :js => true do
-    Capybara.current_driver.should == Capybara.javascript_driver
+    expect(Capybara.current_driver).to eq(Capybara.javascript_driver)
   end
 
   it "switches to the given driver when giving it as metadata", :driver => :culerity do
-    Capybara.current_driver.should == :culerity
+    expect(Capybara.current_driver).to eq(:culerity)
   end
 end
 
-describe 'capybara/rspec', :type => :other do
+RSpec.describe 'capybara/rspec', :type => :other do
   it "should not include Capybara" do
     expect { visit('/') }.to raise_error(NoMethodError)
   end
@@ -46,6 +46,6 @@ end
 feature "Feature DSL" do
   scenario "is pulled in" do
     visit('/foo')
-    page.body.should include('Another World')
+    expect(page.body).to include('Another World')
   end
 end

data/spec/selenium_spec.rb

@@ -11,13 +11,13 @@ module TestSessions
   Selenium = Capybara::Session.new(:selenium_focus, TestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :skip => [
+Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :capybara_skip => [
   :response_headers,
   :status_code,
   :trigger
 ]
 
-describe Capybara::Session do
+RSpec.describe Capybara::Session do
   context 'with selenium driver' do
     before do
       @session = TestSessions::Selenium
@@ -25,13 +25,21 @@ describe Capybara::Session do
 
     describe '#driver' do
       it "should be a selenium driver" do
-        @session.driver.should be_an_instance_of(Capybara::Selenium::Driver)
+        expect(@session.driver).to be_an_instance_of(Capybara::Selenium::Driver)
       end
     end
 
     describe '#mode' do
       it "should remember the mode" do
-        @session.mode.should == :selenium_focus
+        expect(@session.mode).to eq(:selenium_focus)
+      end
+    end
+
+    describe "#reset!" do
+      it "freshly reset session should not be touched" do
+        @session.instance_variable_set(:@touched, true)
+        @session.reset!
+        expect(@session.instance_variable_get(:@touched)).to eq false
       end
     end
 
@@ -47,13 +55,30 @@ describe Capybara::Session do
 
       it "should have return code 1 when running selenium_driver_rspec_failure.rb" do
         `rspec spec/fixtures/selenium_driver_rspec_failure.rb`
-        $?.exitstatus.should be 1
+        expect($?.exitstatus).to be 1
       end
 
       it "should have return code 0 when running selenium_driver_rspec_success.rb" do
         `rspec spec/fixtures/selenium_driver_rspec_success.rb`
-        $?.exitstatus.should be 0
+        expect($?.exitstatus).to be 0
       end
     end
   end
 end
+
+RSpec.describe Capybara::Selenium::Driver do
+  before do
+    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox)
+  end
+  
+  describe '#quit' do
+    it "should reset browser when quit" do
+      expect(@driver.browser).to be
+      @driver.quit
+      #access instance variable directly so we don't create a new browser instance
+      expect(@driver.instance_variable_get(:@browser)).to be_nil
+    end
+  end
+end
+
+

data/spec/selenium_spec_chrome.rb

@@ -14,8 +14,8 @@ module TestSessions
   Chrome = Capybara::Session.new(:selenium_chrome, ChromeTestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", :skip => [
+Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", :capybara_skip => [
   :response_headers,
   :status_code,
   :trigger  
-]
+  ] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java')

data/spec/server_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Capybara::Server do
+RSpec.describe Capybara::Server do
 
   it "should spool up a rack server" do
     @app = proc { |env| [200, {}, ["Hello Server!"]]}
@@ -8,7 +8,7 @@ describe Capybara::Server do
 
     @res = Net::HTTP.start(@server.host, @server.port) { |http| http.get('/') }
 
-    @res.body.should include('Hello Server')
+    expect(@res.body).to include('Hello Server')
   end
 
   it "should do nothing when no server given" do
@@ -42,7 +42,7 @@ describe Capybara::Server do
     @server = Capybara::Server.new(@app).boot
 
     @res = Net::HTTP.start(@server.host, 22789) { |http| http.get('/') }
-    @res.body.should include('Hello Server')
+    expect(@res.body).to include('Hello Server')
 
     Capybara.server_port = nil
   end
@@ -52,7 +52,7 @@ describe Capybara::Server do
     @server = Capybara::Server.new(@app, 22790).boot
 
     @res = Net::HTTP.start(@server.host, 22790) { |http| http.get('/') }
-    @res.body.should include('Hello Server')
+    expect(@res.body).to include('Hello Server')
 
     Capybara.server_port = nil
   end
@@ -65,10 +65,10 @@ describe Capybara::Server do
     @server2 = Capybara::Server.new(@app2).boot
 
     @res1 = Net::HTTP.start(@server1.host, @server1.port) { |http| http.get('/') }
-    @res1.body.should include('Hello Server')
+    expect(@res1.body).to include('Hello Server')
 
     @res2 = Net::HTTP.start(@server2.host, @server2.port) { |http| http.get('/') }
-    @res2.body.should include('Hello Second Server')
+    expect(@res2.body).to include('Hello Second Server')
   end
 
   it "should use the server if it already running" do
@@ -81,13 +81,13 @@ describe Capybara::Server do
     @server2b = Capybara::Server.new(@app2).boot
 
     @res1 = Net::HTTP.start(@server1b.host, @server1b.port) { |http| http.get('/') }
-    @res1.body.should include('Hello Server')
+    expect(@res1.body).to include('Hello Server')
 
     @res2 = Net::HTTP.start(@server2b.host, @server2b.port) { |http| http.get('/') }
-    @res2.body.should include('Hello Second Server')
+    expect(@res2.body).to include('Hello Second Server')
 
-    @server1a.port.should == @server1b.port
-    @server2a.port.should == @server2b.port
+    expect(@server1a.port).to eq(@server1b.port)
+    expect(@server2a.port).to eq(@server2b.port)
   end
 
   it "should raise server errors when the server errors before the timeout" do
@@ -97,9 +97,9 @@ describe Capybara::Server do
         raise 'kaboom'
       end
 
-      proc do
+      expect do
         Capybara::Server.new(proc {|e|}).boot
-      end.should raise_error(RuntimeError, 'kaboom')
+      end.to 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
@@ -110,7 +110,7 @@ describe Capybara::Server do
   it "is not #responsive? when Net::HTTP raises a SystemCallError" do
     app = lambda { [200, {}, ['Hello, world']] }
     server = Capybara::Server.new(app)
-    Net::HTTP.should_receive(:start).and_raise(SystemCallError.allocate)
+    expect(Net::HTTP).to receive(:start).and_raise(SystemCallError.allocate)
     expect(server.responsive?).to eq false
   end
 end

metadata

@@ -1,230 +1,210 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDPDCCAiSgAwIBAgIBADANBgkqhkiG9w0BAQUFADBEMRYwFAYDVQQDDA1qb25h
-  cy5uaWNrbGFzMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wHhcNMTMwMjE1MjE1NTM2WhcNMTQwMjE1MjE1NTM2WjBEMRYwFAYDVQQD
-  DA1qb25hcy5uaWNrbGFzMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJ
-  k/IsZAEZFgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb9AZj
-  gNdUKIEFktnRTerfYsCqpAFY97qtTbruj4uEKJeyHRLR4FM3sUe4N6Yb48a3JLpA
-  HQ1ELh5cSdJdyx8TEXmKscrqEcc2lXSgbkoFpyo6IAcEOSpC9vlAeyGpwkKI/+bP
-  bWw3jV236q0Cr7aFMH6nmUvJJsadOwNyUYZWATqOt6X3QoLiEphf7SwhLzAZJr6f
-  HhvjJ0Xo2y/LiJj9N0goOhUL6tC5ws5j4wxP8Z+YFY0Q7x7Q6RQBWcCUhc/GAWex
-  0eXRj2QOTzVrrIOnPN1jqifnqqU30YoMFMh/e6o3x/ziYMn7zAbFXSbtXDKCK4BT
-  3zGZgCiuecspHy9/AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFPb8+DY0
-  fm9BZldc/eaKZxfI6XucMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEA
-  JtZrjd9Ds5rcBVP2L9vEa6F2oseq7ye8bavQo9Uh81fDCbVdnaZPhyMth5QhdIBL
-  pG+uafCMAfgU0vQeNXnAzIxmltnP4+e3IwR0Oe21eUD6lSPSvCoIaQ2eDVxoHPPJ
-  5NrJKxj2uuNV1yGLmVhXUFET0OkVvBgdxNmtbE2rRbxXjv5xqW6nBsgVAz0qSxB3
-  9yDTZKW7++Em+yFufMlDr7+1rl8cTxv1Kj43Geu5LVz7n/lHYKAdje4uJ3eBtagI
-  dwCI6mleXOr4MSRezf19ZUFr0CqlFcrpBSyOakStQLM8La3EAmhOEUa2UE2FIgq5
-  R1SH1ni+3bH7B4tAkbWskg==
-  -----END CERTIFICATE-----
-date: 2014-01-06 00:00:00.000000000 Z
+- gem-public_cert.pem
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: xpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Capybara is an integration testing tool for rack based web applications.
@@ -235,6 +215,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- History.md
+- License.txt
+- README.md
+- lib/capybara.rb
 - lib/capybara/cucumber.rb
 - lib/capybara/driver/base.rb
 - lib/capybara/driver/node.rb
@@ -255,9 +239,9 @@ files:
 - lib/capybara/rack_test/node.rb
 - lib/capybara/rails.rb
 - lib/capybara/result.rb
+- lib/capybara/rspec.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
@@ -306,8 +290,9 @@ files:
 - 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_and_open_screenshot_spec.rb
 - lib/capybara/spec/session/save_page_spec.rb
-- lib/capybara/spec/session/screenshot.rb
+- lib/capybara/spec/session/screenshot_spec.rb
 - lib/capybara/spec/session/select_spec.rb
 - lib/capybara/spec/session/source_spec.rb
 - lib/capybara/spec/session/text_spec.rb
@@ -315,9 +300,16 @@ files:
 - 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/window/become_closed_spec.rb
+- lib/capybara/spec/session/window/current_window_spec.rb
+- lib/capybara/spec/session/window/open_new_window_spec.rb
+- lib/capybara/spec/session/window/switch_to_window_spec.rb
+- lib/capybara/spec/session/window/window_opened_by_spec.rb
+- lib/capybara/spec/session/window/window_spec.rb
+- lib/capybara/spec/session/window/windows_spec.rb
+- lib/capybara/spec/session/window/within_window_spec.rb
 - lib/capybara/spec/session/within_frame_spec.rb
 - lib/capybara/spec/session/within_spec.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
@@ -342,10 +334,10 @@ files:
 - lib/capybara/spec/views/with_scope.erb
 - lib/capybara/spec/views/with_simple_html.erb
 - lib/capybara/spec/views/with_title.erb
+- lib/capybara/spec/views/with_windows.erb
 - lib/capybara/spec/views/within_frames.erb
-- lib/capybara/spec/views/within_popups.erb
 - lib/capybara/version.rb
-- lib/capybara.rb
+- lib/capybara/window.rb
 - spec/basic_node_spec.rb
 - spec/capybara_spec.rb
 - spec/dsl_spec.rb
@@ -360,9 +352,6 @@ files:
 - spec/selenium_spec_chrome.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-- README.md
-- History.md
-- License.txt
 homepage: http://github.com/jnicklas/capybara
 licenses:
 - MIT
@@ -373,17 +362,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: capybara
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,