From c5f55fd437c466f3ba8138a1aa19bc3da81fbdc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Wed, 8 Feb 2017 18:39:23 +0100 Subject: [PATCH 1/2] fix(jenkins): get rid of Opera from the Jenkins build script, it doesn't work The Opera launcher hasn't been installed for ages but until Karma 1.4.0 the error of Opera not being able to start was ignored. Karma has fixed the bug and now Jenkins is failing. --- scripts/jenkins/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/jenkins/build.sh b/scripts/jenkins/build.sh index 91dc58dfe6eb..dbb4383d7d0b 100755 --- a/scripts/jenkins/build.sh +++ b/scripts/jenkins/build.sh @@ -12,7 +12,7 @@ set -xe # This is the default set of browsers to use on the CI server unless overridden via env variable if [[ -z "$BROWSERS" ]] then - BROWSERS="Chrome,Firefox,Opera,/Users/jenkins/bin/safari.sh" + BROWSERS="Chrome,Firefox,/Users/jenkins/bin/safari.sh" fi # CLEAN # From 5184305da3f4e6e5823f4d971bcd509c4b2bb561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Wed, 8 Feb 2017 18:41:14 +0100 Subject: [PATCH 2/2] docs(*): get rid of Opera mentions from docs/comments We don't support Opera officially anymore (it's sort-of supported via being based on Blink) so its mentions in the docs has now been removed. We also don't have the Opera launcher installed so the advise to use it just wouldn't work anyway. --- docs/content/misc/contribute.ngdoc | 6 +++--- src/ng/browser.js | 4 ++-- src/ng/urlUtils.js | 2 +- test/ngMock/angular-mocksSpec.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/content/misc/contribute.ngdoc b/docs/content/misc/contribute.ngdoc index d8737f96df3f..bdd6231d0e89 100644 --- a/docs/content/misc/contribute.ngdoc +++ b/docs/content/misc/contribute.ngdoc @@ -140,13 +140,13 @@ tests once on Chrome run: grunt test:unit ``` -To run the tests on other browsers (Chrome, ChromeCanary, Firefox, Opera and Safari are pre-configured) use: +To run the tests on other browsers (Chrome, ChromeCanary, Firefox and Safari are pre-configured) use: ```shell -grunt test:unit --browsers=Opera,Firefox +grunt test:unit --browsers=Chrome,Firefox ``` -Note there should be _no spaces between browsers_. `Opera, Firefox` is INVALID. +Note there should be _no spaces between browsers_. `Chrome, Firefox` is INVALID. During development, however, it's more productive to continuously run unit tests every time the source or test files change. To execute tests in this mode run: diff --git a/src/ng/browser.js b/src/ng/browser.js index d6f8163f2695..abacb9f3cd83 100644 --- a/src/ng/browser.js +++ b/src/ng/browser.js @@ -255,8 +255,8 @@ function Browser(window, document, $log, $sniffer) { self.onUrlChange = function(callback) { // TODO(vojta): refactor to use node's syntax for events if (!urlChangeInit) { - // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera) - // don't fire popstate when user change the address bar and don't fire hashchange when url + // We listen on both (hashchange/popstate) when available, as some browsers don't + // fire popstate when user changes the address bar and don't fire hashchange when url // changed by push/replaceState // html5 history api - popstate event diff --git a/src/ng/urlUtils.js b/src/ng/urlUtils.js index 0aa7d35b6fef..2af0c5f6b753 100644 --- a/src/ng/urlUtils.js +++ b/src/ng/urlUtils.js @@ -20,7 +20,7 @@ var baseUrlParsingNode; * URL will be resolved into an absolute URL in the context of the application document. * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related * properties are all populated to reflect the normalized URL. This approach has wide - * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc. See + * compatibility - Safari 1+, Mozilla 1+ etc. See * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html * * Implementation Notes for IE diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js index a937c3a7d53c..70b8a97fd98b 100644 --- a/test/ngMock/angular-mocksSpec.js +++ b/test/ngMock/angular-mocksSpec.js @@ -923,7 +923,7 @@ describe('ngMock', function() { })); describe('error stack trace when called outside of spec context', function() { - // - Chrome, Firefox, Edge, Opera give us the stack trace as soon as an Error is created + // - Chrome, Firefox, Edge give us the stack trace as soon as an Error is created // - IE10+, PhantomJS give us the stack trace only once the error is thrown // - IE9 does not provide stack traces var stackTraceSupported = (function() {