Clean up exception raising

Update protractor.get test

lib/angular_webdriver/protractor/protractor.rb

@@ -67,7 +67,7 @@ def base_url= url
     return @base_url = nil unless url
 
     uri = URI.parse(url) rescue false
-    raise "Invalid URL #{url.inspect}. Must contain scheme and host." unless uri && uri.scheme && uri.host
+    fail ArgumentError, "Invalid URL #{url.inspect}. Must contain scheme and host." unless uri && uri.scheme && uri.host
     @base_url = url
   end
 
@@ -111,10 +111,10 @@ def get destination, opt_timeout=driver.max_page_wait_seconds
 
     timeout = opt_timeout
 
-    raise "Invalid timeout #{timeout}" unless timeout.is_a?(Numeric)
+    fail ArgumentError, "Invalid timeout #{timeout}" unless timeout.is_a?(Numeric)
 
     unless destination.is_a?(String) || destination.is_a?(URI)
-      raise "Invalid destination #{destination}"
+      fail ArgumentError, "Invalid destination #{destination}"
     end
 
     # http://about:blank doesn't work. it must be exactly about:blank
@@ -157,7 +157,7 @@ def get destination, opt_timeout=driver.max_page_wait_seconds
       url                  = executeScript_('return window.location.href;', msg.call('get url'))
       not_on_reset_url     = url != reset_url
       destination_is_reset = destination == reset_url
-      raise 'still on reset url' unless not_on_reset_url || destination_is_reset
+      fail 'still on reset url' unless not_on_reset_url || destination_is_reset
     end
 
     # now that the url has changed, make sure Angular has loaded
@@ -240,7 +240,7 @@ def initialize opts={}
     @watir = opts[:watir]
 
     valid_watir = defined?(Watir::Browser) && @watir.is_a?(Watir::Browser)
-    raise "Driver must be a Watir::Browser not #{@driver.class}" unless valid_watir
+    fail ArgumentError, "Driver must be a Watir::Browser not #{@driver.class}" unless valid_watir
     @driver = @watir.driver
 
     unless Selenium::WebDriver::SearchContext::FINDERS.keys.include?(NEW_FINDERS_KEYS)

spec/helpers/expect.rb

@@ -25,15 +25,19 @@ def expect_no_element_error &block
   # Compare to expect_no_element_error which sets wait to 0 before
   # invoking the block.
   def expect_no_element_error_with_wait &block
-    expect { block.call }.to raise_error no_such_element_error
+    expect_error no_such_element_error, &block
   end
 
   def expect_no_method_error &block
-    expect { block.call }.to raise_error NoMethodError
+    expect_error NoMethodError, &block
   end
 
   def expect_javascript_error &block
-    expect { block.call }.to raise_error Selenium::WebDriver::Error::JavascriptError
+    expect_error Selenium::WebDriver::Error::JavascriptError, &block
+  end
+
+  def expect_argument_error &block
+    expect_error ArgumentError, &block
   end
 
   # Expects block to raise error

spec/protractor_spec.rb

@@ -41,8 +41,8 @@
     protractor.ignore_sync = true
     expect_no_error { driver.get protractor.reset_url }
 
-    # should raise error on invalid destination
-    expect_error { driver.get({ invalid: 'object '}) }
+    # protractor.get should raise error on invalid destination
+    expect_argument_error { protractor.get({ invalid: 'object '}) }
   end
 
   it 'driver_get' do