Fix screenshot path issue when set screenshot directory (#74)

Author: atthaboon

PuppeteerLibrary/keywords/screenshot.py

@@ -9,16 +9,17 @@ class ScreenshotKeywords(LibraryComponent):
 
     def __init__(self, ctx):
         super().__init__(ctx)
-        self.log_dir = os.curdir
 
     def get_async_keyword_group(self) -> iScreenshotAsync:
         return self.ctx.get_current_library_context().get_async_keyword_group(type(self).__name__)
 
     @keyword
     def set_screenshot_directory(self, path):
-        self.log_dir = path
-        if not os.path.exists(path):
-            os.makedirs(path)
+        self.ctx.get_current_library_context().set_screenshot_path(path)
+
+    @keyword
+    def get_screenshot_directory(self):
+        return self.ctx.get_current_library_context().get_screenshot_path()
 
     @keyword
     def capture_page_screenshot(self, filename=DEFAULT_FILENAME_PAGE, fullPage=False):
@@ -41,7 +42,7 @@ def capture_page_screenshot(self, filename=DEFAULT_FILENAME_PAGE, fullPage=False
         self._embed_to_log_as_file(path, 800)
 
     def _get_screenshot_path(self, filename):
-        directory = self.log_dir
+        directory = self.ctx.get_current_library_context().get_screenshot_path()
         filename = filename.replace('/', os.sep)
         index = 0
         while True:
@@ -62,7 +63,7 @@ def _embed_to_log_as_file(self, path, width):
         """
         self.info('</td></tr><tr><td colspan="3">'
                   '<a href="{src}"><img src="{src}" width="{width}px"></a>'
-                  .format(src=get_link_path(path, self.log_dir), width=width), html=True)
+                  .format(src=get_link_path(path, os.curdir), width=width), html=True)
 
 class _SafeFormatter(dict):
 

PuppeteerLibrary/library_context/ilibrary_context.py

@@ -1,14 +1,17 @@
-from PuppeteerLibrary.custom_elements.base_page import BasePage
+import os
 from abc import ABC, abstractmethod
+from PuppeteerLibrary.custom_elements.base_page import BasePage
 
 
 class iLibraryContext(ABC):
 
     browser_type: str = None
+    screenshot_path: str = None
     timeout: int = 30
 
     def __init__(self, browser_type: str):
         self.browser_type = browser_type
+        self.screenshot_path = os.curdir
 
     @abstractmethod
     async def start_server(self, options: dict=None):
@@ -53,3 +56,11 @@ async def close_window(self):
     @abstractmethod
     def get_async_keyword_group(self, keyword_group_name: str):
         pass
+
+    def set_screenshot_path(self, path: str):
+        self.screenshot_path = path
+        if not os.path.exists(self.screenshot_path):
+            os.makedirs(self.screenshot_path)
+
+    def get_screenshot_path(self):
+        return self.screenshot_path