Merge pull request #325 from rcoh/patch-1

Allow timeout to be passed to session functions
jeanphix · May 3, 2017 · d0f6c9a · d0f6c9a
2 parents a16f703 + 09106b2
commit d0f6c9a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ghost/ghost.py b/ghost/ghost.py
@@ -173,12 +173,12 @@ def can_load_page(func):
     @wraps(func)
     def wrapper(self, *args, **kwargs):
         expect_loading = kwargs.pop('expect_loading', False)
-
+        timeout = kwargs.pop('timeout', None)
         if expect_loading:
             self.loaded = False
             func(self, *args, **kwargs)
             return self.wait_for_page_loaded(
-                timeout=kwargs.pop('timeout', None))
+                timeout=timeout)
         return func(self, *args, **kwargs)
     return wrapper