Fixed osn_service tests

Author: avoitenko-logitech

package.json

@@ -25,11 +25,13 @@
   },
   "devDependencies": {
     "@types/chai": "^4.1.7",
+    "@types/chai-subset": "^1.3.5",
     "@types/mocha": "^5.2.5",
     "@types/node": "^16.7.13",
     "archiver": "^3.1.1",
     "aws-sdk": "^2.1164.0",
     "chai": "^4.2.0",
+    "chai-subset": "^1.6.0",
     "colors": "^1.4.0",
     "electron": "29.4.3",
     "electron-mocha": "^12.1.0",

tests/osn-tests/src/test_osn_service.ts

@@ -7,6 +7,10 @@ import { OBSHandler } from '../util/obs_handler'
 import { deleteConfigFiles } from '../util/general';
 import { EOBSInputTypes } from '../util/obs_enums';
 
+import chai = require('chai');
+import chaiSubset = require("chai-subset")
+chai.use(chaiSubset);
+
 const testName = 'osn-service';
 
 describe(testName, () => {
@@ -43,7 +47,7 @@ describe(testName, () => {
 
     it('Get service types', () => {
         const services = osn.ServiceFactory.types();
-        expect(services).to.eql(['rtmp_common', 'rtmp_custom'], 'Wrong services types returned');
+        expect(services).to.eql(['whip_custom', 'rtmp_common', 'rtmp_custom'], 'Wrong services types returned');
     });
 
     it('Create rtmp common', () => {
@@ -57,9 +61,9 @@ describe(testName, () => {
             key: 'test'
         });
 
-        expect(service.settings).to.eql(
-            {service: 'Twitch', server: 'auto', key: 'test'},
-            "Error while updating the service settings");
+        // Using containSubset here because starting from OBS 30 the resulting object is bloated with URLs and disclaimers about usage policy
+        expect(service.settings).to.containSubset(
+            {service: 'Twitch', server: 'auto', key: 'test'});
 
         const props = service.properties;
         let prop: any = props.first();

yarn.lock

@@ -39,6 +39,18 @@
     "@types/node" "*"
     "@types/responselike" "^1.0.0"
 
+"@types/chai-subset@^1.3.5":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.5.tgz#3fc044451f26985f45625230a7f22284808b0a9a"
+  integrity sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.0.0.tgz#7f981e71e69c9b2d422f58f78de1c59179782133"
+  integrity sha512-+DwhEHAaFPPdJ2ral3kNHFQXnTfscEEFsUxzD+d7nlcLrFK23JtNjH71RGasTcHb88b4vVi4mTyfpf8u2L8bdA==
+
 "@types/chai@^4.1.7":
   version "4.3.11"
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.11.tgz#e95050bf79a932cb7305dd130254ccdf9bde671c"
@@ -443,6 +455,11 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
+chai-subset@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/chai-subset/-/chai-subset-1.6.0.tgz#a5d0ca14e329a79596ed70058b6646bd6988cfe9"
+  integrity sha512-K3d+KmqdS5XKW5DWPd5sgNffL3uxdDe+6GdnJh3AYPhwnBGRY5urfvfcbRtWIvvpz+KxkL9FeBB6MZewLUNwug==
+
 chai@^4.2.0:
   version "4.3.10"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.10.tgz#d784cec635e3b7e2ffb66446a63b4e33bd390384"