Merge pull request #215 from getgauge/175_close_tab

getgauge · Oct 11, 2018 · 551c6e9 · 551c6e9
2 parents b664dd3 + 0279bb7
commit 551c6e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/lib/api.json b/lib/api.json
diff --git a/lib/targetHandler.js b/lib/targetHandler.js
@@ -47,15 +47,11 @@ const getCriTarget = async (targetURL) => {
 
 const getTargetToConnect = async (targetUrl) => {
     const targets = (await criTarget.getTargets()).targetInfos;
-    let targetToConnect;
     targetUrl = handleUrlRedirection(targetUrl);
-    for (const target of targets) {
-        target.url = handleUrlRedirection(target.url);
-        if (target.type === 'page' && (target.url.split('://')[1] !== (targetUrl.split('://')[1] || targetUrl)) && (target.url !== targetUrl)) {
-            targetToConnect = target;
-        }
-    }
-    return targetToConnect;
+    return  targets.find( ( target ) => {
+        let _targetUrl = handleUrlRedirection(target.url);
+        return target.type === 'page' && (_targetUrl.split('://')[1] !== (targetUrl.split('://')[1] || targetUrl)) && (_targetUrl !== targetUrl);
+    });
 };
 
 const handleUrlRedirection = (url) => {