diff options
| author | Samuel Mannehed <samuel@cendio.se> | 2016-12-01 10:43:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 10:43:35 +0100 |
| commit | e663da8c326442bad15b2b4463a4f56becbdad6e (patch) | |
| tree | f3724be117781ae64108495c0a97029c691f5bd6 | |
| parent | a8cc32d8b9c207e5908422b6ccb30ee6476e76f9 (diff) | |
| parent | 6ec3af22ca952c5e7a5240da39d178fd995dfd5a (diff) | |
| download | novnc-e663da8c326442bad15b2b4463a4f56becbdad6e.tar.gz | |
Merge pull request #727 from CendioOssman/travis
Fix travis tests
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | tests/test.util.js | 12 |
2 files changed, 16 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 243df3f..a7fe423 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,12 +8,10 @@ node_js: env: matrix: - TEST_BROWSER_NAME=PhantomJS - - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 7,Linux' - - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 7,Linux' TEST_BROWSER_VERSION='30,26' - - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 7' TEST_BROWSER_VERSION=10 - - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 8.1' TEST_BROWSER_VERSION=11 - - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.8' TEST_BROWSER_VERSION=6 - - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.9' TEST_BROWSER_VERSION=7 + - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11' + - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11' + - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10' + - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.11' global: - secure: QE5GqGd2hrpQsIgd8dlv3oRUUHqZayomzzQjNXOB81VQi241uz/ru+3GtBZLB5WLZCq/Gj89vbLnR0LN4ixlmPaWv3/WJQGyDGuRD/vMnccVl+rBUP/Hh2zdYwiISIGcrywNAE+KLus/lyt/ahVgzbaRaDSzrM1HaZFT/rndGck= - secure: g75sdctEwj0hoLW0Y08Tdv8s5scNzplB6a9EtaJ2vJD9S/bK+AsPqbWesGv1UlrFPCWdbV7Vg61vkmoUjcmb5xhqFIjcM9TlYJoKWeOTsOmnQoSIkIq6gMF1k02+LmKInbPgIzrp3m3jluS1qaOs/EzFpDnJp9hWBiAfXa12Jxk= diff --git a/tests/test.util.js b/tests/test.util.js index bce475d..60cdb58 100644 --- a/tests/test.util.js +++ b/tests/test.util.js @@ -63,7 +63,19 @@ describe('Utils', function() { // environments, so we need to redefine it whilst running these // tests. origNavigator = Object.getOwnPropertyDescriptor(window, "navigator"); + if (origNavigator === undefined) { + // Object.getOwnPropertyDescriptor() doesn't work + // properly in any version of IE + this.skip(); + } + Object.defineProperty(window, "navigator", {value: {}}); + if (window.navigator.languages !== undefined) { + // Object.defineProperty() doesn't work properly in old + // versions of Chrome + this.skip(); + } + window.navigator.languages = []; }); afterEach(function () { |