capybara 3.14.0 → 3.15.0

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

@@ -178,10 +178,10 @@ Capybara::SpecHelper.spec '#fill_in' do
     it 'should only trigger onchange once' do
       @session.visit('/with_js')
       # Click somewhere on the page to ensure focus is acquired. Without this FF won't generate change events for some reason???
-      @session.find(:css, 'body').click
+      @session.find(:css, 'h1', text: 'FooBar').click
       @session.fill_in('with_change_event', with: 'some value')
       # click outside the field to trigger the change event
-      @session.find(:css, 'body').click
+      @session.find(:css, 'h1', text: 'FooBar').click
       expect(@session.find(:css, '.change_event_triggered', match: :one)).to have_text 'some value'
     end
 
@@ -189,7 +189,7 @@ Capybara::SpecHelper.spec '#fill_in' do
       @session.visit('/with_js')
       @session.fill_in('with_change_event', with: '')
       # click outside the field to trigger the change event
-      @session.find(:css, 'body').click
+      @session.find(:css, 'h1', text: 'FooBar').click
       expect(@session).to have_selector(:css, '.change_event_triggered', match: :one)
     end
   end

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

@@ -468,5 +468,10 @@ Capybara::SpecHelper.spec '#find' do
       Capybara.test_id = 'data-other-test-id'
       expect(@session.find(:field, 'test_id')[:id]).to eq 'normal'
     end
+
+    it 'should find a link with the test_id' do
+      Capybara.test_id = 'data-test-id'
+      expect(@session.find(:link, 'test-foo')[:id]).to eq 'foo'
+    end
   end
 end

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

@@ -11,9 +11,115 @@ Capybara::SpecHelper.spec '#has_table?' do
     expect(@session).to have_table(:villain_table)
   end
 
+  it 'should accept rows with column header hashes' do
+    expect(@session).to have_table('Horizontal Headers', with_rows:
+      [
+        { 'First Name' => 'Vern', 'Last Name' => 'Konopelski', 'City' => 'Everette' },
+        { 'First Name' => 'Palmer', 'Last Name' => 'Sawayn', 'City' => 'West Trinidad' }
+      ])
+  end
+
+  it 'should accept rows with partial column header hashses' do
+    expect(@session).to have_table('Horizontal Headers', with_rows:
+      [
+        { 'First Name' => 'Thomas' },
+        { 'Last Name' => 'Sawayn', 'City' => 'West Trinidad' }
+      ])
+  end
+
+  it 'should accept rows with array of cell values' do
+    expect(@session).to have_table('Horizontal Headers', with_rows:
+      [
+        %w[Thomas Walpole Oceanside],
+        ['Ratke', 'Lawrence', 'East Sorayashire']
+      ])
+  end
+
+  it 'should consider order of cells in each row' do
+    expect(@session).not_to have_table('Horizontal Headers', with_rows:
+      [
+        %w[Thomas Walpole Oceanside],
+        ['Lawrence', 'Ratke', 'East Sorayashire']
+      ])
+  end
+
+  it 'should accept all rows with array of cell values' do
+    expect(@session).to have_table('Horizontal Headers', rows:
+      [
+        %w[Thomas Walpole Oceanside],
+        %w[Danilo Wilkinson Johnsonville],
+        %w[Vern Konopelski Everette],
+        ["Ratke", "Lawrence", "East Sorayashire"],
+        ["Palmer", "Sawayn", "West Trinidad"]
+      ])
+  end
+
+  it 'should match with vertical headers' do
+    expect(@session).to have_table('Vertical Headers', with_cols:
+      [
+        { 'First Name' => 'Thomas' },
+        { 'First Name' => 'Danilo', 'Last Name' => 'Wilkinson', 'City' => 'Johnsonville' },
+        { 'Last Name' => 'Sawayn', 'City' => 'West Trinidad' }
+      ])
+  end
+
+  it 'should match col with array of cell values' do
+    expect(@session).to have_table('Vertical Headers', with_cols:
+      [
+        %w[Vern Konopelski Everette]
+      ])
+  end
+
+  it 'should match cols with array of cell values' do
+    expect(@session).to have_table('Vertical Headers', with_cols:
+      [
+        %w[Danilo Wilkinson Johnsonville],
+        %w[Vern Konopelski Everette]
+      ])
+  end
+
+  it 'should match all cols with array of cell values' do
+    expect(@session).to have_table('Vertical Headers', cols:
+      [
+        %w[Thomas Walpole Oceanside],
+        %w[Danilo Wilkinson Johnsonville],
+        %w[Vern Konopelski Everette],
+        ["Ratke", "Lawrence", "East Sorayashire"],
+        ["Palmer", "Sawayn", "West Trinidad"]
+      ])
+  end
+
+  it "should not match if the order of cell values doesn't match" do
+    expect(@session).not_to have_table('Vertical Headers', with_cols:
+      [
+        %w[Vern Everette Konopelski]
+      ])
+  end
+
+  it "should not match with vertical headers if the columns don't match" do
+    expect(@session).not_to have_table('Vertical Headers', with_cols:
+      [
+        { 'First Name' => 'Thomas' },
+        { 'First Name' => 'Danilo', 'Last Name' => 'Walpole', 'City' => 'Johnsonville' },
+        { 'Last Name' => 'Sawayn', 'City' => 'West Trinidad' }
+      ])
+  end
+
   it 'should be false if the table is not on the page' do
     expect(@session).not_to have_table('Monkey')
   end
+
+  it 'should find row by header and cell values' do
+    expect(@session.find(:table, 'Horizontal Headers')).to have_selector(:table_row, 'First Name' => 'Thomas', 'Last Name' => 'Walpole')
+    expect(@session.find(:table, 'Horizontal Headers')).to have_selector(:table_row, 'Last Name' => 'Walpole')
+    expect(@session.find(:table, 'Horizontal Headers')).not_to have_selector(:table_row, 'First Name' => 'Walpole')
+  end
+
+  it 'should find row by cell values' do
+    expect(@session.find(:table, 'Horizontal Headers')).to have_selector(:table_row, %w[Thomas Walpole])
+    expect(@session.find(:table, 'Horizontal Headers')).not_to have_selector(:table_row, %w[Walpole Thomas])
+    expect(@session.find(:table, 'Horizontal Headers')).not_to have_selector(:table_row, %w[Other])
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_table?' do
@@ -29,4 +135,18 @@ Capybara::SpecHelper.spec '#has_no_table?' do
   it 'should be true if the table is not on the page' do
     expect(@session).to have_no_table('Monkey')
   end
+
+  it 'should consider rows' do
+    expect(@session).to have_no_table('Horizontal Headers', with_rows:
+     [
+       { 'First Name' => 'Thomas', 'City' => 'Los Angeles' }
+     ])
+  end
+
+  it 'should consider columns' do
+    expect(@session).to have_no_table('Vertical Headers', with_cols:
+      [
+        { 'First Name' => 'Joe' }
+      ])
+  end
 end

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

@@ -25,9 +25,9 @@ Capybara::SpecHelper.spec 'node' do
 
   describe '#query_scope' do
     it 'should have a reference to the element the query was evaluated on if there is one' do
-      @node = @session.find(:css, '#first')
-      expect(@node.query_scope).to eq(@node.session.document)
-      expect(@node.find(:css, '#foo').query_scope).to eq(@node)
+      node = @session.find(:css, '#first')
+      expect(node.query_scope).to eq(node.session.document)
+      expect(node.find(:css, '#foo').query_scope).to eq(node)
     end
   end
 

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

@@ -96,25 +96,26 @@ Capybara::SpecHelper.spec '#reset_session!' do
   end
 
   context 'When reuse_server == false' do
+    let!(:orig_reuse_server) { Capybara.reuse_server }
+
     before do
-      @reuse_server = Capybara.reuse_server
       Capybara.reuse_server = false
     end
 
     after do
-      Capybara.reuse_server = @reuse_server
+      Capybara.reuse_server = orig_reuse_server
     end
 
     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
-          quietly { @another_session.visit('/error') }
+          another_session = Capybara.current_session
+          quietly { another_session.visit('/error') }
           expect do
-            @another_session.reset_session!
+            another_session.reset_session!
           end.to raise_error(TestApp::TestAppError)
-          @another_session.visit('/')
-          expect(@another_session.current_path).to eq('/')
+          another_session.visit('/')
+          expect(another_session.current_path).to eq('/')
         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/window_spec.rb

@@ -5,89 +5,87 @@
 # using Capybara provided assertions with builtin waiting behavior.
 
 Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
+  let!(:orig_window) { @session.current_window }
   before do
-    @window = @session.current_window
     @session.visit('/with_windows')
   end
 
   after do
-    (@session.windows - [@window]).each do |w|
+    (@session.windows - [orig_window]).each do |w|
       @session.switch_to_window w
       w.close
     end
-    @session.switch_to_window(@window)
+    @session.switch_to_window(orig_window)
   end
 
   describe '#exists?' do
-    before do
-      @other_window = @session.window_opened_by do
+    it 'should become false after window was closed' do
+      other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
-    end
 
-    it 'should become false after window was closed' do
       expect do
-        @session.switch_to_window @other_window
-        @other_window.close
-      end.to change { @other_window.exists? }.from(true).to(false)
+        @session.switch_to_window other_window
+        other_window.close
+      end.to change(other_window, :exists?).from(true).to(false)
     end
   end
 
   describe '#closed?' do
     it 'should become true after window was closed' do
-      @other_window = @session.window_opened_by do
+      other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
       expect do
-        @session.switch_to_window @other_window
-        @other_window.close
-      end.to change { @other_window.closed? }.from(false).to(true)
+        @session.switch_to_window other_window
+        other_window.close
+      end.to change { other_window.closed? }.from(false).to(true)
     end
   end
 
   describe '#current?' do
-    before do
-      @other_window = @session.window_opened_by do
+    let(:other_window) do
+      @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
     end
 
     it 'should become true after switching to window' do
       expect do
-        @session.switch_to_window(@other_window)
-      end.to change { @other_window.current? }.from(false).to(true)
+        @session.switch_to_window(other_window)
+      end.to change(other_window, :current?).from(false).to(true)
     end
 
     it 'should return false if window is closed' do
-      @session.switch_to_window(@other_window)
-      @other_window.close
-      expect(@other_window.current?).to eq(false)
+      @session.switch_to_window(other_window)
+      other_window.close
+      expect(other_window.current?).to eq(false)
     end
   end
 
   describe '#close' do
-    before do
-      @other_window = @session.window_opened_by do
+    let!(:other_window) do
+      @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
     end
 
     it 'should switch to original window if invoked not for current window' do
       expect(@session.windows.size).to eq(2)
-      expect(@session.current_window).to eq(@window)
-      @other_window.close
+      expect(@session.current_window).to eq(orig_window)
+      other_window.close
       expect(@session.windows.size).to eq(1)
-      expect(@session.current_window).to eq(@window)
+      expect(@session.current_window).to eq(orig_window)
     end
 
     it 'should make subsequent invocations of other methods raise no_such_window_error if invoked for current window' do
-      @session.switch_to_window(@other_window)
-      expect(@session.current_window).to eq(@other_window)
-      @other_window.close
+      @session.switch_to_window(other_window)
+      expect(@session.current_window).to eq(other_window)
+      other_window.close
       expect do
         @session.find(:css, '#some_id')
       end.to raise_error(@session.driver.no_such_window_error)
-      @session.switch_to_window(@window)
+      @session.switch_to_window(orig_window)
     end
   end
 
@@ -101,43 +99,41 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
     end
 
     it 'should switch to original window if invoked not for current window' do
-      @other_window = @session.window_opened_by do
+      other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
       sleep 1
-      size = @session.within_window(@other_window) do
+      size = @session.within_window(other_window) do
         win_size
       end
-      expect(@other_window.size).to eq(size)
-      expect(@session.current_window).to eq(@window)
+      expect(other_window.size).to eq(size)
+      expect(@session.current_window).to eq(orig_window)
     end
   end
 
   describe '#resize_to' do
-    before do
-      @initial_size = @session.current_window.size
-    end
+    let!(:initial_size) { @session.current_window.size }
 
     after do
-      @session.current_window.resize_to(*@initial_size)
+      @session.current_window.resize_to(*initial_size)
       sleep 1
     end
 
     it 'should be able to resize window', requires: %i[windows js] do
-      width, height = @initial_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])
     end
 
     it 'should stay on current window if invoked not for current window', requires: %i[windows js] do
-      @other_window = @session.window_opened_by do
+      other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
-      @other_window.resize_to(600, 300)
-      expect(@session.current_window).to eq(@window)
+      other_window.resize_to(600, 300)
+      expect(@session.current_window).to eq(orig_window)
 
-      @session.within_window(@other_window) do
+      @session.within_window(other_window) do
         expect(@session.current_window.size).to eq([600, 300])
       end
     end
@@ -169,19 +165,19 @@ 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
-      @other_window = @session.window_opened_by do
+      other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
-      @other_window.resize_to(400, 300)
+      other_window.resize_to(400, 300)
       sleep 0.5
-      @other_window.maximize
+      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).to eq(orig_window)
       # 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
+      ow_width, ow_height = other_window.size
       expect(ow_width).to be > 400
       expect(ow_height).to be > 300
     end