capybara 2.18.0 → 3.0.0.rc1

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

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

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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#assert_text' do
   it "should be true if the given text is on the page" do
     @session.visit('/with_html')
     expect(@session.assert_text('est')).to eq(true)
     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(: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)
   end
@@ -133,35 +134,35 @@ Capybara::SpecHelper.spec '#assert_text' do
     end
 
     it 'ignores other filters when :count is specified' do
-      o = {count: 5,
-           minimum: 6,
-           maximum: 0,
-           between: 0..4}
+      o = { count: 5,
+            minimum: 6,
+            maximum: 0,
+            between: 0..4 }
       expect { @session.assert_text('Header', o) }.not_to raise_error
     end
     context 'with no :count expectation' do
       it 'fails if :minimum is not met' do
-        o = {minimum: 6,
-             maximum: 5,
-             between: 2..7}
+        o = { minimum: 6,
+              maximum: 5,
+              between: 2..7 }
         expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
       end
       it 'fails if :maximum is not met' do
-        o = {minimum: 0,
-             maximum: 0,
-             between: 2..7}
+        o = { minimum: 0,
+              maximum: 0,
+              between: 2..7 }
         expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
       end
       it 'fails if :between is not met' do
-        o = {minimum: 0,
-             maximum: 5,
-             between: 0..4}
+        o = { minimum: 0,
+              maximum: 5,
+              between: 0..4 }
         expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
       end
       it 'succeeds if all combineable expectations are met' do
-        o = {minimum: 0,
-             maximum: 5,
-             between: 2..7}
+        o = { minimum: 0,
+              maximum: 5,
+              between: 2..7 }
         expect { @session.assert_text('Header', o) }.not_to raise_error
       end
     end

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

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec "#attach_file" do
   before do
     @test_file_path = File.expand_path('../fixtures/test_file.txt', File.dirname(__FILE__))
@@ -22,7 +23,7 @@ Capybara::SpecHelper.spec "#attach_file" do
     end
 
     it "casts to string" do
-      @session.attach_file :"form_image", __FILE__
+      @session.attach_file :form_image, __FILE__
       @session.click_button('awesome')
       expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
@@ -68,14 +69,14 @@ Capybara::SpecHelper.spec "#attach_file" do
       @session.attach_file "Multiple Documents", @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
+      expect(@session.body).to include("1 | ") # number of files
     end
 
-    it  "should not break when using HTML5 multiple file input uploading multiple files" 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.click_button('Upload Multiple')
-      expect(@session.body).to include("2 | ")#number of files
+      expect(@session.body).to include("2 | ") # number of files
       expect(@session.body).to include(File.read(@test_file_path))
       expect(@session.body).to include(File.read(@another_test_file_path))
     end
@@ -108,34 +109,34 @@ Capybara::SpecHelper.spec "#attach_file" do
       expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
 
-    it "not allow partial matches when true" do
+    it "should not allow partial matches when true" do
       expect do
-        @session.attach_file "Imag", __FILE__, exact:  true
+        @session.attach_file "Imag", __FILE__, exact: true
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
-  context "with :make_visible option", requires: [:js, :es_args] 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 {
+      expect do
         @session.attach_file("hidden_file", __FILE__, make_visible: true)
-      }.not_to raise_error
+      end.not_to raise_error
     end
 
     it "accepts a hash of styles to be applied" do
       @session.visit('/with_js')
-      expect {
+      expect do
         @session.attach_file("hidden_file", __FILE__, make_visible: { opacity: 1, display: 'block' })
-      }.not_to raise_error
+      end.not_to raise_error
     end
 
     it "raises an error when the file input is not made visible" do
       @session.visit('/with_js')
-      expect {
+      expect do
         @session.attach_file("hidden_file", __FILE__, make_visible: { color: 'red' })
-      }.to raise_error(Capybara::ExpectationNotMet)
+      end.to raise_error(Capybara::ExpectationNotMet)
     end
 
     it "resets the style when done" do

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

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec "#check" do
   before do
     @session.visit('/form')
@@ -18,7 +19,7 @@ Capybara::SpecHelper.spec "#check" do
   it "should trigger associated events", requires: [:js] do
     @session.visit('/with_js')
     @session.check('checkbox_with_event')
-    expect(@session).to have_css('#checkbox_event_triggered');
+    expect(@session).to have_css('#checkbox_event_triggered')
   end
 
   describe "checking" do
@@ -62,7 +63,7 @@ Capybara::SpecHelper.spec "#check" do
   end
 
   it "casts to string" do
-    @session.check(:"form_pets_cat")
+    @session.check(:form_pets_cat)
     @session.click_button('awesome')
     expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
   end
@@ -86,14 +87,14 @@ Capybara::SpecHelper.spec "#check" do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.check('Ham', exact:  false)
+      @session.check('Ham', exact: false)
       @session.click_button('awesome')
       expect(extract_results(@session)['pets']).to include('hamster')
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.check('Ham', exact:  true)
+        @session.check('Ham', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
@@ -146,7 +147,7 @@ Capybara::SpecHelper.spec "#check" do
       end
 
       it "should raise error if not allowed to click label" do
-        expect{@session.check('form_cars_mclaren', allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_mclaren" that is not disabled')
+        expect { @session.check('form_cars_mclaren', allow_label_click: false) }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_mclaren" that is not disabled')
       end
     end
 
@@ -158,7 +159,7 @@ Capybara::SpecHelper.spec "#check" do
       end
 
       it "should raise error if checkbox not visible" do
-        expect{@session.check('form_cars_mclaren')}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_mclaren" that is not disabled')
+        expect { @session.check('form_cars_mclaren') }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_mclaren" that is not disabled')
       end
 
       context "with allow_label_click == true" do

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec "#choose" do
   before do
     @session.visit('/form')
@@ -18,7 +19,7 @@ Capybara::SpecHelper.spec "#choose" do
 
   it "casts to string" do
     @session.choose("Both")
-    @session.click_button(:'awesome')
+    @session.click_button(:awesome)
     expect(extract_results(@session)['gender']).to eq('both')
   end
 
@@ -41,14 +42,14 @@ Capybara::SpecHelper.spec "#choose" do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.choose("Mal", exact:  false)
+      @session.choose("Mal", exact: false)
       @session.click_button('awesome')
       expect(extract_results(@session)['gender']).to eq('male')
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.choose("Mal", exact:  true)
+        @session.choose("Mal", exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
@@ -82,7 +83,7 @@ Capybara::SpecHelper.spec "#choose" do
       end
 
       it "should raise error if not allowed to click label" do
-        expect{@session.choose("party_democrat", allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible radio button "party_democrat" that is not disabled')
+        expect { @session.choose("party_democrat", allow_label_click: false) }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible radio button "party_democrat" that is not disabled')
       end
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#click_button' do
   before do
     @session.visit('/form')
@@ -151,25 +152,18 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
-  context "with id given on a submit button" do
-    it "should submit the associated form" do
+  context "input type=submit button" do
+    it "should submit by button id" do
       @session.click_button('awe123')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
-    it "should work with partial matches" do
-      @session.click_button('Go')
-      expect(@session).to have_content('You landed')
-    end
-  end
-
-  context "with title given on a submit button" do
-    it "should submit the associated form" do
+    it "should submit by button title" do
       @session.click_button('What an Awesome Button')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
-    it "should work with partial matches" do
+    it "should submit by partial title", :exact_false do
       @session.click_button('What an Awesome')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
@@ -198,7 +192,6 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
-
   context "with submit button outside the form defined by <button> tag" do
     before do
       @session.click_button('outside_button')
@@ -250,20 +243,19 @@ Capybara::SpecHelper.spec '#click_button' do
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
-    it "should work with partial matches" do
+    it "should work with partial matches", :exact_false do
       @session.click_button('hai')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
   end
 
-
   context "with value given on an image button" do
     it "should submit the associated form" do
       @session.click_button('okay')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
-    it "should work with partial matches" do
+    it "should work with partial matches", :exact_false do
       @session.click_button('kay')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
@@ -282,7 +274,7 @@ Capybara::SpecHelper.spec '#click_button' do
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
-    it "should work with partial matches" do
+    it "should work with partial matches", :exact_false do
       @session.click_button('Okay 556')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
@@ -290,17 +282,17 @@ Capybara::SpecHelper.spec '#click_button' do
 
   context "with text given on a button defined by <button> tag" do
     it "should submit the associated form" do
-      @session.click_button('Click me')
+      @session.click_button('Click me!')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
-    it "should work with partial matches" do
+    it "should work with partial matches", :exact_false do
       @session.click_button('Click')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
   end
 
- context "with id given on a button defined by <button> tag" do
+  context "with id given on a button defined by <button> tag" do
     it "should submit the associated form" do
       @session.click_button('click_me_123')
       expect(extract_results(@session)['first_name']).to eq('John')
@@ -315,13 +307,13 @@ Capybara::SpecHelper.spec '#click_button' do
     end
   end
 
- context "with value given on a button defined by <button> tag" do
+  context "with value given on a button defined by <button> tag" do
     it "should submit the associated form" do
       @session.click_button('click_me')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
-    it "should work with partial matches" do
+    it "should work with partial matches", :exact_false do
       @session.click_button('ck_me')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
@@ -333,7 +325,7 @@ Capybara::SpecHelper.spec '#click_button' do
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
-    it "should work with partial matches" do
+    it "should work with partial matches", :exact_false do
       @session.click_button('Click Title')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
@@ -345,7 +337,7 @@ Capybara::SpecHelper.spec '#click_button' do
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
-    it "should work with partial matches" do
+    it "should work with partial matches", :exact_false do
       @session.click_button('se eating h')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
@@ -424,15 +416,15 @@ Capybara::SpecHelper.spec '#click_button' do
 
   it "should encode complex field names, like array[][value]" do
     @session.visit('/form')
-    @session.fill_in('address1_city', :with =>'Paris')
-    @session.fill_in('address1_street', :with =>'CDG')
+    @session.fill_in('address1_city', with: 'Paris')
+    @session.fill_in('address1_street', with: 'CDG')
 
     @session.fill_in('address2_city', with: 'Mikolaiv')
     @session.fill_in('address2_street', with: 'PGS')
 
     @session.click_button "awesome"
 
-    addresses=extract_results(@session)["addresses"]
+    addresses = extract_results(@session)["addresses"]
     expect(addresses.size).to eq(2)
 
     expect(addresses[0]["street"]).to eq('CDG')
@@ -446,13 +438,13 @@ Capybara::SpecHelper.spec '#click_button' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.click_button('What an Awesome', exact:  false)
+      @session.click_button('What an Awesome', exact: false)
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.click_button('What an Awesome', exact:  true)
+        @session.click_button('What an Awesome', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#click_link_or_button' do
   it "should click on a link" do
     @session.visit('/with_html')
@@ -32,31 +33,31 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
 
   it "casts to string" do
     @session.visit('/form')
-    @session.click_link_or_button(:'awe123')
+    @session.click_link_or_button(:awe123)
     expect(extract_results(@session)['first_name']).to eq('John')
   end
 
   context "with :exact option" do
-    context "when `true`" do
+    context "when `false`" do
       it "clicks on approximately matching link" do
         @session.visit('/with_html')
-        @session.click_link_or_button('abore', exact:  false)
+        @session.click_link_or_button('abore', exact: false)
         expect(@session).to have_content('Bar')
       end
 
       it "clicks on approximately matching button" do
         @session.visit('/form')
-        @session.click_link_or_button('awe')
+        @session.click_link_or_button('awe', exact: false)
         expect(extract_results(@session)['first_name']).to eq('John')
       end
     end
 
-    context "when `false`" do
+    context "when `true`" do
       it "does not click on link which matches approximately" do
         @session.visit('/with_html')
         msg = "Unable to find visible link or button \"abore\""
         expect do
-          @session.click_link_or_button('abore', exact:  true)
+          @session.click_link_or_button('abore', exact: true)
         end.to raise_error(Capybara::ElementNotFound, msg)
       end
 
@@ -65,7 +66,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
         msg = "Unable to find visible link or button \"awe\""
 
         expect do
-          @session.click_link_or_button('awe', exact:  true)
+          @session.click_link_or_button('awe', exact: true)
         end.to raise_error(Capybara::ElementNotFound, msg)
       end
     end