context.rb in bauxite-0.6.11

- old
+ new

@@ -358,9 +358,11 @@
 			else
 				ret = exec_action_object(action)
 			end
 
 			ret.call if ret.respond_to? :call # delayed actions (after log_cmd)
+		rescue Selenium::WebDriver::Error::UnhandledAlertError
+			raise Bauxite::Errors::AssertionError, "Unexpected modal present"
 		end
 
 		# Executes the given block retrying for at most <tt>${__TIMEOUT__}</tt>
 		# seconds. Note that this method does not take into account the time it
 		# takes to execute the block itself.
\ No newline at end of file