From 60781edd548dcfd0008bb9458a4e7f536a62c94a Mon Sep 17 00:00:00 2001 From: Raphael Sousa Santos Date: Mon, 12 Dec 2022 09:53:20 +0100 Subject: [PATCH 1/6] Upgrade jasmine to 4.5.0 --- package-lock.json | 30 +++++++++++++++++++++--------- package.json | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a83af7f6..60d9b018d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "faye-websocket": "^0.11.3", "fetch-mock": "git+https://git@github.com/jpatel531/fetch-mock.git", "isomorphic-fetch": "^3.0.0", - "jasmine": "^3.99.0", + "jasmine": "^4.5.0", "jasmine-spec-reporter": "^7.0.0", "karma": "^6.4.0", "karma-browserstack-launcher": "^1.6.0", @@ -8068,13 +8068,13 @@ } }, "node_modules/jasmine": { - "version": "3.99.0", - "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.99.0.tgz", - "integrity": "sha512-YIThBuHzaIIcjxeuLmPD40SjxkEcc8i//sGMDKCgkRMVgIwRJf5qyExtlJpQeh7pkeoBSOe6lQEdg+/9uKg9mw==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-4.5.0.tgz", + "integrity": "sha512-9olGRvNZyADIwYL9XBNBst5BTU/YaePzuddK+YRslc7rI9MdTIE4r3xaBKbv2GEmzYYUfMOdTR8/i6JfLZaxSQ==", "dev": true, "dependencies": { "glob": "^7.1.6", - "jasmine-core": "~3.99.0" + "jasmine-core": "^4.5.0" }, "bin": { "jasmine": "bin/jasmine.js" @@ -8124,6 +8124,12 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/jasmine/node_modules/jasmine-core": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.5.0.tgz", + "integrity": "sha512-9PMzyvhtocxb3aXJVOPqBDswdgyAeSB81QnLop4npOpbqnheaTEwPc9ZloQeVswugPManznQBjD8kWDTjlnHuw==", + "dev": true + }, "node_modules/jest-get-type": { "version": "26.3.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", @@ -21755,13 +21761,13 @@ } }, "jasmine": { - "version": "3.99.0", - "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.99.0.tgz", - "integrity": "sha512-YIThBuHzaIIcjxeuLmPD40SjxkEcc8i//sGMDKCgkRMVgIwRJf5qyExtlJpQeh7pkeoBSOe6lQEdg+/9uKg9mw==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-4.5.0.tgz", + "integrity": "sha512-9olGRvNZyADIwYL9XBNBst5BTU/YaePzuddK+YRslc7rI9MdTIE4r3xaBKbv2GEmzYYUfMOdTR8/i6JfLZaxSQ==", "dev": true, "requires": { "glob": "^7.1.6", - "jasmine-core": "~3.99.0" + "jasmine-core": "^4.5.0" }, "dependencies": { "glob": { @@ -21777,6 +21783,12 @@ "once": "^1.3.0", "path-is-absolute": "^1.0.0" } + }, + "jasmine-core": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.5.0.tgz", + "integrity": "sha512-9PMzyvhtocxb3aXJVOPqBDswdgyAeSB81QnLop4npOpbqnheaTEwPc9ZloQeVswugPManznQBjD8kWDTjlnHuw==", + "dev": true } } }, diff --git a/package.json b/package.json index 957bbbd3f..42624105f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "faye-websocket": "^0.11.3", "fetch-mock": "git+https://git@github.com/jpatel531/fetch-mock.git", "isomorphic-fetch": "^3.0.0", - "jasmine": "^3.99.0", + "jasmine": "^4.5.0", "jasmine-spec-reporter": "^7.0.0", "karma": "^6.4.0", "karma-browserstack-launcher": "^1.6.0", From c341880f5264140ddd51d0a11f4e1bf16cb267be Mon Sep 17 00:00:00 2001 From: Raphael Sousa Santos Date: Mon, 12 Dec 2022 09:57:52 +0100 Subject: [PATCH 2/6] karma --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 60d9b018d..7657418be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "isomorphic-fetch": "^3.0.0", "jasmine": "^4.5.0", "jasmine-spec-reporter": "^7.0.0", - "karma": "^6.4.0", + "karma": "^6.4.1", "karma-browserstack-launcher": "^1.6.0", "karma-chrome-launcher": "^3.1.0", "karma-firefox-launcher": "^2.1.1", @@ -8704,9 +8704,9 @@ } }, "node_modules/karma": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.0.tgz", - "integrity": "sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz", + "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==", "dev": true, "dependencies": { "@colors/colors": "1.5.0", @@ -22266,9 +22266,9 @@ } }, "karma": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.0.tgz", - "integrity": "sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz", + "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==", "dev": true, "requires": { "@colors/colors": "1.5.0", diff --git a/package.json b/package.json index 42624105f..50d23e150 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "isomorphic-fetch": "^3.0.0", "jasmine": "^4.5.0", "jasmine-spec-reporter": "^7.0.0", - "karma": "^6.4.0", + "karma": "^6.4.1", "karma-browserstack-launcher": "^1.6.0", "karma-chrome-launcher": "^3.1.0", "karma-firefox-launcher": "^2.1.1", From 73bcb99e3995245553a468dbb0a6c65d944de45c Mon Sep 17 00:00:00 2001 From: Raphael Sousa Santos Date: Mon, 12 Dec 2022 10:03:53 +0100 Subject: [PATCH 3/6] fix --- spec/javascripts/unit/core/http/http_request_spec.js | 6 ------ .../unit/core/transports/transport_connection_spec.js | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spec/javascripts/unit/core/http/http_request_spec.js b/spec/javascripts/unit/core/http/http_request_spec.js index f97bbcdcb..5e93be1f6 100644 --- a/spec/javascripts/unit/core/http/http_request_spec.js +++ b/spec/javascripts/unit/core/http/http_request_spec.js @@ -163,12 +163,6 @@ describe("HTTPRequest", function() { }); }); - describe("on request end", function() { - beforeEach(function() { - request.start(); - }); - }); - describe("on page unload", function() { var unloader; diff --git a/spec/javascripts/unit/core/transports/transport_connection_spec.js b/spec/javascripts/unit/core/transports/transport_connection_spec.js index 15ea34558..caa41d458 100644 --- a/spec/javascripts/unit/core/transports/transport_connection_spec.js +++ b/spec/javascripts/unit/core/transports/transport_connection_spec.js @@ -225,6 +225,10 @@ describe("TransportConnection", function() { expect(loadCallback).toHaveBeenCalledWith(false); }); }); + } else { + it("dummy test", function() { + expect(true).toBe(true); + }) } }); }); From b7fe0e4592403facfb7a563f5ca5d7ed43676488 Mon Sep 17 00:00:00 2001 From: Raphael Sousa Santos Date: Mon, 12 Dec 2022 10:39:33 +0100 Subject: [PATCH 4/6] test --- .../unit/core/connection/connection_manager_spec.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/spec/javascripts/unit/core/connection/connection_manager_spec.js b/spec/javascripts/unit/core/connection/connection_manager_spec.js index b160f0330..412577cc1 100644 --- a/spec/javascripts/unit/core/connection/connection_manager_spec.js +++ b/spec/javascripts/unit/core/connection/connection_manager_spec.js @@ -13,7 +13,17 @@ describe("ConnectionManager", function() { }); afterAll(() => { - jasmine.clock().uninstall(); + try { + jasmine.clock().uninstall(); + } catch (e) { + if (e instanceof TypeError) { + // Ignore + // It's a bug in jasmine AFAIK and all other attempts of working + // around it led to other issues + } else { + throw e; + } + } }); beforeEach(function() { From 8711f6b97dca10ae86d96af00ece766c3249a34e Mon Sep 17 00:00:00 2001 From: Raphael Sousa Santos Date: Mon, 12 Dec 2022 15:06:57 +0100 Subject: [PATCH 5/6] captureTimeout: 10000ms --- spec/config/karma/config.common.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/config/karma/config.common.js b/spec/config/karma/config.common.js index 181ec0b00..0c27f8d23 100644 --- a/spec/config/karma/config.common.js +++ b/spec/config/karma/config.common.js @@ -32,7 +32,7 @@ module.exports = { autoWatch: true, browsers: browserList, - captureTimeout: 5e3, + captureTimeout: 10e3, browserNoActivityTimeout: 3e4, browserDisconnectTimeout: 3e4, browserDisconnectTolerance: 3, @@ -48,4 +48,3 @@ module.exports = { } } }; - From 7dca637f3e5bede152b9882f1d6b1826fffb91b2 Mon Sep 17 00:00:00 2001 From: sonologico <1592315+sonologico@users.noreply.github.com> Date: Mon, 12 Dec 2022 15:20:25 +0100 Subject: [PATCH 6/6] Update transport_connection_spec.js --- .../unit/core/transports/transport_connection_spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/javascripts/unit/core/transports/transport_connection_spec.js b/spec/javascripts/unit/core/transports/transport_connection_spec.js index caa41d458..23dd8f2aa 100644 --- a/spec/javascripts/unit/core/transports/transport_connection_spec.js +++ b/spec/javascripts/unit/core/transports/transport_connection_spec.js @@ -226,6 +226,7 @@ describe("TransportConnection", function() { }); }); } else { + // Needed so that the describe block isn't empty it("dummy test", function() { expect(true).toBe(true); })