capybara 2.18.0 → 3.0.0

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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_text?' do
   it "should be true if the given text is on the page at least once" do
     @session.visit('/with_html')
     expect(@session).to have_text('est')
     expect(@session).to have_text('Lorem')
     expect(@session).to have_text('Redirect')
-    expect(@session).to have_text(:'Redirect')
+    expect(@session).to have_text(:Redirect)
   end
 
   it "should be true if scoped to an element which has the text" do
@@ -28,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
-    @session.visit('/with_html')
-    expect(@session).to have_text('text with whitespace')
-  end
-
-  it "should ignore whitespace and newlines in the search string" do
+  it "should search correctly normalized text" 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
@@ -51,12 +47,12 @@ Capybara::SpecHelper.spec '#has_text?' do
 
   it 'should handle double quotes in the text' do
     @session.visit('/with-quotes')
-    expect(@session).to have_text(%q{"No," he said})
+    expect(@session).to have_text('"No," he said')
   end
 
   it 'should handle mixed single and double quotes in the text' do
     @session.visit('/with-quotes')
-    expect(@session).to have_text(%q{"you can't do that."})
+    expect(@session).to have_text(%q("you can't do that."))
   end
 
   it 'should be false if text is in the title tag in the head' do
@@ -265,12 +261,12 @@ Capybara::SpecHelper.spec '#has_no_text?' do
 
   it 'should handle double quotes in the text' do
     @session.visit('/with-quotes')
-    expect(@session).not_to have_no_text(%q{"No," he said})
+    expect(@session).not_to have_no_text('"No," he said')
   end
 
   it 'should handle mixed single and double quotes in the text' do
     @session.visit('/with-quotes')
-    expect(@session).not_to have_no_text(%q{"you can't do that."})
+    expect(@session).not_to have_no_text(%q("you can't do that."))
   end
 
   it 'should be true if text is in the title tag in the head' do
@@ -325,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/has_title_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_title?' do
   before do
     @session.visit('/with_js')

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_xpath?' do
   before do
     @session.visit('/with_html')

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#response_headers' do
   it "should return response headers", requires: [:response_headers] do
     @session.visit('/with_simple_html')
-    expect(@session.response_headers['Content-Type']).to match %r(text/html)
+    expect(@session.response_headers['Content-Type']).to match %r{text/html}
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#html' do
   it "should return the unmodified page body" do
     @session.visit('/')

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

@@ -27,14 +27,6 @@ Capybara::SpecHelper.spec "node" do
     end
   end
 
-  describe "#parent" do
-    it "should be deprecated" do
-      @node = @session.find(:css, '#first')
-      expect(@node).to receive(:warn).with(/^DEPRECATED:/)
-      expect(@node.parent).to eq(@node.query_scope)
-    end
-  end
-
   describe "#text" do
     it "should extract node texts" do
       expect(@session.all('//a')[0].text).to eq('labore')
@@ -102,44 +94,32 @@ Capybara::SpecHelper.spec "node" do
       expect(@session.first('//input').value).to eq('')
     end
 
-    it "should not set if the text field is readonly" do
-      expect(@session.first('//input[@readonly]').value).to eq('should not change')
-      @session.first('//input[@readonly]').set('changed')
-      expect(@session.first('//input[@readonly]').value).to eq('should not change')
-    end
-
     it "should raise if the text field is readonly" do
-      expect(@session.first('//input[@readonly]').set('changed')).to raise_error(Capybara::ReadOnlyElementError)
-    end if Capybara::VERSION.to_f > 3.0
-
-    it "should not set if the textarea is readonly" do
-      expect(@session.first('//textarea[@readonly]').value).to eq('textarea should not change')
-      @session.first('//textarea[@readonly]').set('changed')
-      expect(@session.first('//textarea[@readonly]').value).to eq('textarea should not change')
+      expect { @session.first('//input[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
     end
 
     it "should raise if the text field is readonly" do
-      expect(@session.first('//textarea[@readonly]').set('changed')).to raise_error(Capybara::ReadOnlyElementError)
-    end if Capybara::VERSION.to_f > 3.0
+      expect { @session.first('//textarea[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
+    end
 
     context "with a contenteditable element", requires: [:js] do
       it 'should allow me to change the contents' do
         @session.visit('/with_js')
-        @session.find(:css,'#existing_content_editable').set('WYSIWYG')
-        expect(@session.find(:css,'#existing_content_editable').text).to eq('WYSIWYG')
+        @session.find(:css, '#existing_content_editable').set('WYSIWYG')
+        expect(@session.find(:css, '#existing_content_editable').text).to eq('WYSIWYG')
       end
 
       it 'should allow me to set the contents' do
         @session.visit('/with_js')
-        @session.find(:css,'#blank_content_editable').set('WYSIWYG')
-        expect(@session.find(:css,'#blank_content_editable').text).to eq('WYSIWYG')
+        @session.find(:css, '#blank_content_editable').set('WYSIWYG')
+        expect(@session.find(:css, '#blank_content_editable').text).to eq('WYSIWYG')
       end
 
       it 'should allow me to change the contents of a child element' 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')
+        @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\nWYSIWYG")
       end
     end
   end
@@ -258,9 +238,9 @@ Capybara::SpecHelper.spec "node" do
 
   describe "#==" do
     it "preserve object identity" do
-      expect(@session.find('//h1') == @session.find('//h1')).to be true
-      expect(@session.find('//h1') === @session.find('//h1')).to be true
-      expect(@session.find('//h1').eql? @session.find('//h1')).to be false
+      expect(@session.find('//h1') == @session.find('//h1')).to be true # rubocop:disable Lint/UselessComparison
+      expect(@session.find('//h1') === @session.find('//h1')).to be true # rubocop:disable Style/CaseEquality, Lint/UselessComparison
+      expect(@session.find('//h1').eql?(@session.find('//h1'))).to be false
     end
 
     it "returns false for unrelated object" do
@@ -281,7 +261,7 @@ Capybara::SpecHelper.spec "node" do
     end
   end
 
-  describe "#trigger", requires: [:js, :trigger] do
+  describe "#trigger", requires: %i[js trigger] do
     it "should allow triggering of custom JS events" do
       @session.visit('/with_js')
       @session.find(:css, '#with_focus_event').trigger(:focus)
@@ -289,7 +269,7 @@ Capybara::SpecHelper.spec "node" do
     end
   end
 
-  describe '#drag_to', requires: [:js, :drag] do
+  describe '#drag_to', requires: %i[js drag] do
     it "should drag and drop an object" do
       @session.visit('/with_js')
       element = @session.find('//div[@id="drag"]')
@@ -311,14 +291,14 @@ Capybara::SpecHelper.spec "node" do
     it "should allow hovering on an element" do
       @session.visit('/with_hover')
       expect(@session.find(:css, '.wrapper:not(.scroll_needed) .hidden_until_hover', visible: false)).not_to be_visible
-      @session.find(:css,'.wrapper:not(.scroll_needed)').hover
+      @session.find(:css, '.wrapper:not(.scroll_needed)').hover
       expect(@session.find(:css, '.wrapper:not(.scroll_needed) .hidden_until_hover', visible: false)).to be_visible
     end
 
     it "should allow hovering on an element that needs to be scrolled into view" do
       @session.visit('/with_hover')
       expect(@session.find(:css, '.wrapper.scroll_needed .hidden_until_hover', visible: false)).not_to be_visible
-      @session.find(:css,'.wrapper.scroll_needed').hover
+      @session.find(:css, '.wrapper.scroll_needed').hover
       expect(@session.find(:css, '.wrapper.scroll_needed .hidden_until_hover', visible: false)).to be_visible
     end
   end
@@ -358,15 +338,59 @@ Capybara::SpecHelper.spec "node" do
       radio.click
       expect(radio).to be_checked
     end
+
+    it "should allow modifiers", requires: [:js] do
+      @session.visit('/with_js')
+      @session.find(:css, '#click-test').click(:shift)
+      expect(@session).to have_link('Has been shift clicked')
+    end
+
+    it "should allow multiple modifiers", requires: [:js] do
+      @session.visit('with_js')
+      @session.find(:css, '#click-test').click(:control, :alt, :meta, :shift)
+      # Selenium with Chrome on OSX ctrl-click generates a right click so just verify all keys but not click type
+      expect(@session).to have_link("alt control meta shift")
+    end
+
+    it "should allow to adjust the click offset", requires: [:js] do
+      @session.visit('with_js')
+      @session.find(:css, '#click-test').click(x: 5, y: 5)
+      link = @session.find(:link, 'has-been-clicked')
+      locations = link.text.match(/^Has been clicked at (?<x>[\d\.-]+),(?<y>[\d\.-]+)$/)
+      # Resulting click location should be very close to 0, 0 relative to top left corner of the element, but may not be exact due to
+      # integer/float conversions and rounding.
+      expect(locations[:x].to_f).to be_within(1).of(5)
+      expect(locations[:y].to_f).to be_within(1).of(5)
+    end
   end
 
   describe '#double_click', requires: [:js] do
+    before do
+      pending "selenium-webdriver/geckodriver doesn't generate double click event" if marionette_lt?(59, @session)
+    end
+
     it "should double click an element" do
-      pending "selenium-webdriver/geckodriver doesn't generate double click event" if marionette?(@session)
       @session.visit('/with_js')
       @session.find(:css, '#click-test').double_click
       expect(@session.find(:css, '#has-been-double-clicked')).to be
     end
+
+    it "should allow modifiers", requires: [:js] do
+      @session.visit('/with_js')
+      @session.find(:css, '#click-test').double_click(:alt)
+      expect(@session).to have_link('Has been alt double clicked')
+    end
+
+    it "should allow to adjust the offset", requires: [:js] do
+      @session.visit('with_js')
+      @session.find(:css, '#click-test').double_click(x: 10, y: 5)
+      link = @session.find(:link, 'has-been-double-clicked')
+      locations = link.text.match(/^Has been double clicked at (?<x>[\d\.-]+),(?<y>[\d\.-]+)$/)
+      # Resulting click location should be very close to 10, 5 relative to top left corner of the element, but may not be exact due
+      # to integer/float conversions and rounding.
+      expect(locations[:x].to_f).to be_within(1).of(10)
+      expect(locations[:y].to_f).to be_within(1).of(5)
+    end
   end
 
   describe '#right_click', requires: [:js] do
@@ -375,6 +399,23 @@ Capybara::SpecHelper.spec "node" do
       @session.find(:css, '#click-test').right_click
       expect(@session.find(:css, '#has-been-right-clicked')).to be
     end
+
+    it "should allow modifiers", requires: [:js] do
+      @session.visit('/with_js')
+      @session.find(:css, '#click-test').right_click(:meta)
+      expect(@session).to have_link('Has been meta right clicked')
+    end
+
+    it "should allow to adjust the offset", requires: [:js] do
+      @session.visit('with_js')
+      @session.find(:css, '#click-test').right_click(x: 10, y: 10)
+      link = @session.find(:link, 'has-been-right-clicked')
+      locations = link.text.match(/^Has been right clicked at (?<x>[\d\.-]+),(?<y>[\d\.-]+)$/)
+      # Resulting click location should be very close to 10, 10 relative to top left corner of the element, but may not be exact due
+      # to integer/float conversions and rounding
+      expect(locations[:x].to_f).to be_within(1).of(10)
+      expect(locations[:y].to_f).to be_within(1).of(10)
+    end
   end
 
   describe '#send_keys', requires: [:send_keys] do
@@ -398,10 +439,10 @@ Capybara::SpecHelper.spec "node" do
       expect(@session.find(:css, '#address1_city').value).to eq 'Oceanside'
     end
 
-    it "should generate key events", requires: [:send_keys, :js] do
+    it "should generate key events", requires: %i[send_keys js] do
       pending "selenium-webdriver/geckodriver doesn't support complex sets of characters" if marionette?(@session)
       @session.visit('/with_js')
-      @session.find(:css, '#with-key-events').send_keys([:shift,'t'], [:shift,'w'])
+      @session.find(:css, '#with-key-events').send_keys([:shift, 't'], [:shift, 'w'])
       expect(@session.find(:css, '#key-events-output')).to have_text('keydown:16 keydown:84 keydown:16 keydown:87')
     end
   end
@@ -434,9 +475,9 @@ Capybara::SpecHelper.spec "node" do
         sleep(0.3)
         expect do
           expect(node).to have_text('has been reloaded')
-        end.to raise_error do |error|
+        end.to(raise_error do |error|
           expect(error).to be_an_invalid_element_error(@session)
-        end
+        end)
       end
       after { Capybara.automatic_reload = true }
     end
@@ -478,14 +519,10 @@ Capybara::SpecHelper.spec "node" do
 
         expect do
           expect(node).to have_text('Foo')
-        end.to raise_error { |error|
-          expect(error).to be_an_invalid_element_error(@session)
-        }
+        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.to(raise_error { |error| expect(error).to be_an_invalid_element_error(@session) })
       end
 
       it "should reload nodes with options" do
@@ -499,26 +536,24 @@ Capybara::SpecHelper.spec "node" do
   end
 
   context "when #synchronize raises server errors" do
-    it "sets an explanatory exception as the cause of server exceptions", requires: [:server, :js] do
-      skip "This version of ruby doesn't support exception causes" unless Exception.instance_methods.include? :cause
+    it "sets an explanatory exception as the cause of server exceptions", requires: %i[server js] do
       quietly { @session.visit("/error") }
       expect do
         @session.find(:css, 'span')
-      end.to raise_error(TestApp::TestAppError) do |e|
+      end.to(raise_error(TestApp::TestAppError) do |e|
         expect(e.cause).to be_a Capybara::CapybaraError
         expect(e.cause.message).to match(/Your application server raised an error/)
-      end
+      end)
     end
 
-    it "sets an explanatory exception as the cause of server exceptions with errors with initializers", requires: [:server, :js] do
-      skip "This version of ruby doesn't support exception causes" unless Exception.instance_methods.include? :cause
+    it "sets an explanatory exception as the cause of server exceptions with errors with initializers", requires: %i[server js] do
       quietly { @session.visit("/other_error") }
       expect do
         @session.find(:css, 'span')
-      end.to raise_error(TestApp::TestAppOtherError) do |e|
+      end.to(raise_error(TestApp::TestAppOtherError) do |e|
         expect(e.cause).to be_a Capybara::CapybaraError
         expect(e.cause.message).to match(/Your application server raised an error/)
-      end
+      end)
     end
   end
 

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec "#to_capybara_node" do
+  before do
+    @session.visit('/with_html')
+  end
+
+  class NodeWrapper
+    def initialize(element); @element = element end
+    def to_capybara_node(); @element end
+  end
+
+  it "should support have_xxx expectations" do
+    para = NodeWrapper.new(@session.find(:css, '#first'))
+    expect(para).to have_link("ullamco")
+  end
+
+  it "should support within" do
+    para = NodeWrapper.new(@session.find(:css, '#first'))
+    expect(@session).to have_css('#second')
+    @session.within(para) do
+      expect(@session).to have_link('ullamco')
+      expect(@session).not_to have_css('#second')
+    end
+  end
+
+  it "should generate correct errors" do
+    para = NodeWrapper.new(@session.find(:css, '#first'))
+    expect do
+      expect(para).to have_text("Header Class Test One")
+    end.to raise_error(/^expected to find text "Header Class Test One" in "Lore/)
+    expect do
+      expect(para).to have_css('#second')
+    end.to raise_error(/^expected to find visible css "#second" within #<Capybara::Node::Element/)
+  end
+end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#refresh' do
   it "reload the page" do
     @session.visit('/form')
@@ -17,12 +18,15 @@ Capybara::SpecHelper.spec '#refresh' do
   end
 
   it "it reposts" do
+    if marionette?(@session) || edge?(@session) || ie?(@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')
-    expect {
+    expect do
       @session.refresh
       sleep 2
-    }.to change{ extract_results(@session)['post_count'] }.by(1)
+    end.to change { extract_results(@session)['post_count'] }.by(1)
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#reset_session!' do
   it "removes cookies" do
     @session.visit('/set_cookie')
@@ -62,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/response_code.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#status_code' do
   it "should return response codes", requires: [:status_code] do
     @session.visit('/with_simple_html')

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'launchy'
 
 Capybara::SpecHelper.spec '#save_and_open_page' do

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'launchy'
 
 Capybara::SpecHelper.spec '#save_and_open_screenshot' do
@@ -13,8 +14,8 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
 
     @session.save_and_open_screenshot
 
-    expect(@session.driver).to have_received(:save_screenshot).
-      with(expected_file_regex, {})
+    expect(@session.driver).to have_received(:save_screenshot)
+      .with(expected_file_regex, {})
     expect(Launchy).to have_received(:open).with(expected_file_regex)
   end
 
@@ -25,8 +26,8 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
 
     @session.save_and_open_screenshot(custom_path)
 
-    expect(@session.driver).to have_received(:save_screenshot).
-      with(/#{custom_path}$/, {})
+    expect(@session.driver).to have_received(:save_screenshot)
+      .with(/#{custom_path}$/, {})
     expect(Launchy).to have_received(:open).with(/#{custom_path}$/)
   end
 
@@ -34,14 +35,8 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
     it 'prints out a correct warning message', requires: [:screenshot] do
       file_path = File.join(Dir.tmpdir, 'test.png')
       allow(@session).to receive(:require).with('launchy').and_raise(LoadError)
-      allow(@session).to receive(:warn)
-
+      expect(@session).to receive(:warn).with("File saved to #{file_path}.\nPlease install the launchy gem to open the file automatically.")
       @session.save_and_open_screenshot(file_path)
-
-      expect(@session).to have_received(:warn).
-        with("File saved to #{file_path}.")
-      expect(@session).to have_received(:warn).
-        with('Please install the launchy gem to open the file automatically.')
     end
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#save_page' do
   let(:alternative_path) { File.join(Dir.pwd, "save_and_open_page_tmp") }
   before do
@@ -6,7 +7,6 @@ Capybara::SpecHelper.spec '#save_page' do
   end
 
   after do
-    Capybara.save_and_open_page_path = nil
     Capybara.save_path = nil
     Dir.glob("capybara-*.html").each do |file|
       FileUtils.rm(file)
@@ -104,20 +104,4 @@ Capybara::SpecHelper.spec '#save_page' do
       expect(result).to include("Bar")
     end
   end
-
-  context "with deprecated save_and_open_page_path" do
-    it "can store files in a specified directory" do
-      Capybara.save_and_open_page_path = alternative_path
-      @session.save_page
-      path = Dir.glob(alternative_path + "/capybara-*.html").first
-      expect(File.read(path)).to include("Another World")
-    end
-
-    it "returns an absolute path in given directory" do
-      Capybara.save_and_open_page_path = alternative_path
-      result = @session.save_page
-      path = File.expand_path(Dir.glob(alternative_path + "/capybara-*.html").first, alternative_path)
-      expect(result).to eq(path)
-    end
-  end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
   let(:alternative_path) { File.join(Dir.pwd, "save_screenshot_tmp") }
   before do
@@ -6,7 +7,6 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
   end
 
   after do
-    Capybara.save_and_open_page_path = nil
     Capybara.save_path = nil
     FileUtils.rm_rf alternative_path
   end
@@ -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