capybara 3.0.3 → 3.1.0

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

@@ -81,7 +81,7 @@ Capybara::SpecHelper.spec '#has_current_path?' do
   end
 
   it "should not raise an exception if the current_url is nil" do
-    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
+    allow_any_instance_of(Capybara::Session).to receive(:current_url).and_return(nil)
 
     # Without ignore_query option
     expect do
@@ -121,7 +121,7 @@ Capybara::SpecHelper.spec '#has_no_current_path?' do
   end
 
   it "should not raise an exception if the current_url is nil" do
-    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
+    allow_any_instance_of(Capybara::Session).to receive(:current_url).and_return(nil)
 
     # Without ignore_query option
     expect do

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

@@ -269,7 +269,7 @@ Capybara::SpecHelper.spec '#has_unchecked_field?' do
   end
 
   it "should support locator-less usage" do
-    expect(@session.has_unchecked_field?(disabled: true, id: "form_disabled_unchecked_checkbox"))
+    expect(@session.has_unchecked_field?(disabled: true, id: "form_disabled_unchecked_checkbox")).to be true
     expect(@session).to have_unchecked_field(disabled: true, id: "form_disabled_unchecked_checkbox")
   end
 end

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

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

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

@@ -100,6 +100,14 @@ Capybara::SpecHelper.spec '#has_selector?' do
       end
     end
   end
+
+  context "datalist" do
+    it "should match options" do
+      @session.visit('/form')
+      expect(@session).to have_selector(:datalist_input, with_options: %w[Jaguar Audi Mercedes])
+      expect(@session).not_to have_selector(:datalist_input, with_options: %w[Ford Chevy])
+    end
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_selector?' do

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

@@ -98,7 +98,7 @@ Capybara::SpecHelper.spec "node" do
       expect { @session.first('//input[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
     end
 
-    it "should raise if the text field is readonly" do
+    it "should raise if the textarea is readonly" do
       expect { @session.first('//textarea[@readonly]').set('changed') }.to raise_error(Capybara::ReadOnlyElementError)
     end
 
@@ -251,7 +251,7 @@ Capybara::SpecHelper.spec "node" do
   describe "#path" do
     # Testing for specific XPaths here doesn't make sense since there
     # are many that can refer to the same element
-    before :each do
+    before do
       @session.visit('/path')
     end
 
@@ -372,7 +372,7 @@ Capybara::SpecHelper.spec "node" do
     it "should double click an element" do
       @session.visit('/with_js')
       @session.find(:css, '#click-test').double_click
-      expect(@session.find(:css, '#has-been-double-clicked')).to be
+      expect(@session.find(:css, '#has-been-double-clicked')).to be_truthy
     end
 
     it "should allow modifiers", requires: [:js] do
@@ -397,7 +397,7 @@ Capybara::SpecHelper.spec "node" do
     it "should right click an element" do
       @session.visit('/with_js')
       @session.find(:css, '#click-test').right_click
-      expect(@session.find(:css, '#has-been-right-clicked')).to be
+      expect(@session.find(:css, '#has-been-right-clicked')).to be_truthy
     end
 
     it "should allow modifiers", requires: [:js] do

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

@@ -18,8 +18,8 @@ Capybara::SpecHelper.spec '#reset_session!' do
     expect(@session.current_path).to eq('/foo')
 
     @session.reset_session!
-    expect([nil, '', 'about:blank']).to include(@session.current_url)
-    expect(['', nil]).to include(@session.current_path)
+    expect(@session.current_url).to satisfy('be a blank url') { |url| [nil, '', 'about:blank'].include? url }
+    expect(@session.current_path).to satisfy('be a blank path') { |path| ['', nil].include? path }
     expect(@session.current_host).to be_nil
   end
 

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

@@ -34,9 +34,10 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
   context 'when launchy cannot be required' do
     it 'prints out a correct warning message', requires: [:screenshot] do
       file_path = File.join(Dir.tmpdir, 'test.png')
+      allow(@session).to receive(:warn)
       allow(@session).to receive(:require).with('launchy').and_raise(LoadError)
-      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}.\nPlease install the launchy gem to open the file automatically.")
     end
   end
 end

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

@@ -84,9 +84,35 @@ Capybara::SpecHelper.spec "#select" do
     expect(@session.find_field('Title').value).to eq('Miss')
   end
 
+  context "input with datalist" do
+    it "should select an option" do
+      @session.select("Audi", from: 'manufacturer')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['manufacturer']).to eq('Audi')
+    end
+
+    it "should not find an input without a datalist" do
+      expect do
+        @session.select("Thomas", from: 'form_first_name')
+      end.to raise_error(/Unable to find visible input box with datalist completion "form_first_name" that is not disabled/)
+    end
+
+    it "should not select an option that doesn't exist" do
+      expect do
+        @session.select("Tata", from: 'manufacturer')
+      end.to raise_error(/Unable to find datalist option "Tata"/)
+    end
+
+    it "should not select a disabled option" do
+      expect do
+        @session.select("Mercedes", from: 'manufacturer')
+      end.to raise_error(/Unable to find datalist option "Mercedes"/)
+    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"
+      msg = /Unable to find visible select box "does not exist" that is not disabled/
       expect do
         @session.select('foo', from: 'does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Capybara::SpecHelper.spec Capybara::Selector do
   before do
     @session.visit('/form')

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

@@ -56,21 +56,21 @@ Capybara::SpecHelper.spec "#uncheck" do
       end
 
       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
+        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
-        expect(@session.find(:checkbox, 'form_cars_koenigsegg', checked: true, visible: :hidden)).to be
+        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
-        expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+        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')

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

@@ -54,11 +54,11 @@ Capybara::SpecHelper.spec '#visit' do
       URI.parse(@session.current_url)
     end
 
-    before(:each) do
+    before do
       Capybara.always_include_port = true
     end
 
-    after(:each) do
+    after do
       Capybara.always_include_port = false
     end
 
@@ -73,52 +73,59 @@ Capybara::SpecHelper.spec '#visit' do
     end
 
     it "should add the server port to a visited url if no port specified", requires: [:server] do
-      expect(@session.driver).to receive(:visit).with("http://www.example.com:#{@session.server.port}")
+      allow(@session.driver).to receive(:visit)
       @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
-      expect(@session.driver).to receive(:visit).with("http://www.example.com:80")
+      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")
     end
 
     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"
-      expect(@session.driver).to receive(:visit).with("http://www.example.com:6666/random")
       @session.visit('/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)
-      expect(session.driver).to receive(:visit).with("http://www.google.com")
+      allow(session.driver).to receive(:visit)
       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"
-      expect(session.driver).to receive(:visit).with("http://www.google.com")
+      allow(session.driver).to receive(:visit)
       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
-    before(:each) 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"
-      expect(session.driver).to receive(:visit).with("http://www.google.com")
+      allow(session.driver).to receive(:visit)
       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"
-      expect(session.driver).to receive(:visit).with("http://www.google.com:99")
+      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")
     end
   end
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#become_closed', requires: %i[windows js] do
-  before(:each) do
+  before do
     @window = @session.current_window
     @session.visit('/with_windows')
     @other_window = @session.window_opened_by do
@@ -9,7 +9,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: %i[windows js] do
     end
   end
 
-  after(:each) do
+  after do
     @session.document.synchronize(5, errors: [Capybara::CapybaraError]) do
       raise Capybara::CapybaraError if @session.windows.size != 1
     end
@@ -68,7 +68,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: %i[windows js] do
       Capybara.using_wait_time 0.3 do
         expect do
           expect(@other_window).not_to become_closed
-        end
+        end.not_to raise_error
       end
     end
 

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#current_window', requires: [:windows] do
-  before(:each) do
+  before do
     @window = @session.current_window
     @session.visit('/with_windows')
   end
-  after(:each) do
+  after do
     (@session.windows - [@window]).each do |w|
       @session.switch_to_window w
       w.close

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#open_new_window', requires: [:windows] do
-  before(:each) do
+  before do
     @window = @session.current_window
     @session.visit('/with_windows')
   end
-  after(:each) do
+  after do
     (@session.windows - [@window]).each do |w|
       @session.switch_to_window w
       w.close
@@ -16,7 +16,7 @@ Capybara::SpecHelper.spec '#open_new_window', requires: [:windows] do
   it 'should open new window with blank url and title' do
     window = @session.open_new_window
     @session.switch_to_window(window)
-    expect(['', 'about:blank']).to include(@session.title)
+    expect(@session.title).to satisfy('be a blank title') { |title| ['', 'about:blank'].include? title }
     expect(@session.current_url).to eq('about:blank')
   end
 

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
-  before(:each) do
+  before do
     @window = @session.current_window
     @session.visit('/with_windows')
-    expect(@session).to have_css('body.loaded')
+    @session.assert_selector(:css, 'body.loaded')
   end
 
-  after(:each) do
+  after do
     (@session.windows - [@window]).each do |w|
       @session.switch_to_window w
       w.close
@@ -32,7 +32,7 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
       window = @session.open_new_window
       expect(@session.title).to eq('With Windows')
       @session.switch_to_window(window)
-      expect(['', 'about:blank']).to include(@session.title)
+      expect(@session.title).to satisfy('be a blank title') { |title| ['', 'about:blank'].include? title }
     end
 
     it "should raise error when closed window is passed" do
@@ -48,7 +48,7 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
   end
 
   context "with block" do
-    before(:each) do
+    before do
       @session.find(:css, '#openTwoWindows').click
       sleep(1) # wait for the windows to open
     end

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
-  before(:each) do
+  before do
     @window = @session.current_window
     @session.visit('/with_windows')
-    expect(@session).to have_css('body.loaded')
+    @session.assert_selector(:css, 'body.loaded')
   end
-  after(:each) do
+  after do
     (@session.windows - [@window]).each do |w|
       @session.switch_to_window w
       w.close

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
-  before(:each) do
+  before do
     @window = @session.current_window
     @session.visit('/with_windows')
   end
-  after(:each) do
+  after do
     (@session.windows - [@window]).each do |w|
       @session.switch_to_window w
       w.close
@@ -14,7 +14,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#exists?' do
-    before(:each) do
+    before do
       @other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
@@ -41,7 +41,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#current?' do
-    before(:each) do
+    before do
       @other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
@@ -61,7 +61,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#close' do
-    before(:each) do
+    before do
       @other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
@@ -109,8 +109,16 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#resize_to' do
+    before do
+      @initial_size = @session.current_window.size
+    end
+    after do
+      @session.current_window.resize_to(*@initial_size)
+      sleep 0.5
+    end
+
     it 'should be able to resize window', requires: %i[windows js] do
-      width, height = @session.current_window.size
+      width, height = @initial_size
       @session.current_window.resize_to(width - 100, height - 100)
       sleep 1
       expect(@session.current_window.size).to eq([width - 100, height - 100])
@@ -132,6 +140,14 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#maximize' do
+    before do
+      @initial_size = @session.current_window.size
+    end
+    after do
+      @session.current_window.resize_to(*@initial_size)
+      sleep 0.5
+    end
+
     it 'should be able to maximize window', requires: %i[windows js] do
       start_width, start_height = 400, 300
       @session.current_window.resize_to(start_width, start_height)
@@ -148,18 +164,17 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
     end
 
     it 'should stay on current window if invoked not for current window', requires: %i[windows js] do
-      cur_window_size = @session.current_window.size
       @other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
-
       @other_window.resize_to(400, 300)
       sleep 0.5
       @other_window.maximize
       sleep 0.5 # The timing on maximize is finicky on Travis -- wait a bit for maximize to occur
 
       expect(@session.current_window).to eq(@window)
-      expect(@session.current_window.size).to eq(cur_window_size)
+      # Maximizing the browser affects all tabs so this may not be valid in real browsers
+      # expect(@session.current_window.size).to eq(@initial_size)
 
       ow_width, ow_height = @other_window.size
       expect(ow_width).to be > 400