Archives/lancedikson_bowser
1
0
Fork 0
mirror of https://github.com/lancedikson/bowser synced 2024-10-27 20:34:22 +00:00
Code Issues Releases Wiki Activity

Fix detection for Android 8 OPR6 build number

Browse Source 
Android 8 Chrome 60 was being detected as Opera.
This commit is contained in:
Jason Pang 2017-08-25 21:23:35 -07:00
parent 0afa24ff30
commit f96d7e60dc
2 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bowser.js
View File

@ -56,7 +56,7 @@
, opera: t , opera: t
, version: versionIdentifier || getFirstMatch(/(?:opera|opr|opios)[\s\/](\d+(\.\d+)?)/i) , version: versionIdentifier || getFirstMatch(/(?:opera|opr|opios)[\s\/](\d+(\.\d+)?)/i)
} }
} else if (/opr|opios/i.test(ua)) { } else if (/opr|opios/i.test(ua) && !/\/opr/i.test(ua)) {
// a new Opera // a new Opera
result = { result = {
name: 'Opera' name: 'Opera'
@ -351,7 +351,7 @@
default: return undefined default: return undefined
} }
} }
// OS version extraction // OS version extraction
var osVersion = ''; var osVersion = '';
if (result.windows) { if (result.windows) {

51
test/test.js
View File

@ -101,46 +101,67 @@ describe('Browser versions comparision', function() {
} }
}); });
describe('Unsupported browser check', function() { describe('Unsupported browser check', function () {
before(function() { before(function () {
this.ie10_6 = "Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0"; this.ie10_6 = "Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0";
}); });
it('should be passed by #isUnsupportedBrowser for IE10.6 and for IE10 miminal version specified', function() { it('should be passed by #isUnsupportedBrowser for IE10.6 and for IE10 miminal version specified', function () {
var unsupported = browser.isUnsupportedBrowser({msie: "10"}, this.ie10_6); var unsupported = browser.isUnsupportedBrowser({ msie: "10" }, this.ie10_6);
assert.equal(unsupported, false); assert.equal(unsupported, false);
}); });
it('should be passed by #isUnsupportedBrowser for IE10.6 and for IE10 miminal version specified in strict mode', function() { it('should be passed by #isUnsupportedBrowser for IE10.6 and for IE10 miminal version specified in strict mode', function () {
var unsupported = browser.isUnsupportedBrowser({msie: "10"}, true, this.ie10_6); var unsupported = browser.isUnsupportedBrowser({ msie: "10" }, true, this.ie10_6);
assert.equal(unsupported, false); assert.equal(unsupported, false);
}); });
it('should NOT be passed by #check for IE10.6 and for IE11 miminal version specified', function() { it('should NOT be passed by #check for IE10.6 and for IE11 miminal version specified', function () {
var supported = browser.check({msie: "11"}, this.ie10_6); var supported = browser.check({ msie: "11" }, this.ie10_6);
assert.equal(supported, false); assert.equal(supported, false);
}); });
it('should NOT be passed by #check for IE10.6 and for IE11 miminal version specified in strict mode', function() { it('should NOT be passed by #check for IE10.6 and for IE11 miminal version specified in strict mode', function () {
var supported = browser.check({msie: "11"}, true, this.ie10_6); var supported = browser.check({ msie: "11" }, true, this.ie10_6);
assert.equal(supported, false); assert.equal(supported, false);
}); });
it('should throw an error when minVersion map has a number, but not a string', function() { it('should throw an error when minVersion map has a number, but not a string', function () {
assert.throws(() => { assert.throws(() => {
browser.check({msie: 11}, this.ie10_6); browser.check({ msie: 11 }, this.ie10_6);
}, /Browser version in the minVersion map should be a string/); }, /Browser version in the minVersion map should be a string/);
}); });
it('should be passed by #check for IE10.6 when version was not specified', function() { it('should be passed by #check for IE10.6 when version was not specified', function () {
var supported = browser.check({}, this.ie10_6); var supported = browser.check({}, this.ie10_6);
assert.equal(supported, true); assert.equal(supported, true);
}); });
it('should NOT be passed by #check for IE10.6 when version was not specified in strict mode', function() { it('should NOT be passed by #check for IE10.6 when version was not specified in strict mode', function () {
var supported = browser.check({}, true, this.ie10_6); var supported = browser.check({}, true, this.ie10_6);
assert.equal(supported, false); assert.equal(supported, false);
}); });
});
}) describe('Android 8.0.0 OPR6 build type not confused for the Opera browser', function () {
before(function () {
this.android8_opr6_ua = "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 6P Build/OPR6.170623.013) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.107 Mobile Safari/537.36";
this.opera_ua = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36 OPR/47.0.2631.55";
});
it('Android 8 Chrome 60 user agent should be detected as Chrome 60', function () {
var flags = browser._detect(this.android8_opr6_ua);
assert.equal(flags.chrome, true);
assert.equal(flags.version, "60.0");
assert.equal(flags.opera, undefined);
});
it('Opera user agent should be detected as Opera 47', function () {
var flags = browser._detect(this.opera_ua);
assert.equal(flags.opera, true);
assert.equal(flags.version, "47.0");
assert.equal(flags.chrome, undefined);
});
});