Correcting logic in 'eager' page loading strategy for IE

Author: jimevans

cpp/iedriver/Browser.cpp

@@ -509,27 +509,28 @@ bool Browser::IsDocumentNavigating(const std::string& page_load_strategy,
 
   // Starting WaitForDocumentComplete()
   is_navigating = this->is_navigation_started_;
-  CComBSTR ready_state;
-  HRESULT hr = doc->get_readyState(&ready_state);
-  if (FAILED(hr) || 
-      is_navigating || 
-      _wcsicmp(ready_state, L"complete") != 0 ||
-      (page_load_strategy == "eager" && _wcsicmp(ready_state, L"interactive") != 0)) {
+  CComBSTR ready_state_bstr;
+  HRESULT hr = doc->get_readyState(&ready_state_bstr);
+  if (FAILED(hr) || is_navigating) {
     if (FAILED(hr)) {
       LOGHR(DEBUG, hr) << "IHTMLDocument2::get_readyState failed.";
     } else if (is_navigating) {
       LOG(DEBUG) << "DocumentComplete event fired, indicating a new navigation.";
+    }
+    return true;
+  } else {
+    std::wstring ready_state = ready_state_bstr;
+    if ((ready_state == L"complete") ||
+        (page_load_strategy == "eager" && ready_state == L"interactive")) {
+      is_navigating = false;
     } else {
-      std::wstring state = ready_state;
       if (page_load_strategy == "eager") {
-        LOG(DEBUG) << "document.readyState is not 'complete' or 'interactive'; it was " << LOGWSTRING(state);
+        LOG(DEBUG) << "document.readyState is not 'complete' or 'interactive'; it was " << LOGWSTRING(ready_state);
       } else {
-        LOG(DEBUG) << "document.readyState is not 'complete'; it was " << LOGWSTRING(state);
+        LOG(DEBUG) << "document.readyState is not 'complete'; it was " << LOGWSTRING(ready_state);
       }
+      return true;
     }
-    return true;
-  } else {
-    is_navigating = false;
   }
 
   // document.readyState == complete

cpp/iedriverserver/CHANGELOG

@@ -9,6 +9,11 @@ available via the project downloads page. Changes in "revision" field indicate
 private releases checked into the prebuilts directory of the source tree, but
 not made generally available on the downloads page.
 
+v2.45.0.4
+=========
+ * Added busy check after attaching to newly launched IE instance.
+ * Corrected logic in 'eager' page loading strategy for IE.
+
 v2.45.0.3
 =========
  * Updates to JavaScript automation atoms.