capybara 2.5.0 → 2.6.0

data/lib/capybara/spec/public/test.js

@@ -60,12 +60,14 @@ $(function() {
       $('title').text('changed title')
     }, 250)
   });
-  $('#click-test').dblclick(function() {
-    $(this).after('<a id="has-been-double-clicked" href="#">Has been double clicked</a>');
-  });
-  $('#click-test').bind('contextmenu', function(e) {
-    e.preventDefault();
-    $(this).after('<a id="has-been-right-clicked" href="#">Has been right clicked</a>');
+  $('#click-test').on({
+    dblclick: function() {
+      $(this).after('<a id="has-been-double-clicked" href="#">Has been double clicked</a>');
+    },
+    contextmenu: function(e) {
+      e.preventDefault();
+      $(this).after('<a id="has-been-right-clicked" href="#">Has been right clicked</a>');
+    }
   });
   $('#open-alert').click(function() {
     alert('Alert opened');
@@ -100,6 +102,13 @@ $(function() {
       $(this).attr('response', response);
     }
   });
+  $('#open-twice').click(function() {
+    if (confirm('Are you sure?')) {
+      if (!confirm('Are you really sure?')) {
+        $(this).attr('confirmed', 'false');
+      }
+    }
+  })
   $('#delayed-page-change').click(function() {
     setTimeout(function() {
       window.location.pathname = '/with_html'

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

@@ -16,4 +16,15 @@ Capybara::SpecHelper.spec '#accept_confirm', :requires => [:modals] do
     end
     expect(message).to eq('Confirm opened')
   end
+
+  it "should work with nested modals" do
+    expect {
+      @session.dismiss_confirm 'Are you really sure?' do
+        @session.accept_confirm 'Are you sure?' do
+          @session.click_link('Open check twice')
+        end
+      end
+    }.not_to raise_error
+    expect(@session).to have_xpath("//a[@id='open-twice' and @confirmed='false']")
+  end
 end

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

@@ -29,4 +29,26 @@ Capybara::SpecHelper.spec '#find_button' do
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
+
+  context "with :disabled option" do
+    it "should find disabled buttons when true" do
+      expect(@session.find_button('Disabled button', :disabled => true).value).to eq("Disabled button")
+    end
+
+    it "should not find disabled buttons when false" do
+      expect do
+        @session.find_button('Disabled button', :disabled => false)
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+
+    it "should default to not finding disabled buttons" do
+      expect do
+        @session.find_button('Disabled button')
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+
+    it "should find disabled buttons when :all" do
+      expect(@session.find_button('Disabled button', :disabled => :all).value).to eq("Disabled button")
+    end
+  end
 end

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

@@ -21,7 +21,7 @@ Capybara::SpecHelper.spec '#find_field' do
 
   it "should warn if filter option is invalid" do
     expect_any_instance_of(Kernel).to receive(:warn).
-      with('Invalid value nil passed to filter disabled')
+      with('Invalid value nil passed to filter disabled - defaulting to false')
     @session.find_field('Dog', disabled: nil)
   end
 
@@ -60,6 +60,14 @@ Capybara::SpecHelper.spec '#find_field' do
         @session.find_field("Disabled Checkbox")
       end.to raise_error(Capybara::ElementNotFound)
     end
+
+    it "should find disabled fields when :all" do
+      expect(@session.find_field("Disabled Checkbox", :disabled => :all)[:name]).to eq("form[disabled_checkbox]")
+    end
+
+    it "should find enabled fields when :all" do
+      expect(@session.find_field('Dog', :disabled => :all).value).to eq('dog')
+    end
   end
 
 

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

@@ -24,6 +24,14 @@ Capybara::SpecHelper.spec '#has_button?' do
   it "should be false for disabled buttons if :disabled => false" do
     expect(@session).not_to have_button('Disabled button', :disabled => false)
   end
+
+  it "should be true for disabled buttons if :disabled => :all" do
+    expect(@session).to have_button('Disabled button', :disabled => :all)
+  end
+
+  it "should be true for enabled buttons if :disabled => :all" do
+    expect(@session).to have_button('med', :disabled => :all)
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_button?' do

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

@@ -12,6 +12,16 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     expect(@session).not_to have_current_path(/monkey/)
   end
 
+  it "should handle non-escaped query options" do
+    @session.click_link("Non-escaped query options")
+    expect(@session).to have_current_path("/with_html?options[]=things")
+  end
+
+  it "should handle escaped query options" do
+    @session.click_link("Escaped query options")
+    expect(@session).to have_current_path("/with_html?options%5B%5D=things")
+  end
+
   it "should wait for current_path", :requires => [:js] do
     @session.click_link("Change page")
     expect(@session).to have_current_path("/with_html")

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

@@ -142,6 +142,14 @@ Capybara::SpecHelper.spec '#has_checked_field?' do
     expect(@session).not_to have_checked_field('Disabled Checkbox', :disabled => false)
   end
 
+  it "should be true for disabled checkboxes if :disabled => :all" do
+    expect(@session).to have_checked_field('Disabled Checkbox', :disabled => :all)
+  end
+
+  it "should be true for enabled checkboxes if :disabled => :all" do
+    expect(@session).to have_checked_field('gender_female', :disabled => :all)
+  end
+
   it "should be true after an unchecked checkbox is checked" do
     @session.check('form_pets_cat')
     expect(@session).to have_checked_field('form_pets_cat')

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

@@ -59,6 +59,11 @@ Capybara::SpecHelper.spec '#has_select?' do
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
+
+    it "should be true even when the selected option invisible, regardless of the select's visibility" do
+      expect(@session).to have_select('Icecream', :visible => false, :selected => 'Chocolate')
+      expect(@session).to have_select('Sorbet', :selected => 'Vanilla')
+    end
   end
 
   context 'with exact options' do
@@ -74,6 +79,11 @@ Capybara::SpecHelper.spec '#has_select?' do
       expect(@session).not_to have_select('Region', :options => ['Norway', 'Sweden'])
       expect(@session).not_to have_select('Region', :options => ['Norway', 'Norway', 'Norway'])
     end
+
+    it" should be true even when the options are invisible, if the select itself is invisible" do
+      expect(@session).to have_select("Icecream", :visible => false, :options => ['Chocolate', 'Vanilla', 'Strawberry'])
+    end
+
   end
 
   context 'with partial options' do
@@ -87,6 +97,10 @@ Capybara::SpecHelper.spec '#has_select?' do
       expect(@session).not_to have_select('Does not exist', :with_options => ['John'])
       expect(@session).not_to have_select('Region', :with_options => ['Norway', 'Sweden', 'Finland', 'Latvia'])
     end
+
+    it" should be true even when the options are invisible, if the select itself is invisible" do
+      expect(@session).to have_select("Icecream", :visible => false, :with_options => ['Vanilla', 'Strawberry'])
+    end
   end
 end
 

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

@@ -1,3 +1,4 @@
+
 Capybara::SpecHelper.spec "node" do
   before do
     @session.visit('/with_html')
@@ -317,7 +318,11 @@ Capybara::SpecHelper.spec "node" do
         node = @session.find(:css, '#reload-me')
         @session.click_link('Reload!')
         sleep(0.3)
-        expect { node.text.to == 'has been reloaded' }.to raise_error
+        expect do
+          expect(node).to have_text('has been reloaded')
+        end.to raise_error do |error|
+          expect(error).to be_an_invalid_element_error(@session)
+        end
       end
       after { Capybara.automatic_reload = true }
     end
@@ -347,13 +352,22 @@ Capybara::SpecHelper.spec "node" do
         expect(node.find(:css, 'a').text).to eq('has been reloaded')
       end
 
-      it "should not reload nodes which haven't been found" do
+      it "should not reload nodes which haven't been found with reevaluateable queries" do
         @session.visit('/with_js')
         node = @session.all(:css, '#the-list li')[1]
         @session.click_link('Fetch new list!')
         sleep(0.3)
-        expect { node.text.to == 'Foo' }.to raise_error
-        expect { node.text.to == 'Bar' }.to raise_error
+
+        expect do
+          expect(node).to have_text('Foo')
+        end.to raise_error { |error|
+          expect(error).to be_an_invalid_element_error(@session)
+        }
+        expect do
+          expect(node).to have_text('Bar')
+        end.to raise_error { |error|
+          expect(error).to be_an_invalid_element_error(@session)
+        }
       end
 
       it "should reload nodes with options" do
@@ -365,4 +379,8 @@ Capybara::SpecHelper.spec "node" do
       end
     end
   end
+
+  def be_an_invalid_element_error(session)
+    satisfy { |error| session.driver.invalid_element_errors.any? { |e| error.is_a? e } }
+  end
 end

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

@@ -79,6 +79,25 @@ Capybara::SpecHelper.spec '#visit' do
     end
   end
 
+  context "with Capybara.app_host set" do
+    it "should override server", requires: [:server] do
+      another_session = Capybara::Session.new(@session.mode, @session.app.dup)
+      Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}"
+      another_session.visit('/foo')
+      expect(another_session).to have_content("Another World")
+      expect(another_session.current_url).to start_with(Capybara.app_host)
+      expect(URI.parse(another_session.current_url).port).not_to eq another_session.server.port
+      expect(URI.parse(another_session.current_url).port).to eq @session.server.port
+    end
+
+    it "should append relative path", requires: [:server] do
+      Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}/redirect/0"
+      @session.visit('/times')
+      expect(@session).to have_content('redirection complete')
+    end
+  end
+
+
   it "should send no referer when visiting a page" do
     @session.visit '/get_referer'
     expect(@session).to have_content 'No referer'

data/lib/capybara/spec/session/window/window_opened_by_spec.rb

@@ -72,6 +72,7 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
     expect do
       @session.window_opened_by do
         button.click
+        sleep 0.1 # It's possible for window_opened_by to be fullfilled before the second window opens
       end
     end.to raise_error(Capybara::WindowError, two_windows_message)
     @session.document.synchronize(2, errors: [Capybara::CapybaraError]) do

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

@@ -191,6 +191,26 @@ New line after and before textarea tag
     </select>
   </p>
 
+  <!-- invisible select and options -->
+  <p style="display: none">
+    <label for="form_icecream">Icecream</label>
+    <select name="form[icecream]" id="form_icecream">
+      <option selected="selected">Chocolate</option>
+      <option>Vanilla</option>
+      <option>Strawberry</option>
+    </select>
+  </p>
+
+  <!-- visible select with invisible selected option (which some browsers may treat as visible) -->
+  <p>
+    <label for="form_sorbet">Sorbet</label>
+    <select name="form[sorbet]" id="form_sorbet">
+      <option>Chocolate</option>
+      <option selected="selected" style="display: none">Vanilla</option>
+      <option>Strawberry</option>
+    </select>
+  </p>
+
   <p>
     <span>First address<span>
     <label for='address1_street'>Street</label>

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

@@ -85,12 +85,18 @@
       <a href="#" id="open-confirm">Open confirm</a>
     </p>
 
+    <p>
+      <a href="#" id="open-twice">Open check twice</a>
+    </p>
+
     <p>
       <a href="#" id="open-prompt">Open prompt</a>
     </p>
 
     <p>
       <a href="#" id="delayed-page-change">Change page</a>
+      <a href="/with_html?options[]=things">Non-escaped query options</a>
+      <a href="/with_html?options%5B%5D=things">Escaped query options</a>
     </p>
 
     <p>

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/spec/rspec/features_spec.rb

@@ -70,13 +70,25 @@ feature "given and given! aliases to let and let!" do
   end
 end
 
-feature "if xscenario aliases to pending then" do
-  xscenario "this test should be 'temporarily disabled with xscenario'" do
-  end
-end
-
 feature "Capybara's feature DSL with driver", :driver => :culerity do
   scenario "switches driver" do
     expect(Capybara.current_driver).to eq(:culerity)
   end
 end
+
+if RSpec::Core::Version::STRING.to_f >= 3.0
+  xfeature "if xfeature aliases to pending then" do
+    scenario "this should be 'temporarily disabled with xfeature'" do; end
+    scenario "this also should be 'temporarily disabled with xfeature'" do; end
+  end
+
+  ffeature "if ffeature aliases focused tag then" do
+    scenario "scenario inside this feature has metatag focus tag" do |example|
+      expect(example.metadata[:focus]).to eq true
+    end
+
+    scenario "other scenarios also has metatag focus tag " do |example|
+      expect(example.metadata[:focus]).to eq true
+    end
+  end
+end

data/spec/rspec/scenarios_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'capybara/rspec'
+
+RSpec.configuration.before(:each, { file_path: "./spec/rspec/scenarios_spec.rb" } ) do
+  @in_filtered_hook = true
+end
+
+if RSpec::Core::Version::STRING.to_f >= 3.0
+  feature "if fscenario aliases focused tag then" do
+    fscenario "scenario should have focused meta tag" do |example|
+      expect(example.metadata[:focus]).to eq true
+    end
+  end
+end
+
+feature "if xscenario aliases to pending then" do
+  xscenario "this test should be 'temporarily disabled with xscenario'" do
+  end
+end
+

data/spec/selector_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+RSpec.describe Capybara do
+  describe 'Selectors' do
+    let :string do
+      Capybara.string <<-STRING
+        <html>
+          <head>
+            <title>selectors</title>
+          </head>
+          <body>
+            <div class="a" id="page">
+              <div class="b" id="content">
+                <h1 class="a">Totally awesome</h1>
+                <p>Yes it is</p>
+              </div>
+              <p class="b">Some Content</p>
+              <p class="b"></p>
+            </div>
+          </body>
+        </html>
+      STRING
+    end
+
+    before do
+      Capybara.add_selector :custom_selector do
+        css { |css_class| "div.#{css_class}" }
+        filter(:not_empty, boolean: true, default: true, skip_if: :all) { |node, value| value ^ (node.text == '') }
+      end
+    end
+
+    describe "modfiy_selector" do
+      it "allows modifying a selector" do
+        el = string.find(:custom_selector, 'a')
+        expect(el.tag_name).to eq 'div'
+        Capybara.modify_selector :custom_selector do
+          css { |css_class| "h1.#{css_class}" }
+        end
+        el = string.find(:custom_selector, 'a')
+        expect(el.tag_name).to eq 'h1'
+      end
+
+      it "doesn't change existing filters" do
+        Capybara.modify_selector :custom_selector do
+          css { |css_class| "p.#{css_class}"}
+        end
+        expect(string).to have_selector(:custom_selector, 'b', count: 1)
+        expect(string).to have_selector(:custom_selector, 'b', not_empty: false, count: 1)
+        expect(string).to have_selector(:custom_selector, 'b', not_empty: :all, count: 2)
+      end
+    end
+  end
+end

data/spec/selenium_spec.rb

@@ -100,6 +100,25 @@ RSpec.describe Capybara::Session do
       end
     end
 
+    context "#fill_in with { clear: :none } fill_options" do
+      it 'should append to content in a field' do
+        @session.visit('/form')
+        @session.fill_in('form_first_name', :with => 'Harry',
+                          fill_options: { clear: :none} )
+        expect(@session.find(:fillable_field, 'form_first_name').value).to eq('JohnHarry')
+      end
+    end
+
+    context "#fill_in with { clear: Array } fill_options" do
+      it 'should pass the array through to the element', tw: true do
+        #this is mainly for use with [[:ctrl, 'a'], :backspace] - however since that is platform dependant I'm testing with something less useful
+        @session.visit('/form')
+        @session.fill_in('form_first_name', :with => 'Harry',
+                          fill_options: { clear: [[:shift, 'abc'], :backspace] } )
+        expect(@session.find(:fillable_field, 'form_first_name').value).to eq('JohnABHarry')
+      end
+    end
+
     describe "#path" do
       it "returns xpath" do
         # this is here because it is testing for an XPath that is specific to the algorithm used in the selenium driver