capybara 2.2.1 → 2.3.0

data/lib/capybara/spec/session/within_spec.rb

@@ -8,21 +8,21 @@ Capybara::SpecHelper.spec '#within' do
       @session.within(:css, "#for_bar li", text: 'With Simple HTML') do
         @session.click_link('Go')
       end
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
 
     it "should assert content in the given scope" do
       @session.within(:css, "#for_foo") do
-        @session.should_not have_content('First Name')
+        expect(@session).not_to have_content('First Name')
       end
-      @session.should have_content('First Name')
+      expect(@session).to have_content('First Name')
     end
 
     it "should accept additional options" do
       @session.within(:css, "#for_bar li", :text => 'With Simple HTML') do
         @session.click_link('Go')
       end
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
   end
 
@@ -31,7 +31,7 @@ Capybara::SpecHelper.spec '#within' do
       @session.within(:xpath, "//div[@id='for_bar']//li[contains(.,'With Simple HTML')]") do
         @session.click_link('Go')
       end
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
   end
 
@@ -40,7 +40,7 @@ Capybara::SpecHelper.spec '#within' do
       @session.within("//div[@id='for_bar']//li[contains(.,'With Simple HTML')]") do
         @session.click_link('Go')
       end
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
   end
 
@@ -51,7 +51,7 @@ Capybara::SpecHelper.spec '#within' do
       @session.within(node_of_interest) do
         @session.click_link('Go')
       end
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
   end
 
@@ -61,7 +61,7 @@ Capybara::SpecHelper.spec '#within' do
       @session.within("#for_bar li", text: 'With Simple HTML') do
         @session.click_link('Go')
       end
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
     after { Capybara.default_selector = :xpath }
   end
@@ -73,7 +73,7 @@ Capybara::SpecHelper.spec '#within' do
           @session.click_link('Go')
         end
       end
-      @session.should have_content('Another World')
+      expect(@session).to have_content('Another World')
     end
 
     it "should respect the outer scope" do
@@ -82,7 +82,7 @@ Capybara::SpecHelper.spec '#within' do
           @session.click_link('Go')
         end
       end
-      @session.should have_content('Hello world')
+      expect(@session).to have_content('Hello world')
     end
   end
 
@@ -110,13 +110,13 @@ Capybara::SpecHelper.spec '#within' do
     @session.within("//li[contains(.,'Bar')]") do
       @session.click_button('Go')
     end
-    extract_results(@session)['first_name'].should == 'Peter'
+    expect(extract_results(@session)['first_name']).to eq('Peter')
     @session.visit('/with_scope')
     @session.within("//li[contains(.,'Bar')]") do
       @session.fill_in('First Name', :with => 'Dagobert')
       @session.click_button('Go')
     end
-    extract_results(@session)['first_name'].should == 'Dagobert'
+    expect(extract_results(@session)['first_name']).to eq('Dagobert')
   end
 end
 
@@ -130,7 +130,7 @@ Capybara::SpecHelper.spec '#within_fieldset' do
       @session.fill_in("Name", :with => 'Goldfinger')
       @session.click_button("Create")
     end
-    extract_results(@session)['villain_name'].should == 'Goldfinger'
+    expect(extract_results(@session)['villain_name']).to eq('Goldfinger')
   end
 
   it "should restrict scope to a fieldset given by legend" do
@@ -138,7 +138,7 @@ Capybara::SpecHelper.spec '#within_fieldset' do
       @session.fill_in("Name", :with => 'Goldfinger')
       @session.click_button("Create")
     end
-    extract_results(@session)['villain_name'].should == 'Goldfinger'
+    expect(extract_results(@session)['villain_name']).to eq('Goldfinger')
   end
 end
 
@@ -152,7 +152,7 @@ Capybara::SpecHelper.spec '#within_table' do
       @session.fill_in("Name", :with => 'Christmas')
       @session.click_button("Create")
     end
-    extract_results(@session)['girl_name'].should == 'Christmas'
+    expect(extract_results(@session)['girl_name']).to eq('Christmas')
   end
 
   it "should restrict scope to a fieldset given by legend" do
@@ -160,6 +160,6 @@ Capybara::SpecHelper.spec '#within_table' do
       @session.fill_in("Name", :with => 'Quantum')
       @session.click_button("Create")
     end
-    extract_results(@session)['villain_name'].should == 'Quantum'
+    expect(extract_results(@session)['villain_name']).to eq('Quantum')
   end
 end

data/lib/capybara/spec/spec_helper.rb

@@ -4,6 +4,15 @@ require "capybara/rspec" # Required here instead of in rspec_spec to avoid RSpec
 require "capybara/spec/test_app"
 require "nokogiri"
 
+# Alias be_truthy/be_falsey if not already defined to be able to use in RSpec 2 and 3
+unless RSpec::Matchers.method_defined?(:be_truthy)
+  RSpec::Matchers.module_eval do
+    alias be_truthy be_true
+    alias be_falsey be_false
+    alias be_falsy be_false
+  end
+end
+
 module Capybara
   module SpecHelper
     class << self
@@ -27,9 +36,9 @@ module Capybara
       end
 
       def filter(requires, metadata)
-        if requires and metadata[:skip]
+        if requires and metadata[:capybara_skip]
           requires.any? do |require|
-            metadata[:skip].include?(require)
+            metadata[:capybara_skip].include?(require)
           end
         else
           false
@@ -43,8 +52,9 @@ module Capybara
 
       def run_specs(session, name, options={})
         specs = @specs
-        describe Capybara::Session, name, options do
+        RSpec.describe Capybara::Session, name, options do
           include Capybara::SpecHelper
+          include Capybara::RSpecMatchers
           before do
             @session = session
           end
@@ -83,4 +93,4 @@ module Capybara
   end
 end
 
-Dir[File.dirname(__FILE__)+'/session/*'].each { |group| require group }
+Dir[File.dirname(__FILE__) + "/session/**/*.rb"].each { |file| require_relative file }

data/lib/capybara/spec/views/form.erb

@@ -429,6 +429,13 @@ New line after and before textarea tag
   </p>
 </form>
 
+<form action="/other_form" method="post">
+  <p>
+    <input type="text" name="form[which_form]" value="formaction form"/>
+  </p>
+  <input type="submit" name="form[button]" formaction="/form" value="Formaction button"/>
+</form>
+
 <form action="relative" method="post">
   <p>
     <input type="submit" name="form[relative]" value="Relative Action" />

data/lib/capybara/spec/views/popup_one.erb

@@ -1,6 +1,6 @@
 <html>
     <head>
-        <title>This is the title of the first popup</title>
+        <title>Title of the first popup</title>
     </head>
     <body>
         <div id="divInPopupOne">This is the text of divInPopupOne</div>

data/lib/capybara/spec/views/popup_two.erb

@@ -1,6 +1,6 @@
 <html>
     <head>
-        <title>This is the title of popup two</title>
+        <title>Title of popup two</title>
     </head>
     <body>
         <div id="divInPopupTwo">This is the text of divInPopupTwo</div>

data/lib/capybara/spec/views/with_js.erb

@@ -69,6 +69,8 @@
     <p>
       <a href="#" id="change-title">Change title</a>
     </p>
+        
+    <p id="click-test">Click me</p>
 
     <script type="text/javascript">
       // a javascript comment

data/lib/capybara/spec/views/with_windows.erb

@@ -0,0 +1,38 @@
+<html>
+  <head>
+    <title>With Windows</title>
+    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script language="javascript" type="text/javascript">
+    $(document).ready(function(){
+      $('#openWindow').click(function(){
+        window.open('/popup_one', 'firstPopup');
+        return false;
+      });
+
+      $('#openWindowWithTimeout').click(function(){
+        setTimeout(function(){
+          window.open('/popup_one', 'firstPopup');
+        }, 600);
+        return false;
+      });
+
+      $('#openTwoWindows').click(function() {
+        window.open('/popup_one', 'firstPopup');
+        window.open('/popup_two', 'secondPopup');
+        return false;
+      });
+    });
+    </script>
+  </head>
+  <body>
+    <button id="openWindow">Open new window</button>
+
+    <button id="openWindowWithTimeout">Open new window with timeout</button>
+
+    <button id="openTwoWindows">Open two windows</button>
+
+    <button id="doesNotOpenWindows">Does not open windows</button>
+
+    <iframe src="/frame_one" id="frameOne"></iframe>
+  </body>
+</html>

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '2.2.1'
+  VERSION = '2.3.0'
 end

data/lib/capybara/window.rb

@@ -0,0 +1,123 @@
+module Capybara
+  ##
+  # The Window class represents a browser window.
+  #
+  # You can get an instance of the class by calling either of:
+  #
+  # * {Capybara::Session#windows}
+  # * {Capybara::Session#current_window}
+  # * {Capybara::Session#window_opened_by}
+  # * {Capybara::Session#switch_to_window}
+  #
+  # Note that some drivers (e.g. Selenium) support getting size of/resizing/closing only
+  #   current window. So if you invoke such method for:
+  #
+  #   * window that is current, Capybara will make 2 Selenium method invocations
+  #     (get handle of current window + get size/resize/close).
+  #   * window that is not current, Capybara will make 4 Selenium method invocations
+  #     (get handle of current window + switch to given handle + get size/resize/close + switch to original handle)
+  #
+  class Window
+    # @return [String]   a string that uniquely identifies window within session
+    attr_reader :handle
+
+    # @return [Capybara::Session] session that this window belongs to
+    attr_reader :session
+
+    # @api private
+    def initialize(session, handle)
+      @session = session
+      @driver = session.driver
+      @handle = handle
+    end
+
+    ##
+    # @return [Boolean] whether the window is not closed
+    def exists?
+      @driver.window_handles.include?(@handle)
+    end
+
+    ##
+    # @return [Boolean] whether the window is closed
+    def closed?
+      !exists?
+    end
+
+    ##
+    # @return [Boolean] whether this window is the window in which commands are being executed
+    def current?
+      @driver.current_window_handle == @handle
+    rescue @driver.no_such_window_error
+      false
+    end
+
+    ##
+    # Close window.
+    #
+    # If this method was called for window that is current, then after calling this method
+    #   future invocations of other Capybara methods should raise
+    #   `session.driver.no_such_window_error` until another window will be switched to.
+    #
+    # @!macro about_current
+    #   If this method was called for window that is not current, then after calling this method
+    #   current window shouldn remain the same as it was before calling this method.
+    #
+    def close
+      @driver.close_window(handle)
+    end
+
+    ##
+    # Get window size.
+    #
+    # @macro about_current
+    # @return [Array<(Fixnum, Fixnum)>] an array with width and height
+    #
+    def size
+      @driver.window_size(handle)
+    end
+
+    ##
+    # Resize window.
+    #
+    # @macro about_current
+    # @param width [String]  the new window width in pixels
+    # @param height [String]  the new window height in pixels
+    #
+    def resize_to(width, height)
+      @driver.resize_window_to(handle, width, height)
+    end
+
+    ##
+    # Maximize window.
+    #
+    # If a particular driver (e.g. headless driver) doesn't have concept of maximizing it
+    #   may not support this method.
+    #
+    # @macro about_current
+    #
+    def maximize
+      @driver.maximize_window(handle)
+    end
+
+    def eql?(other)
+      other.kind_of?(self.class) && @session == other.session && @handle == other.handle
+    end
+    alias_method :==, :eql?
+
+    def hash
+      @session.hash ^ @handle.hash
+    end
+
+    def inspect
+      "#<Window @handle=#{@handle.inspect}>"
+    end
+
+    private
+
+    def raise_unless_current(what)
+      unless current?
+        raise Capybara::WindowError, "#{what} not current window is not possible."
+      end
+    end
+  end
+end

data/spec/basic_node_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Capybara do
+RSpec.describe Capybara do
   describe '.string' do
     let :string do
       Capybara.string <<-STRING
@@ -44,96 +44,96 @@ describe Capybara do
     end
 
     it "allows using matchers" do
-      string.should have_css('#page')
-      string.should_not have_css('#does-not-exist')
+      expect(string).to have_css('#page')
+      expect(string).not_to have_css('#does-not-exist')
     end
 
     it "allows using custom matchers" do
       Capybara.add_selector :lifeform do
         xpath { |name| "//option[contains(.,'#{name}')]" }
       end
-      string.should have_selector(:id, "page")
-      string.should_not have_selector(:id, 'does-not-exist')
-      string.should have_selector(:lifeform, "Monkey")
-      string.should_not have_selector(:lifeform, "Gorilla")
+      expect(string).to have_selector(:id, "page")
+      expect(string).not_to have_selector(:id, 'does-not-exist')
+      expect(string).to have_selector(:lifeform, "Monkey")
+      expect(string).not_to have_selector(:lifeform, "Gorilla")
     end
 
     it 'allows custom matcher using css' do
       Capybara.add_selector :section do
         css { |css_class| "section .#{css_class}" }
       end
-      string.should     have_selector(:section, 'subsection')
-      string.should_not have_selector(:section, 'section_8')
+      expect(string).to     have_selector(:section, 'subsection')
+      expect(string).not_to have_selector(:section, 'section_8')
     end
 
     it "allows using matchers with text option" do
-      string.should have_css('h1', :text => 'Totally awesome')
-      string.should_not have_css('h1', :text => 'Not so awesome')
+      expect(string).to have_css('h1', :text => 'Totally awesome')
+      expect(string).not_to have_css('h1', :text => 'Not so awesome')
     end
 
     it "allows finding only visible nodes" do
-      string.all(:css, '#secret', :visible => true).should be_empty
-      string.all(:css, '#secret', :visible => false).should have(1).element
+      expect(string.all(:css, '#secret', :visible => true)).to be_empty
+      expect(string.all(:css, '#secret', :visible => false).size).to eq(1)
     end
 
     it "allows finding elements and extracting text from them" do
-      string.find('//h1').text.should == 'Totally awesome'
+      expect(string.find('//h1').text).to eq('Totally awesome')
     end
 
     it "allows finding elements and extracting attributes from them" do
-      string.find('//h1')[:data].should == 'fantastic'
+      expect(string.find('//h1')[:data]).to eq('fantastic')
     end
 
     it "allows finding elements and extracting the tag name from them" do
-      string.find('//h1').tag_name.should == 'h1'
+      expect(string.find('//h1').tag_name).to eq('h1')
     end
 
     it "allows finding elements and extracting the path" do
-      string.find('//h1').path.should == '/html/body/div/div[1]/h1'
+      expect(string.find('//h1').path).to eq('/html/body/div/div[1]/h1')
     end
 
     it "allows finding elements and extracting the path" do
-      string.find('//div/input').value.should == 'bar'
-      string.find('//select').value.should == 'Capybara'
+      expect(string.find('//div/input').value).to eq('bar')
+      expect(string.find('//select').value).to eq('Capybara')
     end
 
     it "allows finding elements and checking if they are visible" do
-      string.find('//h1').should be_visible
-      string.find(:css, "#secret", :visible => false).should_not be_visible
+      expect(string.find('//h1')).to be_visible
+      expect(string.find(:css, "#secret", :visible => false)).not_to be_visible
     end
 
     it "allows finding elements and checking if they are disabled" do
-      string.find('//form/input[@name="bleh"]').should be_disabled
-      string.find('//form/input[@name="meh"]').should_not be_disabled
+      expect(string.find('//form/input[@name="bleh"]')).to be_disabled
+      expect(string.find('//form/input[@name="meh"]')).not_to be_disabled
     end
 
     describe "#title" do
       it "returns the page title" do
-        string.title.should == "simple_node"
+        expect(string.title).to eq("simple_node")
       end
     end
 
     describe "#has_title?" do
       it "returns whether the page has the given title" do
-        string.has_title?('simple_node').should be_true
-        string.has_title?('monkey').should be_false
+        expect(string.has_title?('simple_node')).to be_truthy
+        expect(string.has_title?('monkey')).to be_falsey
       end
 
       it "allows regexp matches" do
-        string.has_title?(/s[a-z]+_node/).should be_true
-        string.has_title?(/monkey/).should be_false
+        expect(string.has_title?(/s[a-z]+_node/)).to be_truthy
+        expect(string.has_title?(/monkey/)).to be_falsey
       end
     end
 
     describe '#has_no_title?' do
       it "returns whether the page does not have the given title" do
-        string.has_no_title?('simple_node').should be_false
-        string.has_no_title?('monkey').should be_true
+        expect(string.has_no_title?('simple_node')).to be_falsey
+        expect(string.has_no_title?('monkey')).to be_truthy
       end
 
       it "allows regexp matches" do
-        string.has_no_title?(/s[a-z]+_node/).should be_false
-        string.has_no_title?(/monkey/).should be_true
+        expect(string.has_no_title?(/s[a-z]+_node/)).to be_falsey
+        expect(string.has_no_title?(/monkey/)).to be_truthy
       end
     end
   end