proxy bypass check for specific request DevExpress#1791 (DevExpress#2209

)
AlexKamaev · Mar 23, 2018 · 688d723 · 688d723
1 parent c7a806b
commit 688d723
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 174 deletions.
diff --git a/src/runner/test-run-controller.js b/src/runner/test-run-controller.js
@@ -1,6 +1,5 @@
 import EventEmitter from 'events';
 import { TestRun as LegacyTestRun } from 'testcafe-legacy-api';
-import checkUrl from '../utils/check-url';
 import TestRun from '../test-run';
 
 
@@ -127,10 +126,18 @@ export default class TestRunController extends EventEmitter {
 
         testRun.start();
 
-        const pageUrl           = testRun.test.pageUrl;
-        const needBypassHost    = this.opts.proxyBypass && checkUrl(pageUrl, this.opts.proxyBypass.split(','));
-        const externalProxyHost = needBypassHost ? null : this.opts.externalProxyHost;
+        const pageUrl             = testRun.test.pageUrl;
+        const externalProxyHost   = this.opts.externalProxyHost;
+        const proxyBypassRules    = this.opts.proxyBypass && this.opts.proxyBypass.split(',');
+        let externalProxySettings = null;
 
-        return this.proxy.openSession(pageUrl, testRun, externalProxyHost);
+        if (externalProxyHost) {
+            externalProxySettings = {
+                url:         externalProxyHost,
+                bypassRules: proxyBypassRules
+            };
+        }
+
+        return this.proxy.openSession(pageUrl, testRun, externalProxySettings);
     }
 }
diff --git a/test/functional/fixtures/proxy/pages/bypass-page-proxy-request.html b/test/functional/fixtures/proxy/pages/bypass-page-proxy-request.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Index</title>
+</head>
+<body>
+    <div id="result"></div>
+    <script src="http://non-existing-url.xyz"></script>
+</body>
+</html>
diff --git a/test/functional/fixtures/proxy/test.js b/test/functional/fixtures/proxy/test.js
@@ -22,5 +22,19 @@ describe('Using proxy-bypass', function () {
     it('Should bypass using proxy by set of rules', function () {
         return runTests('testcafe-fixtures/index.test.js', null, { useProxy: ERROR_PROXY_URL, proxyBypass: 'dummy,localhost:3000' });
     });
+
+    it('Should open page without proxy but get resource with proxy', function () {
+        const http = require('http');
+
+        const server = http.createServer(function (req, res) {
+            res.write('document.getElementById(\'result\').innerHTML = \'proxy\'');
+            res.end();
+        }).listen(3006);
+
+        return runTests('testcafe-fixtures/bypass-page-proxy-request.test.js', null, { useProxy: 'localhost:3006', proxyBypass: 'localhost:3000' })
+            .then(() => {
+                server.close();
+            });
+    });
 });
 
diff --git a/test/functional/fixtures/proxy/testcafe-fixtures/bypass-page-proxy-request.test.js b/test/functional/fixtures/proxy/testcafe-fixtures/bypass-page-proxy-request.test.js
@@ -0,0 +1,8 @@
+import { Selector } from 'testcafe';
+
+fixture `Open page without proxy but get resource with proxy`
+    .page `http://localhost:3000/fixtures/proxy/pages/bypass-page-proxy-request.html`;
+
+test('Should open page without proxy but get resource with proxy', async t => {
+    await t.expect(Selector('#result').innerText).eql('proxy');
+});
diff --git a/test/server/match-url-test.js b/test/server/match-url-test.js