Better None handling for alias checks (robotframework#1376)

aaltat · web-flow · commit 476c12078909 · 2019-04-23T21:13:41.000+01:00
Fixes robotframework#1319
diff --git a/src/SeleniumLibrary/keywords/webdrivertools.py b/src/SeleniumLibrary/keywords/webdrivertools.py
@@ -20,7 +20,7 @@
 from robot.utils import ConnectionCache
 from selenium import webdriver
 
-from SeleniumLibrary.utils import is_falsy, is_truthy
+from SeleniumLibrary.utils import is_falsy, is_truthy, is_noney
 
 
 class WebDriverCreator(object):
@@ -240,7 +240,7 @@ def get_index(self, alias_or_index):
         return None if driver in self._closed else index
 
     def _get_index(self, alias_or_index):
-        alias_or_index = None if alias_or_index == 'None' else alias_or_index
+        alias_or_index = None if is_noney(alias_or_index) else alias_or_index
         try:
             return self.resolve_alias_or_index(alias_or_index)
         except AttributeError:
diff --git a/utest/test/keywords/test_webdrivercache.py b/utest/test/keywords/test_webdrivercache.py
@@ -125,6 +125,9 @@ def test_resolve_alias_or_index_with_none(self):
         index = cache.get_index('None')
         self.assertEqual(index, None)
 
+        index = cache.get_index('NoNe')
+        self.assertEqual(index, None)
+
     def test_resolve_alias_or_index_error(self):
         cache = WebDriverCache()
 
