spec: ensure the driver is quit properly

meh · meh · commit 7985d44edfe0 · 2014-01-25T09:38:40.000+01:00
diff --git a/spec/runner.rb b/spec/runner.rb
@@ -39,10 +39,6 @@
   browser = Selenium::WebDriver.for(:remote, url: url, desired_capabilities: cap)
   browser.navigate.to('http://localhost:9292')
 
-  at_exit {
-    browser.quit
-  }
-
   begin
     Selenium::WebDriver::Wait.new(timeout: 540, interval: 5) \
       .until { not browser.find_element(:css, 'p#totals').text.strip.empty? }
@@ -85,16 +81,12 @@
       }
     }
   rescue Selenium::WebDriver::Error::NoSuchElementError
-    puts 'ya blew it'
     puts browser.page_source
-  end
-rescue Selenium::WebDriver::Error::TimeOutError
-  trials += 1
-
-  unless trials >= 4
+  ensure
     browser.quit
-    retry
   end
+rescue Selenium::WebDriver::Error::TimeOutError
+  retry unless (trials += 1) >= 4
 end
 
 exit 1
