Updated tests and fixed a couple issues

- Updated unit test to look for a tuple
- Fixed issue with code on return statement
- Fixed issue with unit tests

Author: emanlove

src/SeleniumLibrary/keywords/screenshot.py

@@ -130,7 +130,7 @@ def _capture_page_screen_to_log(self, return_val):
         screenshot_as_base64 = self.driver.get_screenshot_as_base64()
         base64_str = self._embed_to_log_as_base64(screenshot_as_base64, 800)
         if return_val == BASE64:
-            return_val base64_str
+            return base64_str
         return EMBED
 
     @keyword
@@ -194,12 +194,12 @@ def _screenshot_root_directory(self, value):
     def _decide_embedded(self, filename):
         filename = filename.upper()
         if (
-            filename == DEFAULT_FILENAME_PAGE
+            filename == DEFAULT_FILENAME_PAGE.upper()
             and self._screenshot_root_directory in EMBEDDED_OPTIONS
         ):
             return True, self._screenshot_root_directory
         if (
-            filename == DEFAULT_FILENAME_ELEMENT
+            filename == DEFAULT_FILENAME_ELEMENT.upper()
             and self._screenshot_root_directory in EMBEDDED_OPTIONS
         ):
             return True, self._screenshot_root_directory

utest/test/keywords/test_screen_shot.py

@@ -22,24 +22,24 @@ def teardown_function():
 
 
 def test_defaults(screen_shot):
-    assert screen_shot._decide_embedded(SCREENSHOT_FILE_NAME) is False
-    assert screen_shot._decide_embedded(ELEMENT_FILE_NAME) is False
+    assert screen_shot._decide_embedded(SCREENSHOT_FILE_NAME) == (False, None)
+    assert screen_shot._decide_embedded(ELEMENT_FILE_NAME) == (False, None)
 
 
 def test_screen_shotdir_embeded(screen_shot):
     screen_shot.ctx.screenshot_root_directory = EMBED
-    assert screen_shot._decide_embedded(SCREENSHOT_FILE_NAME) is True
-    assert screen_shot._decide_embedded(SCREENSHOT_FILE_NAME.upper()) is True
-    assert screen_shot._decide_embedded(ELEMENT_FILE_NAME) is True
-    assert screen_shot._decide_embedded(ELEMENT_FILE_NAME.upper()) is True
-    assert screen_shot._decide_embedded("other.psn") is False
+    assert screen_shot._decide_embedded(SCREENSHOT_FILE_NAME) == (True, EMBED)
+    assert screen_shot._decide_embedded(SCREENSHOT_FILE_NAME.upper()) == (True, EMBED)
+    assert screen_shot._decide_embedded(ELEMENT_FILE_NAME) == (True, EMBED)
+    assert screen_shot._decide_embedded(ELEMENT_FILE_NAME.upper()) == (True, EMBED)
+    assert screen_shot._decide_embedded("other.psn") == (False, None)
 
 
 def test_file_name_embeded(screen_shot):
-    assert screen_shot._decide_embedded(EMBED) is True
-    assert screen_shot._decide_embedded("other.psn") is False
+    assert screen_shot._decide_embedded(EMBED) == (True, EMBED)
+    assert screen_shot._decide_embedded("other.psn") == (False, None)
     screen_shot.ctx.screenshot_root_directory = EMBED
-    assert screen_shot._decide_embedded(EMBED) is True
+    assert screen_shot._decide_embedded(EMBED) == (True, EMBED)
 
 
 def test_screenshot_path_embedded(screen_shot):