Merge pull request #59 from NuCivic/fix-current-url-https-everywhere

Fixes current url check when https everywhere is set.
GetDKAN · Sep 6, 2016 · d9f4b2e · d9f4b2e
2 parents f24ab28 + d5b842e
commit d9f4b2e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/Drupal/DKANExtension/Context/RawDKANContext.php b/src/Drupal/DKANExtension/Context/RawDKANContext.php
@@ -142,6 +142,9 @@ public function assertOnUrl($assert_url, $session = null){
     // Support relative paths when on a "base_url" page. Otherwise assume a full url.
     $current_url = str_replace($this->getMinkParameter("base_url"), "", $current_url);
 
+    // Fix url when https everywhere is enabled
+    $current_url = preg_replace('/https:\/\/\w+/', '', $current_url);
+
     // Remove hash part from url since it's widely used
     // for client side routing and this can make some
     // test fail.