From 195d8c510033fc97496bb8552fc350eafe49593e Mon Sep 17 00:00:00 2001 From: Jury Razumau Date: Fri, 7 Aug 2015 17:45:06 +0300 Subject: [PATCH] Add Microsoft Edge support --- session.js | 1 + test/spec/browser-spec.js | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/session.js b/session.js index 7cb4776..49e63f9 100644 --- a/session.js +++ b/session.js @@ -152,6 +152,7 @@ var session_fetch = (function(win, doc, nav){ }, data: { browser: [ + { string: nav.userAgent, subString: "Edge", identity: "Edge"}, { string: nav.userAgent, subString: "Chrome", identity: "Chrome" }, { string: nav.userAgent, subString: "OmniWeb", versionSearch: "OmniWeb/", identity: "OmniWeb" }, { string: nav.vendor, subString: "Apple", identity: "Safari", versionSearch: "Version" }, diff --git a/test/spec/browser-spec.js b/test/spec/browser-spec.js index 197147c..b4e9d86 100644 --- a/test/spec/browser-spec.js +++ b/test/spec/browser-spec.js @@ -41,6 +41,21 @@ describe('IE Browser Names', function(){ } }); +describe('Edge Browser Names', function (){ + var edge_tests = [ + ['edge', 'Win', '12', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10240'] + ]; + var edge_tests_expected_result = [ + { browser: 'Edge', version: 12.1024, os: 'Windows' } + ]; + for (var i = 0; i < edge_tests.length; i++) { + var edge_test = edge_tests[i]; + var expected_result = edge_tests_expected_result[i]; + it(edge_test[0], _getTestHandler(edge_test, expected_result)); + } + +}); + describe('Firefox Browser Names', function(){ var firefox_tests = [ ['firefox 9.0.1', '9.0.1', 'Mozilla/5.0 (Windows NT 5.1; rv:9.0.1) Gecko/20100101 Firefox/9.0.1'], @@ -63,6 +78,15 @@ describe('Safari Browser Names', function(){ describe('Chrome Browser Names', function(){ var chrome_tests = [ - + ['chrome 44', 'Win', '44', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.125 Safari/537.36'], ]; + + var chrome_tests_expected_result = [ + { browser: 'Chrome', version: 44, os: 'Windows' } + ]; + for (var i = 0; i < chrome_tests.length; i++) { + var chrome_test = chrome_tests[i]; + var expected_result = chrome_tests_expected_result[i]; + it(chrome_test[0], _getTestHandler(chrome_test, expected_result)); + } });