capybara 3.3.0 → 3.40.0

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

@@ -1,87 +1,99 @@
 # frozen_string_literal: true
 
-Capybara::SpecHelper.spec "#uncheck" do
+Capybara::SpecHelper.spec '#uncheck' do
   before do
     @session.visit('/form')
   end
 
-  it "should uncheck a checkbox by id" do
-    @session.uncheck("form_pets_hamster")
+  it 'should uncheck a checkbox by id' do
+    @session.uncheck('form_pets_hamster')
     @session.click_button('awesome')
     expect(extract_results(@session)['pets']).to include('dog')
     expect(extract_results(@session)['pets']).not_to include('hamster')
   end
 
-  it "should uncheck a checkbox by label" do
-    @session.uncheck("Hamster")
+  it 'should uncheck a checkbox by label' do
+    @session.uncheck('Hamster')
     @session.click_button('awesome')
     expect(extract_results(@session)['pets']).to include('dog')
     expect(extract_results(@session)['pets']).not_to include('hamster')
   end
 
-  it "should work without a locator string" do
-    @session.uncheck(id: "form_pets_hamster")
+  it 'should work without a locator string' do
+    @session.uncheck(id: 'form_pets_hamster')
     @session.click_button('awesome')
     expect(extract_results(@session)['pets']).to include('dog')
     expect(extract_results(@session)['pets']).not_to include('hamster')
   end
 
-  it "casts to string" do
+  it 'should be able to uncheck itself if no locator specified' do
+    cb = @session.find(:id, 'form_pets_hamster')
+    cb.uncheck
+    @session.click_button('awesome')
+    expect(extract_results(@session)['pets']).to include('dog')
+    expect(extract_results(@session)['pets']).not_to include('hamster')
+  end
+
+  it 'casts to string' do
     @session.uncheck(:form_pets_hamster)
     @session.click_button('awesome')
     expect(extract_results(@session)['pets']).to include('dog')
     expect(extract_results(@session)['pets']).not_to include('hamster')
   end
 
-  context "with :exact option" do
-    it "should accept partial matches when false" do
+  context 'with :exact option' do
+    it 'should accept partial matches when false' do
       @session.uncheck('Ham', exact:  false)
       @session.click_button('awesome')
       expect(extract_results(@session)['pets']).not_to include('hamster')
     end
 
-    it "should not accept partial matches when true" do
+    it 'should not accept partial matches when true' do
       expect do
-        @session.uncheck('Ham', exact:  true)
+        @session.uncheck('Ham', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
-  context "when checkbox hidden" do
-    context "with Capybara.automatic_label_click == true" do
+  context 'when checkbox hidden' do
+    context 'with Capybara.automatic_label_click == true' do
       around do |spec|
         old_click_label, Capybara.automatic_label_click = Capybara.automatic_label_click, true
         spec.run
         Capybara.automatic_label_click = old_click_label
       end
 
-      it "should uncheck via clicking the label with :for attribute if possible" do
+      it 'should uncheck via clicking the label with :for attribute if possible' do
         expect(@session.find(:checkbox, 'form_cars_jaguar', checked: true, visible: :hidden)).to be_truthy
         @session.uncheck('form_cars_jaguar')
         @session.click_button('awesome')
         expect(extract_results(@session)['cars']).not_to include('jaguar')
       end
 
-      it "should uncheck via clicking the wrapping label if possible" do
+      it 'should uncheck via clicking the wrapping label if possible' do
         expect(@session.find(:checkbox, 'form_cars_koenigsegg', checked: true, visible: :hidden)).to be_truthy
         @session.uncheck('form_cars_koenigsegg')
         @session.click_button('awesome')
         expect(extract_results(@session)['cars']).not_to include('koenigsegg')
       end
 
-      it "should not click the label if unneeded" do
+      it 'should not click the label if unneeded' do
         expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be_truthy
         @session.uncheck('form_cars_tesla')
         @session.click_button('awesome')
         expect(extract_results(@session)['cars']).not_to include('tesla')
       end
 
-      it "should raise original error when no label available" do
-        expect { @session.uncheck('form_cars_porsche') }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_porsche" that is not disabled')
+      it 'should raise original error when no label available' do
+        expect { @session.uncheck('form_cars_porsche') }.to raise_error(Capybara::ElementNotFound, /Unable to find visible checkbox "form_cars_porsche"/)
+      end
+
+      it 'should raise error if not allowed to click label' do
+        expect { @session.uncheck('form_cars_jaguar', allow_label_click: false) }.to raise_error(Capybara::ElementNotFound, /Unable to find visible checkbox "form_cars_jaguar"/)
       end
 
-      it "should raise error if not allowed to click label" do
-        expect { @session.uncheck('form_cars_jaguar', allow_label_click: false) }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_jaguar" that is not disabled')
+      it 'should include node filter description in error if necessary' do
+        expect { @session.uncheck('form_cars_maserati', allow_label_click: false) }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_maserati" that is not disabled')
       end
     end
   end

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

@@ -1,46 +1,46 @@
 # frozen_string_literal: true
 
-Capybara::SpecHelper.spec "#unselect" do
+Capybara::SpecHelper.spec '#unselect' do
   before do
     @session.visit('/form')
   end
 
-  context "with multiple select" do
-    it "should unselect an option from a select box by id" do
+  context 'with multiple select' do
+    it 'should unselect an option from a select box by id' do
       @session.unselect('Commando', from: 'form_underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Briefs', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Commando')
     end
 
-    it "should unselect an option without a select box" do
+    it 'should unselect an option without a select box' do
       @session.unselect('Commando')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Briefs', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Commando')
     end
 
-    it "should unselect an option from a select box by label" do
+    it 'should unselect an option from a select box by label' do
       @session.unselect('Commando', from: 'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Briefs', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Commando')
     end
 
-    it "should favour exact matches to option labels" do
-      @session.unselect("Briefs", from: 'Underwear')
+    it 'should favour exact matches to option labels' do
+      @session.unselect('Briefs', from: 'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Commando', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Briefs')
     end
 
-    it "should escape quotes" do
+    it 'should escape quotes' do
       @session.unselect("Frenchman's Pantalons", from: 'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).not_to include("Frenchman's Pantalons")
     end
 
-    it "casts to string" do
+    it 'casts to string' do
       @session.unselect(:Briefs, from: :Underwear)
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Commando', 'Boxerbriefs')
@@ -48,15 +48,15 @@ Capybara::SpecHelper.spec "#unselect" do
     end
   end
 
-  context "with single select" do
-    it "should raise an error" do
-      expect { @session.unselect("English", from: 'form_locale') }.to raise_error(Capybara::UnselectNotAllowed)
+  context 'with single select' do
+    it 'should raise an error' do
+      expect { @session.unselect('English', from: 'form_locale') }.to raise_error(Capybara::UnselectNotAllowed)
     end
   end
 
   context "with a locator that doesn't exist" do
-    it "should raise an error" do
-      msg = "Unable to find visible select box \"does not exist\" that is not disabled"
+    it 'should raise an error' do
+      msg = /Unable to find select box "does not exist"/
       expect do
         @session.unselect('foo', from: 'does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -64,51 +64,51 @@ Capybara::SpecHelper.spec "#unselect" do
   end
 
   context "with an option that doesn't exist" do
-    it "should raise an error" do
-      msg = /^Unable to find visible option "Does not Exist" within/
+    it 'should raise an error' do
+      msg = /^Unable to find option "Does not Exist" within/
       expect do
         @session.unselect('Does not Exist', from: 'form_underwear')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
 
-  context "with :exact option" do
-    context "when `false`" do
-      it "can match select box approximately" do
-        @session.unselect("Boxerbriefs", from: "Under", exact: false)
-        @session.click_button("awesome")
-        expect(extract_results(@session)["underwear"]).not_to include("Boxerbriefs")
+  context 'with :exact option' do
+    context 'when `false`' do
+      it 'can match select box approximately' do
+        @session.unselect('Boxerbriefs', from: 'Under', exact: false)
+        @session.click_button('awesome')
+        expect(extract_results(@session)['underwear']).not_to include('Boxerbriefs')
       end
 
-      it "can match option approximately" do
-        @session.unselect("Boxerbr", from: "Underwear", exact: false)
-        @session.click_button("awesome")
-        expect(extract_results(@session)["underwear"]).not_to include("Boxerbriefs")
+      it 'can match option approximately' do
+        @session.unselect('Boxerbr', from: 'Underwear', exact: false)
+        @session.click_button('awesome')
+        expect(extract_results(@session)['underwear']).not_to include('Boxerbriefs')
       end
 
-      it "can match option approximately when :from not given" do
-        @session.unselect("Boxerbr", exact: false)
-        @session.click_button("awesome")
-        expect(extract_results(@session)["underwear"]).not_to include("Boxerbriefs")
+      it 'can match option approximately when :from not given' do
+        @session.unselect('Boxerbr', exact: false)
+        @session.click_button('awesome')
+        expect(extract_results(@session)['underwear']).not_to include('Boxerbriefs')
       end
     end
 
-    context "when `true`" do
-      it "can match select box approximately" do
+    context 'when `true`' do
+      it 'can match select box approximately' do
         expect do
-          @session.unselect("Boxerbriefs", from: "Under", exact:  true)
+          @session.unselect('Boxerbriefs', from: 'Under', exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 
-      it "can match option approximately" do
+      it 'can match option approximately' do
         expect do
-          @session.unselect("Boxerbr", from: "Underwear", exact:  true)
+          @session.unselect('Boxerbr', from: 'Underwear', exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 
-      it "can match option approximately when :from not given" do
+      it 'can match option approximately when :from not given' do
         expect do
-          @session.unselect("Boxerbr", exact: true)
+          @session.unselect('Boxerbr', exact: true)
         end.to raise_error(Capybara::ElementNotFound)
       end
     end

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#visit' do
-  it "should fetch a response from the driver with a relative url" do
+  it 'should fetch a response from the driver with a relative url' do
     @session.visit('/')
     expect(@session).to have_content('Hello world!')
     @session.visit('/foo')
     expect(@session).to have_content('Another World')
   end
 
-  it "should fetch a response from the driver with an absolute url with a port" do
+  it 'should fetch a response from the driver with an absolute url with a port' do
     # Preparation
     @session.visit('/')
     root_uri = URI.parse(@session.current_url)
@@ -28,27 +28,26 @@ Capybara::SpecHelper.spec '#visit' do
     expect(@session).to have_content('Hello world!')
   end
 
-  it "should fetch a response when sequentially visiting same destination with a target" do
-    skip "Chrome/chromedriver has an issue visiting URL with target after visiting same URL without target" if chrome_lt?(65.0, @session)
+  it 'should fetch a response when sequentially visiting same destination with a target' do
     @session.visit('/form')
     expect(@session).to have_css('#form_title')
     @session.visit('/form#form_title')
     expect(@session).to have_css('#form_title')
   end
 
-  it "raises any errors caught inside the server", requires: [:server] do
-    quietly { @session.visit("/error") }
+  it 'raises any errors caught inside the server', requires: [:server] do
+    quietly { @session.visit('/error') }
     expect do
-      @session.visit("/")
+      @session.visit('/')
     end.to raise_error(TestApp::TestAppError)
   end
 
-  it "should be able to open non-http url", requires: [:about_scheme] do
-    @session.visit("about:blank")
-    @session.assert_no_selector :xpath, "/html/body/*"
+  it 'should be able to open non-http url', requires: [:about_scheme] do
+    @session.visit('about:blank')
+    @session.assert_no_selector :xpath, '/html/body/*'
   end
 
-  context "when Capybara.always_include_port is true" do
+  context 'when Capybara.always_include_port is true' do
     let(:root_uri) do
       @session.visit('/')
       URI.parse(@session.current_url)
@@ -62,7 +61,7 @@ Capybara::SpecHelper.spec '#visit' do
       Capybara.always_include_port = false
     end
 
-    it "should fetch a response from the driver with an absolute url without a port" do
+    it 'should fetch a response from the driver with an absolute url without a port' do
       @session.visit("http://#{root_uri.host}/")
       expect(URI.parse(@session.current_url).port).to eq(root_uri.port)
       expect(@session).to have_content('Hello world!')
@@ -72,134 +71,154 @@ Capybara::SpecHelper.spec '#visit' do
       expect(@session).to have_content('Another World')
     end
 
-    it "should add the server port to a visited url if no port specified", requires: [:server] do
+    it 'should add the server port to a visited url if no port specified', requires: [:server] do
       allow(@session.driver).to receive(:visit)
-      @session.visit("http://www.example.com")
+      @session.visit('http://www.example.com')
       expect(@session.driver).to have_received(:visit).with("http://www.example.com:#{@session.server.port}")
     end
 
-    it "should not override the visit specified port even if default for scheme", requires: [:server] do
+    it 'should not override the visit specified port even if default for scheme', requires: [:server] do
       allow(@session.driver).to receive(:visit)
       @session.visit('http://www.example.com:80')
-      expect(@session.driver).to have_received(:visit).with("http://www.example.com:80")
+      expect(@session.driver).to have_received(:visit).with('http://www.example.com:80')
     end
 
-    it "should give preference to app_host port if specified", requires: [:server] do
+    it 'should give preference to app_host port if specified', requires: [:server] do
       allow(@session.driver).to receive(:visit)
-      Capybara.app_host = "http://www.example.com:6666"
+      Capybara.app_host = 'http://www.example.com:6666'
       @session.visit('/random')
-      expect(@session.driver).to have_received(:visit).with("http://www.example.com:6666/random")
+      expect(@session.driver).to have_received(:visit).with('http://www.example.com:6666/random')
     end
 
     it "shouldn't override port if no server", requires: [:server] do
       session = Capybara::Session.new(@session.mode, nil)
       allow(session.driver).to receive(:visit)
-      session.visit("http://www.google.com")
-      expect(session.driver).to have_received(:visit).with("http://www.google.com")
+      session.visit('http://www.google.com')
+      expect(session.driver).to have_received(:visit).with('http://www.google.com')
     end
 
     it "shouldn't override port if no server but app_host is set", requires: [:server] do
       session = Capybara::Session.new(@session.mode, nil)
-      Capybara.app_host = "http://www.example.com:6666"
+      Capybara.app_host = 'http://www.example.com:6666'
       allow(session.driver).to receive(:visit)
-      session.visit("http://www.google.com")
-      expect(session.driver).to have_received(:visit).with("http://www.google.com")
+      session.visit('http://www.google.com')
+      expect(session.driver).to have_received(:visit).with('http://www.google.com')
     end
   end
 
-  context "when Capybara.always_include_port is false" do
+  context 'when Capybara.always_include_port is false' do
     before do
       Capybara.always_include_port = false
     end
 
     it "shouldn't overwrite port if app_host is set", requires: [:server] do
       session = Capybara::Session.new(@session.mode, nil)
-      Capybara.app_host = "http://www.example.com:6666"
+      Capybara.app_host = 'http://www.example.com:6666'
       allow(session.driver).to receive(:visit)
-      session.visit("http://www.google.com")
-      expect(session.driver).to have_received(:visit).with("http://www.google.com")
+      session.visit('http://www.google.com')
+      expect(session.driver).to have_received(:visit).with('http://www.google.com')
     end
 
     it "shouldn't overwrite port if port specfified", requires: [:server] do
       session = Capybara::Session.new(@session.mode, nil)
-      Capybara.app_host = "http://www.example.com:6666"
+      Capybara.app_host = 'http://www.example.com:6666'
       allow(session.driver).to receive(:visit)
-      session.visit("http://www.google.com:99")
-      expect(session.driver).to have_received(:visit).with("http://www.google.com:99")
+      session.visit('http://www.google.com:99')
+      expect(session.driver).to have_received(:visit).with('http://www.google.com:99')
     end
   end
 
-  context "without a server", requires: [:server] do
-    it "should respect `app_host`" do
+  context 'without a server', requires: [:server] do
+    it 'should respect `app_host`' do
       serverless_session = Capybara::Session.new(@session.mode, nil)
       Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}"
-      serverless_session.visit("/foo")
-      expect(serverless_session).to have_content("Another World")
+      serverless_session.visit('/foo')
+      expect(serverless_session).to have_content('Another World')
     end
 
-    it "should visit a fully qualified URL" do
+    it 'should visit a fully qualified URL' do
       serverless_session = Capybara::Session.new(@session.mode, nil)
       serverless_session.visit("http://#{@session.server.host}:#{@session.server.port}/foo")
-      expect(serverless_session).to have_content("Another World")
+      expect(serverless_session).to have_content('Another World')
     end
   end
 
-  context "with Capybara.app_host set" do
-    it "should override server", requires: [:server] do
+  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).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
+    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
 
-    it "should work if `app_host` has a trailing /", requires: [:server] do
+    it 'should work if `app_host` has a trailing /', requires: [:server] do
       Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}/"
       @session.visit('/')
       expect(@session).to have_content('Hello world!')
     end
   end
 
-  it "should send no referer when visiting a page" do
+  it 'should send no referer when visiting a page' do
     @session.visit '/get_referer'
     expect(@session).to have_content 'No referer'
   end
 
-  it "should send no referer when visiting a second page" do
+  it 'should send no referer when visiting a second page' do
     @session.visit '/get_referer'
     @session.visit '/get_referer'
     expect(@session).to have_content 'No referer'
   end
 
-  it "should send a referer when following a link" do
+  it 'should send a referer when following a link' do
     @session.visit '/referer_base'
     @session.find('//a[@href="/get_referer"]').click
     expect(@session).to have_content %r{http://.*/referer_base}
   end
 
-  it "should preserve the original referer URL when following a redirect" do
+  it 'should preserve the original referer URL when following a redirect' do
     @session.visit('/referer_base')
     @session.find('//a[@href="/redirect_to_get_referer"]').click
     expect(@session).to have_content %r{http://.*/referer_base}
   end
 
-  it "should send a referer when submitting a form" do
+  it 'should send a referer when submitting a form' do
     @session.visit '/referer_base'
     @session.find('//input').click
     expect(@session).to have_content %r{http://.*/referer_base}
   end
 
-  it "can set cookie if a blank path is specified" do
-    @session.visit("")
+  it 'can set cookie if a blank path is specified' do
+    @session.visit('')
     @session.visit('/get_cookie')
     expect(@session).to have_content('root cookie')
   end
+
+  context 'with base element' do
+    it 'should use base href with relative links' do
+      @session.visit('/base/with_base')
+      @session.click_link('Title page')
+      expect(@session).to have_current_path('/with_title')
+    end
+
+    it 'should use base href with bare queries' do
+      @session.visit('/base/with_base')
+      @session.click_link('Bare query')
+      expect(@session).to have_current_path('/?a=3')
+    end
+
+    it 'should not use the base href with a new visit call' do
+      @session.visit('/base/with_other_base')
+      @session.visit('with_html')
+      expect(@session).to have_current_path('/with_html')
+    end
+  end
 end

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

@@ -1,38 +1,41 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#become_closed', requires: %i[windows js] do
-  before do
-    @window = @session.current_window
-    @session.visit('/with_windows')
-    @other_window = @session.window_opened_by do
+  let!(:window) { @session.current_window }
+  let(:other_window) do
+    @session.window_opened_by do
       @session.find(:css, '#openWindow').click
     end
   end
 
+  before do
+    @session.visit('/with_windows')
+  end
+
   after do
     @session.document.synchronize(5, errors: [Capybara::CapybaraError]) do
       raise Capybara::CapybaraError if @session.windows.size != 1
     end
-    @session.switch_to_window(@window)
+    @session.switch_to_window(window)
   end
 
   context 'with :wait option' do
     it 'should wait if value of :wait is more than timeout' do
-      @session.within_window @other_window do
+      @session.within_window other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 500);')
       end
       Capybara.using_wait_time 0.1 do
-        expect(@other_window).to become_closed(wait: 5)
+        expect(other_window).to become_closed(wait: 5)
       end
     end
 
     it 'should raise error if value of :wait is less than timeout' do
-      @session.within_window @other_window do
+      @session.within_window other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 1000);')
       end
       Capybara.using_wait_time 2 do
         expect do
-          expect(@other_window).to become_closed(wait: 0.2)
+          expect(other_window).to become_closed(wait: 0.2)
         end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> to become closed after 0.2 seconds\Z/)
       end
     end
@@ -40,21 +43,21 @@ Capybara::SpecHelper.spec '#become_closed', requires: %i[windows js] do
 
   context 'without :wait option' do
     it 'should wait if value of default_max_wait_time is more than timeout' do
-      @session.within_window @other_window do
+      @session.within_window other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 500);')
       end
       Capybara.using_wait_time 5 do
-        expect(@other_window).to become_closed
+        expect(other_window).to become_closed
       end
     end
 
     it 'should raise error if value of default_max_wait_time is less than timeout' do
-      @session.within_window @other_window do
+      @session.within_window other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 900);')
       end
       Capybara.using_wait_time 0.4 do
         expect do
-          expect(@other_window).to become_closed
+          expect(other_window).to become_closed
         end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> to become closed after 0.4 seconds\Z/)
       end
     end
@@ -62,23 +65,23 @@ Capybara::SpecHelper.spec '#become_closed', requires: %i[windows js] do
 
   context 'with not_to' do
     it "should not raise error if window doesn't close before default_max_wait_time" do
-      @session.within_window @other_window do
+      @session.within_window other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 1000);')
       end
       Capybara.using_wait_time 0.3 do
         expect do
-          expect(@other_window).not_to become_closed
+          expect(other_window).not_to become_closed
         end.not_to raise_error
       end
     end
 
     it 'should raise error if window closes before default_max_wait_time' do
-      @session.within_window @other_window do
+      @session.within_window other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
       end
       Capybara.using_wait_time 3.1 do
         expect do
-          expect(@other_window).not_to become_closed
+          expect(other_window).not_to become_closed
         end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> not to become closed after 3.1 seconds\Z/)
       end
     end

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

@@ -18,7 +18,7 @@ Capybara::SpecHelper.spec '#current_window', requires: [:windows] do
     expect(@session.current_window).to be_instance_of(Capybara::Window)
   end
 
-  it "should be modified by switching to another window" do
+  it 'should be modified by switching to another window' do
     window = @session.window_opened_by { @session.find(:css, '#openWindow').click }
 
     expect do