capybara 2.9.2 → 2.10.0

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 Capybara::SpecHelper.spec '#response_headers' do
-  it "should return response headers", :requires => [: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)
   end

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

@@ -5,7 +5,7 @@ Capybara::SpecHelper.spec '#html' do
     expect(@session.html).to include('Hello world!')
   end
 
-  it "should return the current state of the page", :requires => [:js] do
+  it "should return the current state of the page", requires: [:js] do
     @session.visit('/with_js')
     expect(@session.html).to include('I changed it')
     expect(@session.html).not_to include('This is text')
@@ -18,7 +18,7 @@ Capybara::SpecHelper.spec '#source' do
     expect(@session.source).to include('Hello world!')
   end
 
-  it "should return the current state of the page", :requires => [:js] do
+  it "should return the current state of the page", requires: [:js] do
     @session.visit('/with_js')
     expect(@session.source).to include('I changed it')
     expect(@session.source).not_to include('This is text')
@@ -31,7 +31,7 @@ Capybara::SpecHelper.spec '#body' do
     expect(@session.body).to include('Hello world!')
   end
 
-  it "should return the current state of the page", :requires => [:js] do
+  it "should return the current state of the page", requires: [:js] do
     @session.visit('/with_js')
     expect(@session.body).to include('I changed it')
     expect(@session.body).not_to include('This is text')

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

@@ -10,7 +10,7 @@ Capybara::SpecHelper.spec "node" do
     @form = @session.find(:css, '#get-form')
     expect(@form).to have_field('Middle Name')
     expect(@form).to have_no_field('Languages')
-    @form.fill_in('Middle Name', :with => 'Monkey')
+    @form.fill_in('Middle Name', with: 'Monkey')
     @form.click_button('med')
     expect(extract_results(@session)['middle_name']).to eq('Monkey')
   end
@@ -96,7 +96,7 @@ Capybara::SpecHelper.spec "node" do
       expect(@session.first('//input').value).to eq('gorilla')
     end
 
-    it "should fill the field even if the caret was not at the end", :requires => [:js] do
+    it "should fill the field even if the caret was not at the end", requires: [:js] do
       @session.execute_script("var el = document.getElementById('test_field'); el.focus(); el.setSelectionRange(0, 0);")
       @session.first('//input').set('')
       expect(@session.first('//input').value).to eq('')
@@ -122,19 +122,19 @@ Capybara::SpecHelper.spec "node" do
       expect(@session.first('//textarea[@readonly]').set('changed')).to raise_error(Capybara::ReadOnlyElementError)
     end if Capybara::VERSION.to_f > 3.0
 
-    it 'should allow me to change the contents of a contenteditable element', :requires => [:js] do
+    it 'should allow me to change the contents of a contenteditable element', requires: [:js] do
       @session.visit('/with_js')
       @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 of a contenteditable element', :requires => [:js] do
+    it 'should allow me to set the contents of a contenteditable element', requires: [:js] do
       @session.visit('/with_js')
       @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 contenteditable elements child', :requires => [:js] do
+    it 'should allow me to change the contents of a contenteditable elements child', requires: [:js] do
       pending "Selenium doesn't like editing nested contents"
       @session.visit('/with_js')
       @session.find(:css,'#existing_content_editable_child').set('WYSIWYG')
@@ -253,7 +253,7 @@ Capybara::SpecHelper.spec "node" do
     end
   end
 
-  describe "#trigger", :requires => [:js, :trigger] do
+  describe "#trigger", requires: [:js, :trigger] do
     it "should allow triggering of custom JS events" do
       @session.visit('/with_js')
       @session.find(:css, '#with_focus_event').trigger(:focus)
@@ -261,7 +261,7 @@ Capybara::SpecHelper.spec "node" do
     end
   end
 
-  describe '#drag_to', :requires => [:js, :drag] do
+  describe '#drag_to', requires: [:js, :drag] do
     it "should drag and drop an object" do
       @session.visit('/with_js')
       element = @session.find('//div[@id="drag"]')
@@ -271,12 +271,12 @@ Capybara::SpecHelper.spec "node" do
     end
   end
 
-  describe '#hover', :requires => [:hover] do
+  describe '#hover', requires: [:hover] do
     it "should allow hovering on an element" do
       @session.visit('/with_hover')
-      expect(@session.find(:css,'.hidden_until_hover', :visible => false)).not_to be_visible
+      expect(@session.find(:css,'.hidden_until_hover', visible: false)).not_to be_visible
       @session.find(:css,'.wrapper').hover
-      expect(@session.find(:css, '.hidden_until_hover', :visible => false)).to be_visible
+      expect(@session.find(:css, '.hidden_until_hover', visible: false)).to be_visible
     end
   end
 
@@ -287,7 +287,7 @@ Capybara::SpecHelper.spec "node" do
     end
   end
 
-  describe '#double_click', :requires => [:js] do
+  describe '#double_click', requires: [:js] do
     it "should double click an element" do
       @session.visit('/with_js')
       @session.find(:css, '#click-test').double_click
@@ -295,7 +295,7 @@ Capybara::SpecHelper.spec "node" do
     end
   end
 
-  describe '#right_click', :requires => [:js] do
+  describe '#right_click', requires: [:js] do
     it "should right click an element" do
       @session.visit('/with_js')
       @session.find(:css, '#click-test').right_click
@@ -329,7 +329,7 @@ Capybara::SpecHelper.spec "node" do
     end
   end
 
-  describe '#reload', :requires => [:js] do
+  describe '#reload', requires: [:js] do
     context "without automatic reload" do
       before { Capybara.automatic_reload = false }
       it "should reload the current context of the node" do
@@ -409,7 +409,7 @@ Capybara::SpecHelper.spec "node" do
 
       it "should reload nodes with options" do
         @session.visit('/with_js')
-        node = @session.find(:css, 'em', :text => "reloaded")
+        node = @session.find(:css, 'em', text: "reloaded")
         @session.click_link('Reload!')
         sleep(1)
         expect(node.text).to eq('has been reloaded')
@@ -418,7 +418,7 @@ 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
+    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
       quietly { @session.visit("/error") }
       expect do

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

@@ -53,7 +53,7 @@ Capybara::SpecHelper.spec '#reset_session!' do
     expect(@session).to have_no_selector :xpath, "/html/body/*", wait: false
   end
 
-  it "raises any standard errors caught inside the server", :requires => [:server] do
+  it "raises any standard errors caught inside the server", requires: [:server] do
     quietly { @session.visit("/error") }
     expect do
       @session.reset_session!
@@ -68,7 +68,7 @@ Capybara::SpecHelper.spec '#reset_session!' do
       Capybara.reuse_server = false
     end
 
-    it "raises any standard errors caught inside the server during a second session", :requires => [:server] do
+    it "raises any standard errors caught inside the server during a second session", requires: [:server] do
       Capybara.using_driver(@session.mode) do
         Capybara.using_session(:another_session) do
           @another_session = Capybara.current_session
@@ -87,7 +87,7 @@ Capybara::SpecHelper.spec '#reset_session!' do
     end
   end
 
-  it "raises configured errors caught inside the server", :requires => [:server] do
+  it "raises configured errors caught inside the server", requires: [:server] do
     prev_errors = Capybara.server_errors
 
     Capybara.server_errors = [LoadError]
@@ -104,7 +104,7 @@ Capybara::SpecHelper.spec '#reset_session!' do
     Capybara.server_errors = prev_errors
   end
 
-  it "ignores server errors when `Capybara.raise_server_errors = false`", :requires => [:server] do
+  it "ignores server errors when `Capybara.raise_server_errors = false`", requires: [:server] do
     Capybara.raise_server_errors = false
     quietly { @session.visit("/error") }
     @session.reset_session!

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 Capybara::SpecHelper.spec '#status_code' do
-  it "should return response codes", :requires => [:status_code] do
+  it "should return response codes", requires: [:status_code] do
     @session.visit('/with_simple_html')
     expect(@session.status_code).to eq(200)
   end

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

@@ -6,7 +6,7 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
     @session.visit '/'
   end
 
-  it 'opens file from the default directory', :requires => [:screenshot] do
+  it 'opens file from the default directory', requires: [:screenshot] do
     expected_file_regex = %r{capybara-\d+\.png}
     allow(@session.driver).to receive(:save_screenshot)
     allow(Launchy).to receive(:open)
@@ -18,7 +18,7 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
     expect(Launchy).to have_received(:open).with(expected_file_regex)
   end
 
-  it 'opens file from the provided directory', :requires => [:screenshot] do
+  it 'opens file from the provided directory', requires: [:screenshot] do
     custom_path = 'screenshots/1.png'
     allow(@session.driver).to receive(:save_screenshot)
     allow(Launchy).to receive(:open)
@@ -31,7 +31,7 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
   end
 
   context 'when launchy cannot be required' do
-    it 'prints out a correct warning message', :requires => [: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)

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

@@ -8,7 +8,7 @@ Capybara::SpecHelper.spec "#save_screenshot" do
     @session.visit '/'
   end
 
-  it "should generate PNG file", :requires => [:screenshot] do
+  it "should generate PNG file", requires: [:screenshot] do
     path = @session.save_screenshot image_path
 
     magic = File.read(image_path, 4)

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

@@ -9,30 +9,30 @@ Capybara::SpecHelper.spec "#select" do
   end
 
   it "should return value of the selected option" do
-    @session.select("Miss", :from => 'Title')
+    @session.select("Miss", from: 'Title')
     expect(@session.find_field('Title').value).to eq('Miss')
   end
 
   it "should allow selecting options where there are inexact matches" do
-    @session.select("Mr", :from => 'Title')
+    @session.select("Mr", from: 'Title')
     expect(@session.find_field('Title').value).to eq('Mr')
   end
 
   it "should allow selecting options where they are the only inexact match" do
-    @session.select("Mis", :from => 'Title')
+    @session.select("Mis", from: 'Title')
     expect(@session.find_field('Title').value).to eq('Miss')
   end
 
   it "should not allow selecting options where they are the only inexact match if `Capybara.exact_options = true`" do
     Capybara.exact_options = true
     expect do
-      @session.select("Mis", :from => 'Title')
+      @session.select("Mis", from: 'Title')
     end.to raise_error(Capybara::ElementNotFound)
   end
 
   it "should not allow selecting an option if the match is ambiguous" do
     expect do
-      @session.select("M", :from => 'Title')
+      @session.select("M", from: 'Title')
     end.to raise_error(Capybara::Ambiguous)
   end
 
@@ -41,13 +41,13 @@ Capybara::SpecHelper.spec "#select" do
   end
 
   it "should select an option from a select box by id" do
-    @session.select("Finish", :from => 'form_locale')
+    @session.select("Finish", from: 'form_locale')
     @session.click_button('awesome')
     expect(extract_results(@session)['locale']).to eq('fi')
   end
 
   it "should select an option from a select box by label" do
-    @session.select("Finish", :from => 'Locale')
+    @session.select("Finish", from: 'Locale')
     @session.click_button('awesome')
     expect(extract_results(@session)['locale']).to eq('fi')
   end
@@ -59,13 +59,13 @@ Capybara::SpecHelper.spec "#select" do
   end
 
   it "should escape quotes" do
-    @session.select("John's made-up language", :from => 'Locale')
+    @session.select("John's made-up language", from: 'Locale')
     @session.click_button('awesome')
     expect(extract_results(@session)['locale']).to eq('jo')
   end
 
   it "should obey from" do
-    @session.select("Miss", :from => "Other title")
+    @session.select("Miss", from: "Other title")
     @session.click_button('awesome')
     results = extract_results(@session)
     expect(results['other_title']).to eq("Miss")
@@ -73,13 +73,13 @@ Capybara::SpecHelper.spec "#select" do
   end
 
   it "show match labels with preceding or trailing whitespace" do
-    @session.select("Lojban", :from => 'Locale')
+    @session.select("Lojban", from: 'Locale')
     @session.click_button('awesome')
     expect(extract_results(@session)['locale']).to eq('jbo')
   end
 
   it "casts to string" do
-    @session.select(:"Miss", :from => :'Title')
+    @session.select(:"Miss", from: :'Title')
     expect(@session.find_field('Title').value).to eq('Miss')
   end
 
@@ -87,7 +87,7 @@ Capybara::SpecHelper.spec "#select" do
     it "should raise an error" do
       msg = "Unable to find select box \"does not exist\""
       expect do
-        @session.select('foo', :from => 'does not exist')
+        @session.select('foo', from: 'does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
@@ -96,7 +96,7 @@ Capybara::SpecHelper.spec "#select" do
     it "should raise an error" do
       msg = "Unable to find option \"Does not Exist\""
       expect do
-        @session.select('Does not Exist', :from => 'form_locale')
+        @session.select('Does not Exist', from: 'form_locale')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
@@ -104,20 +104,20 @@ Capybara::SpecHelper.spec "#select" do
   context "on a disabled select" do
     it "should raise an error" do
       expect do
-        @session.select('Should not see me', :from => 'Disabled Select')
+        @session.select('Should not see me', from: 'Disabled Select')
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
   context "on a disabled option" do
     it "should not select" do
-      @session.select('Other', :from => 'form_title')
+      @session.select('Other', from: 'form_title')
       expect(@session.find_field('form_title').value).not_to eq 'Other'
     end
 
     it "should warn" do
       expect_any_instance_of(Capybara::Node::Element).to receive(:warn).once
-      @session.select('Other', :from => 'form_title')
+      @session.select('Other', from: 'form_title')
     end
   end
 
@@ -127,28 +127,28 @@ Capybara::SpecHelper.spec "#select" do
     end
 
     it "should return value of the selected options" do
-      @session.select("Ruby",       :from => 'Language')
-      @session.select("Javascript", :from => 'Language')
+      @session.select("Ruby",       from: 'Language')
+      @session.select("Javascript", from: 'Language')
       expect(@session.find_field('Language').value).to include('Ruby', 'Javascript')
     end
 
     it "should select one option" do
-      @session.select("Ruby", :from => 'Language')
+      @session.select("Ruby", from: 'Language')
       @session.click_button('awesome')
       expect(extract_results(@session)['languages']).to eq(['Ruby'])
     end
 
     it "should select multiple options" do
-      @session.select("Ruby",       :from => 'Language')
-      @session.select("Javascript", :from => 'Language')
+      @session.select("Ruby",       from: 'Language')
+      @session.select("Javascript", from: 'Language')
       @session.click_button('awesome')
       expect(extract_results(@session)['languages']).to include('Ruby', 'Javascript')
     end
 
     it "should remain selected if already selected" do
-      @session.select("Ruby",       :from => 'Language')
-      @session.select("Javascript", :from => 'Language')
-      @session.select("Ruby",       :from => 'Language')
+      @session.select("Ruby",       from: 'Language')
+      @session.select("Javascript", from: 'Language')
+      @session.select("Ruby",       from: 'Language')
       @session.click_button('awesome')
       expect(extract_results(@session)['languages']).to include('Ruby', 'Javascript')
     end
@@ -161,19 +161,19 @@ Capybara::SpecHelper.spec "#select" do
   context "with :exact option" do
     context "when `false`" do
       it "can match select box approximately" do
-        @session.select("Finish", :from => "Loc", :exact => false)
+        @session.select("Finish", from: "Loc", exact:  false)
         @session.click_button("awesome")
         expect(extract_results(@session)["locale"]).to eq("fi")
       end
 
       it "can match option approximately" do
-        @session.select("Fin", :from => "Locale", :exact => false)
+        @session.select("Fin", from: "Locale", exact:  false)
         @session.click_button("awesome")
         expect(extract_results(@session)["locale"]).to eq("fi")
       end
 
       it "can match option approximately when :from not given" do
-        @session.select("made-up language", :exact => false)
+        @session.select("made-up language", exact:  false)
         @session.click_button("awesome")
         expect(extract_results(@session)["locale"]).to eq("jo")
       end
@@ -182,19 +182,19 @@ Capybara::SpecHelper.spec "#select" do
     context "when `true`" do
       it "can match select box approximately" do
         expect do
-          @session.select("Finish", :from => "Loc", :exact => true)
+          @session.select("Finish", from: "Loc", exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 
       it "can match option approximately" do
         expect do
-          @session.select("Fin", :from => "Locale", :exact => true)
+          @session.select("Fin", from: "Locale", exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 
       it "can match option approximately when :from not given" do
         expect do
-          @session.select("made-up language", :exact => true)
+          @session.select("made-up language", exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
     end

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

@@ -27,14 +27,14 @@ Capybara::SpecHelper.spec "#uncheck" do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.uncheck('Ham', :exact => false)
+      @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
       expect do
-        @session.uncheck('Ham', :exact => true)
+        @session.uncheck('Ham', exact:  true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end