capybara 3.0.0.rc1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f91a983551012c790ae444974b24f9d0349d79c36706d4a9143523b2827605
-  data.tar.gz: 54de192348948696b54e66ff9fc7622311b88fd7d71e842b0737be060bfdc59a
+  metadata.gz: d9b394cb5aaa7d6849ba4fd9e486b7fae2298a64f6a5e2f88fd80abea82a2ba6
+  data.tar.gz: eeca1e3b972c9efb89224fb701a1612a5d503621327af3fb77bf1a028a21761d
 SHA512:
-  metadata.gz: 62ab87128fa70c43cfa688d55c9ae208095b632999cbd44969971cfcbefed37b4719e8c8e2c0350e13dd69a2e35ec5799d1f7f105cd717cfa277b091b42041db
-  data.tar.gz: 3c013b9add97330680def4a948246360ccf0bbc520e8b8573b0bdee4dfcbde751d7f9626268fe682aa613975d4ad126e776cba7075a50259769e120bec09b61d
+  metadata.gz: 615f9400b993c2408414f886a5cfdd41272e29cb9c3fa1763758888416d3e9c5f42d4d179686f8ac56b185610503aef904be6a508e5e8b7d703760ff85a498a0
+  data.tar.gz: 0045d33244fdc1cd6615cac65760399088330bc1751781c1ea2c0107570f096f52766841ad2f1a40efb595127e9e78b5c4b1d9341dcd146721eedba0e588062a

data/History.md

@@ -1,3 +1,19 @@
+# Version 3.0.0.rc2
+Release date: 2018-03-23
+
+### Changed
+
+* Drivers are now expected to return visible text more in line with the WebDriver spec for visible text
+* Drivers are expected to close extra windows when resetting the session
+* Selenium driver supports Date/Time when filling in date/time/datetime-local inputs
+* `current_url` returns the url for the top level browsing context
+* `title` returns the title for the top level browsing context
+
+### Added
+
+* `Driver#frame_url` returns the url for the current frame
+* `Driver#frame_title` returns the title for the current frame
+
 # Version 3.0.0.rc1
 Release date: 2018-03-02
 
@@ -6,7 +22,7 @@ Release date: 2018-03-02
 
 ### Changed
 
-* `first` now raises ElementNotFound, by default, instead of returning nil, when no matches are found  - Issue #1507
+* `first` now raises ElementNotFound, by default, instead of returning nil when no matches are found  - Issue #1507
 * 'all' now waits for at least one matching element by default.  Pass `wait: false` if you want the previous
   behavior where an empty result would be returned immediately if no matching elements exist yet.
 * ArgumentError raised if extra parameters passed to selector queries
@@ -19,7 +35,7 @@ Release date: 2018-03-02
 * RSpec 2.x support
 * selenium-webdriver 2.x support
 * Nokogiri < 1.8 support
-* `field_labeled` alaias for `find_field`
+* `field_labeled` alias for `find_field`
 
 # Version 2.18.0
 Release date: 2018-02-12

data/README.md

@@ -1,6 +1,7 @@
 # Capybara
 
 [![Build Status](https://secure.travis-ci.org/teamcapybara/capybara.svg)](https://travis-ci.org/teamcapybara/capybara)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/teamcapybara/capybara?svg=true)](https://ci.appveyor.com/api/projects/github/teamcapybara/capybara)
 [![Dependency Status](https://gemnasium.com/teamcapybara/capybara.svg)](https://gemnasium.com/teamcapybara/capybara)
 [![Code Climate](https://codeclimate.com/github/teamcapybara/capybara.svg)](https://codeclimate.com/github/teamcapybara/capybara)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jnicklas/capybara?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

data/lib/capybara/driver/base.rb

@@ -67,6 +67,16 @@ class Capybara::Driver::Base
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#switch_to_frame'
   end
 
+  def frame_title
+    find_xpath('/html/head/title').map(&:all_text).first.to_s
+  end
+
+  def frame_url
+    evaluate_script('document.location.href')
+  rescue Capybara::NotSupportedByDriverError
+    raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#frame_title'
+  end
+
   def current_window_handle
     raise Capybara::NotSupportedByDriverError, 'Capybara::Driver::Base#current_window_handle'
   end

data/lib/capybara/helpers.rb

@@ -6,7 +6,7 @@ module Capybara
     extend self
 
     ##
-    #
+    # @deprecated
     # Normalizes whitespace space by stripping leading and trailing
     # whitespace and replacing sequences of whitespace characters
     # with a single space.
@@ -15,6 +15,7 @@ module Capybara
     # @return [String]         Normalized text
     #
     def normalize_whitespace(text)
+      warn "DEPRECATED: Capybara::Helpers::normalize_whitespace is deprecated, please update your driver"
       text.to_s.gsub(/[[:space:]]+/, ' ').strip
     end
 
@@ -28,10 +29,11 @@ module Capybara
     # @param [Fixnum, Boolean, nil] options Options passed to Regexp.new when creating the Regexp
     # @return [Regexp] Regexp to match the passed in text and options
     #
-    def to_regexp(text, exact: false, options: nil)
+    def to_regexp(text, exact: false, all_whitespace: false, options: nil)
       return text if text.is_a?(Regexp)
 
-      escaped = Regexp.escape(normalize_whitespace(text))
+      escaped = Regexp.escape(text)
+      escaped = escaped.gsub("\\ ", "[[:blank:]]") if all_whitespace
       escaped = "\\A#{escaped}\\z" if exact
       Regexp.new(escaped, options)
     end

data/lib/capybara/node/matchers.rb

@@ -112,7 +112,8 @@ module Capybara
       #
       # @overload assert_all_of_selectors([kind = Capybara.default_selector], *locators, options = {})
       #
-      def assert_all_of_selectors(*args, wait: session_options.default_max_wait_time, **options, &optional_filter_block)
+      def assert_all_of_selectors(*args, wait: nil, **options, &optional_filter_block)
+        wait = session_options.default_max_wait_time if wait.nil?
         selector = args.first.is_a?(Symbol) ? args.shift : session_options.default_selector
         synchronize(wait) do
           args.each do |locator|
@@ -136,7 +137,8 @@ module Capybara
       #
       # @overload assert_none_of_selectors([kind = Capybara.default_selector], *locators, options = {})
       #
-      def assert_none_of_selectors(*args, wait: session_options.default_max_wait_time, **options, &optional_filter_block)
+      def assert_none_of_selectors(*args, wait: nil, **options, &optional_filter_block)
+        wait = session_options.default_max_wait_time if wait.nil?
         selector = args.first.is_a?(Symbol) ? args.shift : session_options.default_selector
         synchronize(wait) do
           args.each do |locator|

data/lib/capybara/queries/ancestor_query.rb

@@ -2,7 +2,7 @@
 
 module Capybara
   module Queries
-    class AncestorQuery < MatchQuery
+    class AncestorQuery < Capybara::Queries::SelectorQuery
       # @api private
       def resolve_for(node, exact = nil)
         @child_node = node
@@ -18,6 +18,12 @@ module Capybara
         desc += " that is an ancestor of #{child_query.description}" if child_query
         desc
       end
+
+    private
+
+      def valid_keys
+        super - COUNT_KEYS
+      end
     end
   end
 end

data/lib/capybara/queries/base_query.rb

@@ -22,7 +22,10 @@ module Capybara
       end
 
       def self.wait(options, default = Capybara.default_max_wait_time)
-        options.fetch(:wait, default) || 0
+        # if no value or nil for the :wait option is passed it should default to the default
+        w = options.fetch(:wait, nil)
+        w = default if w.nil?
+        w || 0
       end
 
       ##

data/lib/capybara/queries/text_query.rb

@@ -10,11 +10,8 @@ module Capybara
         else
           type
         end
-        @expected_text = if expected_text.is_a?(Regexp)
-          expected_text
-        else
-          Capybara::Helpers.normalize_whitespace(expected_text)
-        end
+
+        @expected_text = expected_text.is_a?(Regexp) ? expected_text : expected_text.to_s
         @options = options
         super(@options)
         self.session_options = session_options
@@ -94,7 +91,7 @@ module Capybara
       end
 
       def text(node, query_type)
-        Capybara::Helpers.normalize_whitespace(node.text(query_type))
+        node.text(query_type)
       end
     end
   end

data/lib/capybara/queries/title_query.rb

@@ -5,10 +5,10 @@ module Capybara
   module Queries
     class TitleQuery < BaseQuery
       def initialize(expected_title, **options)
-        @expected_title = expected_title.is_a?(Regexp) ? expected_title : Capybara::Helpers.normalize_whitespace(expected_title)
+        @expected_title = expected_title.is_a?(Regexp) ? expected_title : expected_title.to_s
         @options = options
         super(@options)
-        @search_regexp = Capybara::Helpers.to_regexp(@expected_title, exact: options.fetch(:exact, false))
+        @search_regexp = Capybara::Helpers.to_regexp(@expected_title, all_whitespace: true, exact: options.fetch(:exact, false))
         assert_valid_keys
       end
 

data/lib/capybara/rack_test/node.rb

@@ -1,12 +1,23 @@
 # frozen_string_literal: true
 
 class Capybara::RackTest::Node < Capybara::Driver::Node
+  BLOCK_ELEMENTS = %w[p h1 h2 h3 h4 h5 h6 ol ul pre address blockquote dl div fieldset form hr noscript table].freeze
+
   def all_text
-    Capybara::Helpers.normalize_whitespace(native.text)
+    native.text
+          .gsub(/[\u200b\u200e\u200f]/, '')
+          .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
+          .gsub(/\A[[:space:]&&[^\u00a0]]+/, "")
+          .gsub(/[[:space:]&&[^\u00a0]]+\z/, "")
+          .tr("\u00a0", ' ')
   end
 
   def visible_text
-    Capybara::Helpers.normalize_whitespace(unnormalized_text)
+    displayed_text.gsub(/\ +/, ' ')
+                  .gsub(/[\ \n]*\n[\ \n]*/, "\n")
+                  .gsub(/\A[[:space:]&&[^\u00a0]]+/, "")
+                  .gsub(/[[:space:]&&[^\u00a0]]+\z/, "")
+                  .tr("\u00a0", ' ')
   end
 
   def [](name)
@@ -103,15 +114,20 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
 
 protected
 
-  def unnormalized_text(check_ancestor_visibility = true)
-    if !string_node.visible?(check_ancestor_visibility)
+  # @api private
+  def displayed_text(check_ancestor: true)
+    if !string_node.visible?(check_ancestor)
       ''
     elsif native.text?
       native.text
+            .gsub(/[\u200b\u200e\u200f]/, '')
+            .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
     elsif native.element?
-      native.children.map do |child|
-        Capybara::RackTest::Node.new(driver, child).unnormalized_text(false)
-      end.join
+      text = native.children.map do |child|
+        Capybara::RackTest::Node.new(driver, child).displayed_text(check_ancestor: false)
+      end.join || ''
+      text = "\n#{text}\n" if BLOCK_ELEMENTS.include?(tag_name)
+      text
     else
       ''
     end

data/lib/capybara/rspec/matchers.rb

@@ -154,7 +154,6 @@ module Capybara
       end
 
       def format(content)
-        content = Capybara::Helpers.normalize_whitespace(content) unless content.is_a? Regexp
         content.inspect
       end
     end

data/lib/capybara/selector/filter_set.rb

@@ -46,7 +46,7 @@ module Capybara
 
       class << self
         def all
-          @filter_sets ||= {}
+          @filter_sets ||= {} # rubocop:disable Naming/MemoizedInstanceVariableName
         end
 
         def add(name, &block)

data/lib/capybara/selector/selector.rb

@@ -25,7 +25,7 @@ module Capybara
 
     class << self
       def all
-        @selectors ||= {}
+        @selectors ||= {} # rubocop:disable Naming/MemoizedInstanceVariableName
       end
 
       def add(name, &block)

data/lib/capybara/selenium/driver.rb

@@ -26,6 +26,8 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       @w3c = ((defined?(Selenium::WebDriver::Remote::W3CCapabilities) && @browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3CCapabilities)) ||
               (defined?(Selenium::WebDriver::Remote::W3C::Capabilities) && @browser.capabilities.is_a?(Selenium::WebDriver::Remote::W3C::Capabilities)))
       main = Process.pid
+      @primary_window_handle = current_window_handle
+
       at_exit do
         # Store the exit status of the test run since it goes away after calling the at_exit proc...
         @exit_status = $ERROR_INFO.status if $ERROR_INFO.is_a?(SystemExit)
@@ -108,6 +110,9 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     # Use instance variable directly so we avoid starting the browser just to reset the session
     return unless @browser
 
+    switch_to_window(@primary_window_handle)
+    window_handles.reject { |handle| handle == @primary_window_handle }.each { |win| close_window(win) }
+
     navigated = false
     start_time = Capybara::Helpers.monotonic_time
     begin
@@ -205,6 +210,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def close_window(handle)
+    raise ArgumentError, "Not allowed to close the primary window" if handle == @primary_window_handle
     within_given_window(handle) do
       browser.close
     end
@@ -286,6 +292,11 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser_name == "chrome"
   end
 
+  # @api private
+  def edge?
+    browser_name == "edge"
+  end
+
 private
 
   def browser_name

data/lib/capybara/selenium/node.rb

@@ -1,14 +1,30 @@
 # frozen_string_literal: true
 
 class Capybara::Selenium::Node < Capybara::Driver::Node
+  SET_FORMATS = Hash.new(date: '%Y-%m-%d', time: '%H:%M', datetime: "%m%d%Y\t%I%M%P").merge(
+    firefox: {
+      date: '%Y-%m-%d',
+      time: '%H:%M',
+      datetime: "%m%d%Y\t%I%M%P"
+    },
+    chrome: {
+      date: '%m%d%Y',
+      time: '%I%M%P',
+      datetime: "%m%d%Y\t%I%M%P"
+    }
+  )
+
   def visible_text
-    # Selenium doesn't normalize Unicode whitespace.
-    Capybara::Helpers.normalize_whitespace(native.text)
+    native.text
   end
 
   def all_text
     text = driver.execute_script("return arguments[0].textContent", self)
-    Capybara::Helpers.normalize_whitespace(text)
+    text.gsub(/[\u200b\u200e\u200f]/, '')
+        .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
+        .gsub(/\A[[:space:]&&[^\u00a0]]+/, "")
+        .gsub(/[[:space:]&&[^\u00a0]]+\z/, "")
+        .tr("\u00a0", ' ')
   end
 
   def [](name)
@@ -48,6 +64,12 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
         click if value ^ checked?
       when 'file'
         set_file(value)
+      when 'date'
+        set_date(value)
+      when 'time'
+        set_time(value)
+      when 'datetime-local'
+        set_datetime_local(value)
       else
         set_text(value, options)
       end
@@ -197,7 +219,7 @@ private
     find_xpath(XPath.ancestor(:select)[1]).first
   end
 
-  def set_text(value, clear: nil, **)
+  def set_text(value, clear: nil, **_unused)
     if value.to_s.empty? && clear.nil?
       native.clear
     elsif clear == :backspace
@@ -231,6 +253,30 @@ private
     yield
   end
 
+  def set_date(value) # rubocop:disable Naming/AccessorMethodName
+    if value.respond_to?(:to_date)
+      set_text(value.to_date.strftime(SET_FORMATS[driver.options[:browser].to_sym][:date]))
+    else
+      set_text(value)
+    end
+  end
+
+  def set_time(value) # rubocop:disable Naming/AccessorMethodName
+    if value.respond_to?(:to_time)
+      set_text(value.to_time.strftime(SET_FORMATS[driver.options[:browser].to_sym][:time]))
+    else
+      set_text(value)
+    end
+  end
+
+  def set_datetime_local(value) # rubocop:disable Naming/AccessorMethodName
+    if value.respond_to?(:to_time)
+      set_text(value.to_time.strftime(SET_FORMATS[driver.options[:browser].to_sym][:datetime]))
+    else
+      set_text(value)
+    end
+  end
+
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
     path_names = value.to_s.empty? ? [] : value
     if driver.chrome?

data/lib/capybara/session.rb

@@ -413,7 +413,7 @@ module Capybara
     # @overload within_frame(element)
     #   @param [Capybara::Node::Element]  frame element
     # @overload within_frame([kind = :frame], locator, options = {})
-    #   @param [Symobl] kind      Optional selector type (:css, :xpath, :field, etc.) - Defaults to :frame
+    #   @param [Symbol] kind      Optional selector type (:css, :xpath, :field, etc.) - Defaults to :frame
     #   @param [String] locator   The locator for the given selector kind.  For :frame this is the name/id of a frame/iframe element
     # @overload within_frame(index)
     #   @param [Integer] index         index of a frame (0 based)

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

@@ -9,7 +9,6 @@ $(function() {
     }
   });
   $('#clickable').click(function(e) {
-    debugger;
     var link = $(this);
     setTimeout(function() {
       $(link).after('<a id="has-been-clicked" href="#">Has been clicked</a>');

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

@@ -17,7 +17,7 @@ Capybara::SpecHelper.spec '#ancestor' do
 
   it "should find the ancestor element using the given locator and options" do
     el = @session.find(:css, '#child')
-    expect(el.ancestor('//div', text: 'Ancestor Ancestor Ancestor')[:id]).to eq('ancestor3')
+    expect(el.ancestor('//div', text: "Ancestor\nAncestor\nAncestor")[:id]).to eq('ancestor3')
   end
 
   it "should raise an error if there are multiple matches" do
@@ -53,8 +53,8 @@ Capybara::SpecHelper.spec '#ancestor' do
         xpath { |num| ".//*[@id='ancestor#{num}']" }
       end
       el = @session.find(:css, '#child')
-      expect(el.ancestor(:level, 1).text).to eq('Ancestor Child')
-      expect(el.ancestor(:level, 3).text).to eq('Ancestor Ancestor Ancestor Child')
+      expect(el.ancestor(:level, 1)[:id]).to eq "ancestor1"
+      expect(el.ancestor(:level, 3)[:id]).to eq "ancestor3"
     end
   end
 
@@ -62,7 +62,7 @@ Capybara::SpecHelper.spec '#ancestor' do
     el = @session.find(:css, '#child')
     expect do
       el.ancestor(:xpath, '//div[@id="nosuchthing"]')
-    end.to raise_error(Capybara::ElementNotFound, "Unable to find xpath \"//div[@id=\\\"nosuchthing\\\"]\" that is an ancestor of visible css \"#child\"")
+    end.to raise_error(Capybara::ElementNotFound, "Unable to find visible xpath \"//div[@id=\\\"nosuchthing\\\"]\" that is an ancestor of visible css \"#child\"")
   end
 
   context "within a scope" do

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

@@ -7,8 +7,7 @@ Capybara::SpecHelper.spec '#assert_text' do
     expect(@session.assert_text('Lorem')).to eq(true)
     expect(@session.assert_text('Redirect')).to eq(true)
     expect(@session.assert_text(:Redirect)).to eq(true)
-    expect(@session.assert_text('text with whitespace')).to eq(true)
-    expect(@session.assert_text("text     with \n\n whitespace")).to eq(true)
+    expect(@session.assert_text('text with   whitespace')).to eq(true)
   end
 
   it "should take scopes into account" do
@@ -49,7 +48,7 @@ Capybara::SpecHelper.spec '#assert_text' do
   it "should raise error with a helpful message if the requested text is present but with incorrect case" do
     @session.visit('/with_html')
     expect do
-      @session.assert_text('Text With Whitespace')
+      @session.assert_text('Text With   Whitespace')
     end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time using a case insensitive search/)
   end
 
@@ -77,7 +76,7 @@ Capybara::SpecHelper.spec '#assert_text' do
     @session.visit('/with_html')
     expect do
       @session.assert_text(/xxxxyzzz/)
-    end.to raise_error(Capybara::ExpectationNotMet, /\Aexpected to find text matching \/xxxxyzzz\/ in "This is a test Header Class(.+)"\Z/)
+    end.to raise_error(Capybara::ExpectationNotMet, /\Aexpected to find text matching \/xxxxyzzz\/ in "This is a test\\nHeader Class(.+)"\Z/)
   end
 
   it "should escape any characters that would have special meaning in a regexp" do
@@ -112,7 +111,7 @@ Capybara::SpecHelper.spec '#assert_text' do
       Capybara.using_wait_time(0) do
         @session.visit('/with_js')
         @session.find(:css, '#reload-list').click
-        @session.find(:css, '#the-list').assert_text('Foo Bar', wait: 0.9)
+        @session.find(:css, '#the-list').assert_text("Foo\nBar", wait: 0.9)
       end
     end
 
@@ -174,7 +173,7 @@ Capybara::SpecHelper.spec '#assert_no_text' do
     @session.visit('/with_html')
     expect do
       @session.assert_no_text('Lorem')
-    end.to raise_error(Capybara::ExpectationNotMet, /\Aexpected not to find text "Lorem" in "This is a test Header Class.+"\Z/)
+    end.to raise_error(Capybara::ExpectationNotMet, /\Aexpected not to find text "Lorem" in "This is a test.*"\z/)
   end
 
   it "should be true if scoped to an element which does not have the text" do

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

@@ -40,11 +40,20 @@ Capybara::SpecHelper.spec '#assert_title' do
     end.to raise_error(Capybara::ExpectationNotMet, 'expected "with_js" to include "monkey"')
   end
 
-  it "should normalize given title" do
-    @session.assert_title('  with_js  ')
+  it "should not normalize given title" do
+    @session.visit('/with_js')
+    expect { @session.assert_title('  with_js  ') }.to raise_error(Capybara::ExpectationNotMet)
+  end
+
+  it "should match correctly normalized title" do
+    uri = Addressable::URI.parse('/with_title')
+    uri.query_values = { title: '   with space  title   ' }
+    @session.visit(uri.to_s)
+    @session.assert_title('  with space  title')
+    expect { @session.assert_title('with space title') }.to raise_error(Capybara::ExpectationNotMet)
   end
 
-  it "should normalize given title in error message" do
+  it "should not normalize given title in error message" do
     expect do
       @session.assert_title(2)
     end.to raise_error(Capybara::ExpectationNotMet, 'expected "with_js" to include "2"')

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

@@ -11,19 +11,19 @@ Capybara::SpecHelper.spec "#attach_file" do
 
   context "with normal form" do
     it "should set a file path by id" do
-      @session.attach_file "form_image", __FILE__
+      @session.attach_file "form_image", with_os_path_separators(__FILE__)
       @session.click_button('awesome')
       expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
 
     it "should set a file path by label" do
-      @session.attach_file "Image", __FILE__
+      @session.attach_file "Image", with_os_path_separators(__FILE__)
       @session.click_button('awesome')
       expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
 
     it "casts to string" do
-      @session.attach_file :form_image, __FILE__
+      @session.attach_file :form_image, with_os_path_separators(__FILE__)
       @session.click_button('awesome')
       expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
@@ -31,13 +31,13 @@ Capybara::SpecHelper.spec "#attach_file" do
 
   context "with multipart form" do
     it "should set a file path by id" do
-      @session.attach_file "form_document", @test_file_path
+      @session.attach_file "form_document", with_os_path_separators(@test_file_path)
       @session.click_button('Upload Single')
       expect(@session).to have_content(File.read(@test_file_path))
     end
 
     it "should set a file path by label" do
-      @session.attach_file "Single Document", @test_file_path
+      @session.attach_file "Single Document", with_os_path_separators(@test_file_path)
       @session.click_button('Upload Single')
       expect(@session).to have_content(File.read(@test_file_path))
     end
@@ -48,25 +48,25 @@ Capybara::SpecHelper.spec "#attach_file" do
     end
 
     it "should send content type text/plain when uploading a text file" do
-      @session.attach_file "Single Document", @test_file_path
+      @session.attach_file "Single Document", with_os_path_separators(@test_file_path)
       @session.click_button 'Upload Single'
       expect(@session).to have_content('text/plain')
     end
 
     it "should send content type image/jpeg when uploading an image" do
-      @session.attach_file "Single Document", @test_jpg_file_path
+      @session.attach_file "Single Document", with_os_path_separators(@test_jpg_file_path)
       @session.click_button 'Upload Single'
       expect(@session).to have_content('image/jpeg')
     end
 
     it "should not break when uploading a file without extension" do
-      @session.attach_file "Single Document", @no_extension_file_path
+      @session.attach_file "Single Document", with_os_path_separators(@no_extension_file_path)
       @session.click_button 'Upload Single'
       expect(@session).to have_content(File.read(@no_extension_file_path))
     end
 
     it "should not break when using HTML5 multiple file input" do
-      @session.attach_file "Multiple Documents", @test_file_path
+      @session.attach_file "Multiple Documents", with_os_path_separators(@test_file_path)
       @session.click_button('Upload Multiple')
       expect(@session).to have_content(File.read(@test_file_path))
       expect(@session.body).to include("1 | ") # number of files
@@ -74,7 +74,8 @@ Capybara::SpecHelper.spec "#attach_file" do
 
     it "should not break when using HTML5 multiple file input uploading multiple files" do
       pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium_(firefox|marionette)/
-      @session.attach_file "Multiple Documents", [@test_file_path, @another_test_file_path]
+      @session.attach_file("Multiple Documents",
+                           [@test_file_path, @another_test_file_path].map { |f| with_os_path_separators(f) })
       @session.click_button('Upload Multiple')
       expect(@session.body).to include("2 | ") # number of files
       expect(@session.body).to include(File.read(@test_file_path))
@@ -91,7 +92,7 @@ Capybara::SpecHelper.spec "#attach_file" do
     it "should raise an error" do
       msg = "Unable to find visible file field \"does not exist\" that is not disabled"
       expect do
-        @session.attach_file('does not exist', @test_file_path)
+        @session.attach_file('does not exist', with_os_path_separators(@test_file_path))
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
@@ -104,14 +105,14 @@ Capybara::SpecHelper.spec "#attach_file" do
 
   context "with :exact option" do
     it "should set a file path by partial label when false" do
-      @session.attach_file "Imag", __FILE__, exact:  false
+      @session.attach_file "Imag", with_os_path_separators(__FILE__), exact: false
       @session.click_button('awesome')
       expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
 
     it "should not allow partial matches when true" do
       expect do
-        @session.attach_file "Imag", __FILE__, exact: true
+        @session.attach_file "Imag", with_os_path_separators(__FILE__), exact: true
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
@@ -119,30 +120,40 @@ Capybara::SpecHelper.spec "#attach_file" do
   context "with :make_visible option", requires: %i[js es_args] do
     it "applies a default style change when true" do
       @session.visit('/with_js')
-      expect { @session.attach_file("hidden_file", __FILE__) }.to raise_error Capybara::ElementNotFound
       expect do
-        @session.attach_file("hidden_file", __FILE__, make_visible: true)
+        @session.attach_file("hidden_file", with_os_path_separators(__FILE__))
+      end.to raise_error Capybara::ElementNotFound
+      expect do
+        @session.attach_file("hidden_file", with_os_path_separators(__FILE__), make_visible: true)
       end.not_to raise_error
     end
 
     it "accepts a hash of styles to be applied" do
       @session.visit('/with_js')
       expect do
-        @session.attach_file("hidden_file", __FILE__, make_visible: { opacity: 1, display: 'block' })
+        @session.attach_file("hidden_file",
+                             with_os_path_separators(__FILE__),
+                             make_visible: { opacity: 1, display: 'block' })
       end.not_to raise_error
     end
 
     it "raises an error when the file input is not made visible" do
       @session.visit('/with_js')
       expect do
-        @session.attach_file("hidden_file", __FILE__, make_visible: { color: 'red' })
+        @session.attach_file("hidden_file", with_os_path_separators(__FILE__), make_visible: { color: 'red' })
       end.to raise_error(Capybara::ExpectationNotMet)
     end
 
     it "resets the style when done" do
       @session.visit('/with_js')
-      @session.attach_file("hidden_file", __FILE__, make_visible: true)
+      @session.attach_file("hidden_file", with_os_path_separators(__FILE__), make_visible: true)
       expect(@session.evaluate_script("arguments[0].style.display", @session.find(:css, '#hidden_file', visible: :all))).to eq 'none'
     end
   end
+
+  private
+
+  def with_os_path_separators(path)
+    Gem.win_platform? ? path.to_s.tr('/', '\\') : path.to_s
+  end
 end

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

@@ -105,4 +105,14 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
     expect { @session.current_url }.not_to raise_exception
     expect { @session.current_path }.not_to raise_exception
   end
+
+  context "within iframe", requires: [:frames] do
+    it "should get the url of the top level browsing context" do
+      @session.visit('/within_frames')
+      expect(@session.current_url).to match(/within_frames\z/)
+      @session.within_frame('frameOne') do
+        expect(@session.current_url).to match(/within_frames\z/)
+      end
+    end
+  end
 end

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

@@ -53,6 +53,30 @@ Capybara::SpecHelper.spec "#fill_in" do
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
+  context "Date/Time" do
+    it "should fill in a date input" do
+      date = Date.today
+      @session.fill_in('form_date', with: date)
+      @session.click_button('awesome')
+      expect(Date.parse(extract_results(@session)['date'])).to eq date
+    end
+
+    it "should fill in a time input" do
+      time = Time.new(2018, 3, 9, 15, 26)
+      @session.fill_in('form_time', with: time)
+      @session.click_button('awesome')
+      results = extract_results(@session)['time']
+      expect(Time.parse(results).strftime('%r')).to eq time.strftime('%r')
+    end
+
+    it "should fill in a datetime input" do
+      dt = Time.new(2018, 3, 13, 9, 53)
+      @session.fill_in('form_datetime', with: dt)
+      @session.click_button('awesome')
+      expect(Time.parse(extract_results(@session)['datetime'])).to eq dt
+    end
+  end
+
   it "should handle HTML in a textarea" do
     @session.fill_in('form_description', with: 'is <strong>very</strong> secret!')
     @session.click_button('awesome')

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

@@ -7,7 +7,7 @@ Capybara::SpecHelper.spec '#find_field' do
 
   it "should find any field" do
     expect(@session.find_field('Dog').value).to eq('dog')
-    expect(@session.find_field('form_description').text).to eq('Descriptive text goes here')
+    expect(@session.find_field('form_description').value).to eq('Descriptive text goes here')
     expect(@session.find_field('Region')[:name]).to eq('form[region]')
     expect(@session.find_field('With Asterisk*')).to be
   end

data/lib/capybara/spec/session/frame/frame_title_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec '#frame_title', requires: [:frames] do
+  before(:each) do
+    @session.visit('/within_frames')
+  end
+
+  it "should return the title in a frame" do
+    @session.within_frame("frameOne") do
+      expect(@session.driver.frame_title).to eq 'This is the title of frame one'
+    end
+  end
+
+  it "should return the title in FrameTwo" do
+    @session.within_frame("frameTwo") do
+      expect(@session.driver.frame_title).to eq 'This is the title of frame two'
+    end
+  end
+
+  it "should return the title in the main frame" do
+    expect(@session.driver.frame_title).to eq 'With Frames'
+  end
+end

data/lib/capybara/spec/session/frame/frame_url_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec '#frame_url', requires: [:frames] do
+  before(:each) do
+    @session.visit('/within_frames')
+  end
+
+  it "should return the url in a frame" do
+    @session.within_frame("frameOne") do
+      expect(@session.driver.frame_url).to end_with '/frame_one'
+    end
+  end
+
+  it "should return the url in FrameTwo" do
+    @session.within_frame("frameTwo") do
+      expect(@session.driver.frame_url).to end_with '/frame_two'
+    end
+  end
+
+  it "should return the url in the main frame" do
+    expect(@session.driver.frame_url).to end_with('/within_frames')
+  end
+end

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

@@ -29,14 +29,9 @@ Capybara::SpecHelper.spec '#has_text?' do
     expect(@session).to have_text('exercitation ullamco laboris')
   end
 
-  it "should ignore extra whitespace and newlines" do
+  it "should search correctly normalized text" do
     @session.visit('/with_html')
-    expect(@session).to have_text('text with whitespace')
-  end
-
-  it "should ignore whitespace and newlines in the search string" do
-    @session.visit('/with_html')
-    expect(@session).to have_text("text     with \n\n whitespace")
+    expect(@session).to have_text('text with   whitespace')
   end
 
   it "should be false if the given text is not on the page" do
@@ -326,7 +321,7 @@ Capybara::SpecHelper.spec '#has_no_text?' do
     it "should not find element if it appears after given wait duration" do
       @session.visit('/with_js')
       @session.click_link('Click me')
-      expect(@session).to have_no_text('Has been clicked', wait: 0.1)
+      expect(@session).to have_no_text('Has been clicked', wait: 0.05)
     end
   end
 end

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

@@ -119,7 +119,7 @@ Capybara::SpecHelper.spec "node" do
         @session.visit('/with_js')
         @session.find(:css, '#existing_content_editable_child').set('WYSIWYG')
         expect(@session.find(:css, '#existing_content_editable_child').text).to eq('WYSIWYG')
-        expect(@session.find(:css, '#existing_content_editable_child_parent').text).to eq('Some content WYSIWYG')
+        expect(@session.find(:css, '#existing_content_editable_child_parent').text).to eq("Some content\nWYSIWYG")
       end
     end
   end

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

@@ -18,7 +18,9 @@ Capybara::SpecHelper.spec '#refresh' do
   end
 
   it "it reposts" do
-    skip "Firefox insists on prompting without providing a way to suppress" if marionette?(@session)
+    if marionette?(@session) || edge?(@session)
+      skip "Firefox and Edge insist on prompting without providing a way to suppress"
+    end
     @session.visit('/form')
     @session.select('Sweden', from: 'form_region')
     @session.click_button('awesome')

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

@@ -63,6 +63,24 @@ Capybara::SpecHelper.spec '#reset_session!' do
     expect(@session.current_path).to eq("/")
   end
 
+  it "closes extra windows", requires: [:windows] do
+    @session.visit('/with_html')
+    @session.open_new_window
+    @session.open_new_window
+    expect(@session.windows.size).to eq 3
+    @session.reset_session!
+    expect(@session.windows.size).to eq 1
+  end
+
+  it "closes extra windows when not on the first window", requires: [:windows] do
+    @session.visit('/with_html')
+    @session.switch_to_window(@session.open_new_window)
+    @session.open_new_window
+    expect(@session.windows.size).to eq 3
+    @session.reset_session!
+    expect(@session.windows.size).to eq 1
+  end
+
   context "When reuse_server == false" do
     before do
       @reuse_server = Capybara.reuse_server

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

@@ -16,7 +16,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
 
     @session.save_screenshot
 
-    regexp = Regexp.new(File.expand_path('capybara-\d+\.png'))
+    regexp = Regexp.new(File.join(Dir.pwd, 'capybara-\d+\.png'))
     expect(@session.driver).to have_received(:save_screenshot).with(regexp, {})
   end
 
@@ -36,7 +36,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
 
       @session.save_screenshot
 
-      regexp = Regexp.new(File.expand_path('capybara-\d+\.png', alternative_path))
+      regexp = Regexp.new(File.join(alternative_path, 'capybara-\d+\.png'))
       expect(@session.driver).to have_received(:save_screenshot).with(regexp, {})
     end
 

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

@@ -51,9 +51,22 @@ Capybara::SpecHelper.spec '#text' do
     after { Capybara.default_selector = :xpath }
   end
 
-  it "should strip whitespace" do
+  it "should be correctly normalized when visible" do
     @session.visit('/with_html')
-    @session.find(:css, '#second')
-    expect(@session.find(:css, '#second').text).to match(/\ADuis aute .* text with whitespace .* est laborum\.\z/)
+    el = @session.find(:css, '#normalized')
+    expect(el.text).to eq "Some text\nMore text\nAnd more text\nEven more    text on multiple lines"
+  end
+
+  it "should be a textContent with irrelevant whitespace collapsed when non-visible" do
+    @session.visit('/with_html')
+    el = @session.find(:css, '#non_visible_normalized', visible: false)
+    expect(el.text(:all)).to eq "Some textMore text And more text Even more    text on multiple lines"
+  end
+
+  it "should strip correctly" do
+    @session.visit('/with_html')
+    el = @session.find(:css, '#ws')
+    expect(el.text).to eq " "
+    expect(el.text(:all)).to eq " "
   end
 end

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

@@ -14,4 +14,14 @@ Capybara::SpecHelper.spec '#title' do
     end
     after { Capybara.default_selector = :xpath }
   end
+
+  context "within iframe", requires: [:frames] do
+    it "should get the title of the top level browsing context" do
+      @session.visit('/within_frames')
+      expect(@session.title).to eq('With Frames')
+      @session.within_frame('frameOne') do
+        expect(@session.title).to eq('With Frames')
+      end
+    end
+  end
 end

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

@@ -20,16 +20,15 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
 
   context "with an instance of Capybara::Window" do
     it "should not invoke driver#switch_to_window when given current window" do
-      # switch_to_window is invoked in after hook
-      expect(@session.driver).to receive(:switch_to_window).exactly(3).times.and_call_original
+      allow(@session.driver).to receive(:switch_to_window).and_call_original
       @session.within_window @window do
         expect(@session.title).to eq('With Windows')
       end
+      expect(@session.driver).not_to have_received(:switch_to_window)
     end
 
     it "should be able to switch to another window" do
       window = (@session.windows - [@window]).first
-      expect(@session.driver).to receive(:switch_to_window).exactly(5).times.and_call_original
       @session.within_window window do
         expect(@session).to have_title(/Title of the first popup|Title of popup two/)
       end

data/lib/capybara/spec/spec_helper.rb

@@ -133,6 +133,10 @@ module Capybara
     def chrome_gte?(version, session)
       chrome?(session) && (session.driver.browser.capabilities[:version].to_f >= version)
     end
+
+    def edge?(session)
+      session.respond_to?(:driver) && session.driver.respond_to?(:edge?, true) && session.driver.send(:edge?)
+    end
   end
 end
 

data/lib/capybara/spec/test_app.rb

@@ -144,6 +144,15 @@ class TestApp < Sinatra::Base
     erb :with_html, locals: { referrer: request.referrer }
   end
 
+  get '/with_title' do
+    <<-HTML
+      <title>#{params[:title] || 'Test Title'}</title>
+      <body>
+        <svg><title>abcdefg</title></svg>
+      </body>
+    HTML
+  end
+
   get '/:view' do |view|
     erb view.to_sym, locals: { referrer: request.referrer }
   end

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

@@ -426,6 +426,12 @@ New line after and before textarea tag
     <input type="button" disabled="disabled" value="Disabled button"/>
   </p>
 
+  <p>
+    <input type="date" name="form[date]" id="form_date"/>
+    <input type="time" name="form[time]" id="form_time"/>
+    <input type="datetime-local" name="form[datetime]" id="form_datetime">
+  </p>
+
   <p>
     <input id="readonly" name="form[readonly_test]" readonly/>
     <input id="not_readonly" name="form[readonly_test]" />

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

@@ -153,3 +153,23 @@ banana</textarea>
 </div>
 
 <div id='1escape.me' class="2escape">needs escaping</div>
+
+<div id="normalized">
+  Some text<div>More   text</div>
+  <div> And more text</div>
+  Even more &nbsp;&nbsp; text
+
+  on multiple lines
+</div>
+
+<div id="non_visible_normalized" style="display: none">
+  Some text<div>More   text</div>
+  <div> And more text</div>
+  Even more &nbsp;&nbsp; text
+
+  on multiple lines
+</div>
+
+<div id="ws">
+&#x20;&#x1680;&#x2000;&#x2001;&#x2002; &#x2003;&#x2004;&nbsp;&#x2005; &#x2006;&#x2007;&#x2008;&#x2009;&#x200A;&#x202F;&#x205F;&#x3000;
+</div>

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.0.0.rc1'.freeze
+  VERSION = '3.0.0.rc2'.freeze
 end

data/spec/selenium_spec_chrome.rb

@@ -28,6 +28,8 @@ skipped_tests = %i[response_headers status_code trigger]
 # skip window tests when headless for now - closing a window not supported by chromedriver/chrome
 skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
 
+$stdout.puts `#{Selenium::WebDriver::Chrome.driver_path} --version` if ENV['CI']
+
 Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with chrome" do

data/spec/selenium_spec_edge.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require "selenium-webdriver"
+require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
+
+Capybara.register_driver :selenium_edge do |app|
+  # ::Selenium::WebDriver.logger.level = "debug"
+  Capybara::Selenium::Driver.new(app, browser: :edge)
+end
+
+module TestSessions
+  SeleniumEdge = Capybara::Session.new(:selenium_edge, TestApp)
+end
+
+skipped_tests = %i[response_headers status_code trigger modals]
+
+$stdout.puts `#{Selenium::WebDriver::Edge.driver_path} --version` if ENV['CI']
+
+Capybara::SpecHelper.run_specs TestSessions::SeleniumEdge, "selenium", capybara_skip: skipped_tests
+
+RSpec.describe "Capybara::Session with Edge" do
+  include Capybara::SpecHelper
+  include_examples  "Capybara::Session", TestSessions::SeleniumEdge, :selenium_edge
+  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumEdge, :selenium_edge
+end

data/spec/selenium_spec_ie.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require "selenium-webdriver"
+require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
+
+Capybara.register_driver :selenium_ie do |app|
+  # ::Selenium::WebDriver.logger.level = "debug"
+  Capybara::Selenium::Driver.new(app, browser: :ie)
+end
+
+module TestSessions
+  SeleniumIE = Capybara::Session.new(:selenium_ie, TestApp)
+end
+
+skipped_tests = %i[response_headers status_code trigger]
+
+$stdout.puts `#{Selenium::WebDriver::IE.driver_path} --version` if ENV['CI']
+
+Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, "selenium", capybara_skip: skipped_tests
+
+RSpec.describe "Capybara::Session with Internet Explorer" do
+  include Capybara::SpecHelper
+  include_examples  "Capybara::Session", TestSessions::SeleniumIE, :selenium_ie
+  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumIE, :selenium_ie
+end

data/spec/selenium_spec_marionette.rb

@@ -40,6 +40,8 @@ end
 skipped_tests = %i[response_headers status_code trigger]
 skipped_tests << :windows if ENV['TRAVIS'] && ENV['SKIP_WINDOW']
 
+$stdout.puts `#{Selenium::WebDriver::Firefox.driver_path} --version` if ENV['CI']
+
 Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, "selenium", capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with firefox" do

data/spec/server_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe Capybara::Server do
     ensure
       Capybara.server_host = nil
     end
-  end unless ENV['TRAVIS'] and (RUBY_ENGINE == 'jruby')
+  end unless ENV['TRAVIS'] && (RUBY_ENGINE == 'jruby') or Gem.win_platform?
 
   it "should use specified port" do
     Capybara.server_port = 22789

data/spec/shared_selenium_session.rb

@@ -64,6 +64,7 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
 
       it "can be called before visiting" do
+        skip "Edge driver doesn't get any interactions when alert is set" if edge?(@session)
         @session.accept_alert "Initial alert" do
           @session.visit('/initial_alert')
         end
@@ -217,5 +218,13 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
         expect(@session).to have_current_path('/')
       end
     end
+
+    context "Windows" do
+      it "can't close the primary window" do
+        expect do
+          @session.current_window.close
+        end.to raise_error(ArgumentError, 'Not allowed to close the primary window')
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -2,10 +2,10 @@
 
 require 'rspec/expectations'
 require "capybara/spec/spec_helper"
-require 'webdrivers' if ENV['TRAVIS']
+require 'webdrivers' if ENV['CI']
 
 RSpec.configure do |config|
   Capybara::SpecHelper.configure(config)
-  config.filter_run_including focus_: true unless ENV['TRAVIS']
+  config.filter_run_including focus_: true unless ENV['CI']
   config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -371,6 +371,8 @@ files:
 - lib/capybara/spec/session/find_link_spec.rb
 - lib/capybara/spec/session/find_spec.rb
 - lib/capybara/spec/session/first_spec.rb
+- lib/capybara/spec/session/frame/frame_title_spec.rb
+- lib/capybara/spec/session/frame/frame_url_spec.rb
 - lib/capybara/spec/session/frame/switch_to_frame_spec.rb
 - lib/capybara/spec/session/frame/within_frame_spec.rb
 - lib/capybara/spec/session/go_back_spec.rb
@@ -471,6 +473,8 @@ files:
 - spec/rspec_spec.rb
 - spec/selector_spec.rb
 - spec/selenium_spec_chrome.rb
+- spec/selenium_spec_edge.rb
+- spec/selenium_spec_ie.rb
 - spec/selenium_spec_marionette.rb
 - spec/server_spec.rb
 - spec/session_spec.rb