Fix resource and deprecated warnings #8

Author: Zoia

JDI/web/selenium/elements/api_interact/get_element_module.py

@@ -86,11 +86,11 @@ def get_search_context(self, element):
  if frame is not None:
  self.switch_to_last_opened_window()
  res = search_context.find_element(element.avatar.frame_locator[0], element.avatar.frame_locator[1])
- driver.switch_to_frame(res)
+ driver.switch_to.frame(res)
  return search_context.find_element(locator[0], locator[1]) if locator is not None else search_context
 
  def switch_to_last_opened_window(self):
- self.get_driver().switch_to_window(self.get_driver().window_handles[-1])
+ self.get_driver().switch_to.window(self.get_driver().window_handles[-1])
 
  def set_web_element(self, web_element):
  self.web_element = web_element

JDI/web/selenium/settings/WebSettings.py

@@ -1,6 +1,7 @@
 from JDI.core.settings.jdi_settings import JDISettings
 from JDI.web.selenium.driver.selenium_driver_factory import SeleniumDriverFactory
 from JDI.core.logger.jdi_logger import JDILogger
+from selenium.webdriver.remote.command import Command
 
 
 class WebSettings(JDISettings):
@@ -25,7 +26,12 @@ def use_driver(options=[], capabilities={}, executor=None):
 
  @staticmethod
  def quit_browser():
- WebSettings.get_driver_factory().get_driver().quit()
+ driver = WebSettings.get_driver_factory().get_driver()
+ driver.quit()
+ try:
+ driver.execute(Command.CLOSE)
+ except Exception:
+ pass
 
  @staticmethod
  def get_driver():

JDI/web/selenium/settings/web_settings.py

@@ -1,6 +1,7 @@
 from JDI.core.settings.jdi_settings import JDISettings
 from JDI.web.selenium.driver.selenium_driver_factory import SeleniumDriverFactory
 from JDI.core.logger.jdi_logger import JDILogger
+from selenium.webdriver.remote.command import Command
 
 
 class WebSettings(JDISettings):
@@ -25,7 +26,12 @@ def use_driver(options=[], capabilities={}, executor=None):
 
  @staticmethod
  def quit_browser():
- WebSettings.get_driver_factory().get_driver().quit()
+ driver = WebSettings.get_driver_factory().get_driver()
+ driver.quit()
+ try:
+ driver.execute(Command.CLOSE)
+ except Exception:
+ pass
 
  @staticmethod
  def get_driver():

Test/jdi_uitests_webtests/main/utils/common_action_data.py

@@ -38,6 +38,7 @@ def create_file():
  temp.write(b'mystring')
  CommonActionsData._path = temp.name
  CommonActionsData._name = temp.name.split("\\")[-1]
+ temp.close()
 
  @staticmethod
  def check_action(text, line_number=0):