Merge pull request DevExpress#169 from inikulin/gh126

Minor changes to the CLI API. Implement correct comparison of URLs in client browser code (fixes DevExpress#126)
AlexanderMoskovkin · Nov 9, 2015 · 28731c1 · 28731c1
2 parents b5bb7a4 + 2eca387
commit 28731c1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/cli/argument-parser.js b/src/cli/argument-parser.js
@@ -90,7 +90,7 @@ export default class CliArgumentParser {
 
             .option('-b, --list-browsers', 'output the available browser aliases')
             .option('-r, --reporter <name>', 'specify the reporter type to use')
-            .option('-p, --report-path <path>', 'specify the path to which the report file should be saved')
+            .option('-p, --report-path <path>', 'send the report to a file at <path>')
             .option('-s, --screenshots <path>', 'enable screenshot capturing and specify the path to save the screenshots to')
             .option('-S, --screenshots-on-fails', 'take a screenshot whenever a test fails')
             .option('-q, --quarantine-mode', 'enable the quarantine mode')
@@ -101,7 +101,7 @@ export default class CliArgumentParser {
             .option('-F, --fixture-grep <pattern>', 'run only fixtures matching the specified pattern')
             .option('--ports <port1,port2>', 'specify custom port numbers')
             .option('--hostname <name>', 'specify the hostname')
-            .option('--qrcode', 'outputs QR-code that repeats URLs used to connect the remote browsers');
+            .option('--qr-code', 'outputs QR-code that repeats URLs used to connect the remote browsers');
     }
 
     _filterAndCountRemotes (browser) {

diff --git a/src/cli/index.js b/src/cli/index.js
@@ -61,7 +61,7 @@ async function runTests (argParser) {
     var port1          = opts.ports && opts.ports[0];
     var port2          = opts.ports && opts.ports[1];
     var testCafe       = await createTestCafe(opts.hostname, port1, port2);
-    var remoteBrowsers = await createRemoteBrowserConnections(testCafe, argParser.remoteCount, opts.qrcode);
+    var remoteBrowsers = await createRemoteBrowserConnections(testCafe, argParser.remoteCount, opts.qrCode);
     var browsers       = argParser.browsers.concat(remoteBrowsers);
     var runner         = testCafe.createRunner();
 

diff --git a/src/client/browser/index.js b/src/client/browser/index.js
@@ -27,6 +27,10 @@ function sendXHR (url, XMLHttpRequest) {
     });
 }
 
+function isCurrentLocation (url) {
+    return document.location.href.toLowerCase() === url.toLowerCase();
+}
+
 
 //API
 export function startHeartbeat (heartbeatUrl, XMLHttpRequest) {
@@ -38,8 +42,7 @@ export function startHeartbeat (heartbeatUrl, XMLHttpRequest) {
 export function checkStatus (statusUrl, XMLHttpRequest) {
     return sendXHR(statusUrl, XMLHttpRequest)
         .then((res) => {
-            if (res.cmd === COMMAND.run ||
-                res.cmd === COMMAND.idle && document.location.toString() !== res.url)
+            if (res.cmd === COMMAND.run || res.cmd === COMMAND.idle && !isCurrentLocation(res.url))
                 document.location = res.url;
 
             //NOTE: prepare to close the browser

diff --git a/test/server/cli-argument-parser-test.js b/test/server/cli-argument-parser-test.js
@@ -269,7 +269,7 @@ describe('CLI argument parser', function () {
     });
 
     it('Should parse command line arguments', function (done) {
-        parse('-r list -S -q -e --hostname myhost --qrcode ie test/server/data/file-list/file-1.js')
+        parse('-r list -S -q -e --hostname myhost --qr-code ie test/server/data/file-list/file-1.js')
             .then(function (parser) {
                 expect(parser.browsers).eql(['ie']);
                 expect(parser.src).eql([path.resolve(process.cwd(), 'test/server/data/file-list/file-1.js')]);
@@ -280,7 +280,7 @@ describe('CLI argument parser', function () {
                 expect(parser.opts.screenshotsOnFails).to.be.ok;
                 expect(parser.opts.quarantineMode).to.be.ok;
                 expect(parser.opts.skipJsErrors).to.be.ok;
-                expect(parser.opts.qrcode).to.be.ok;
+                expect(parser.opts.qrCode).to.be.ok;
                 done();
             })
             .catch(done);