Optimised some of the calls to some ruby integration tests

Note the plan was to migrate more of these over, but after reading some comments I opted against it. This change should only remove the need for the duplicate window creation on a few tests, where it was un-necessary Signed-off-by: Alex Rodionov <p0deje@gmail.com>

Author: luke-hill

rb/spec/integration/selenium/webdriver/spec_support/test_environment.rb

@@ -56,15 +56,15 @@ def driver_instance
  def reset_driver!(time = 0)
  quit_driver
  sleep time
- @driver_instance = create_driver!
+ driver_instance
  end
 
  def ensure_single_window
- @driver_instance.window_handles[1..-1].each do |handle|
- @driver_instance.switch_to.window(handle)
- @driver_instance.close
+ driver_instance.window_handles[1..-1].each do |handle|
+ driver_instance.switch_to.window(handle)
+ driver_instance.close
  end
- @driver_instance.switch_to.window @driver_instance.window_handles.first
+ driver_instance.switch_to.window(driver_instance.window_handles.first)
  end
 
  def quit_driver

rb/spec/integration/selenium/webdriver/target_locator_spec.rb

@@ -63,8 +63,7 @@ module WebDriver
  end
 
  context 'window switching' do
-
- after { reset_driver! }
+ after { quit_driver }
 
  it 'should switch to a window and back when given a block' do
  driver.navigate.to url_for('xhtmlTest.html')

rb/spec/integration/selenium/webdriver/window_spec.rb

@@ -22,7 +22,7 @@ module WebDriver
  describe Window do
  after do
  sleep 1 if ENV['TRAVIS']
- reset_driver!
+ quit_driver
  end
 
  let(:window) { driver.manage.window }
@@ -50,7 +50,7 @@ module WebDriver
  end
 
  it 'gets the position of the current window' do
- pos = driver.manage.window.position
+ pos = window.position
 
  expect(pos).to be_a(Point)
 
@@ -74,7 +74,7 @@ module WebDriver
  end
 
  it 'gets the rect of the current window', only: {browser: %i[firefox ie]} do
- rect = driver.manage.window.rect
+ rect = window.rect
 
  expect(rect).to be_a(Rectangle)
 
@@ -121,8 +121,10 @@ module WebDriver
  old_size = window.size
 
  window.full_screen
-
+ wait.until { window.size != old_size }
  new_size = window.size
+
+ expect(new_size.width).to be > old_size.width
  expect(new_size.height).to be > old_size.height
  end