Skip to content

Commit c4365ad

Browse files
committed
Revert "chore: fix unit tests & CI"
This reverts commit f723c27.
1 parent f723c27 commit c4365ad

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

meteor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"test": "meteor npm run check-types && meteor npm run unit",
2020
"watch": "jest --watch",
2121
"update-snapshots": "jest --updateSnapshot",
22-
"ci:lint": "meteor npm run check-types && meteor npm run lint",
22+
"ci:lint": "meteor yarn check-types && meteor yarn lint",
2323
"cov-open": "open-cli coverage/lcov-report/index.html",
2424
"cov": "meteor npm run unitcov && meteor npm run cov-open",
2525
"license-validate": "node ../scripts/checkLicenses.js --allowed=\"MIT,BSD,ISC,Apache,Unlicense,CC0,LGPL,CC BY 3.0,CC BY 4.0,MPL 2.0,Python 2.0\" --excludePackages=timecode,rxjs/ajax,rxjs/fetch,rxjs/internal-compatibility,nw-pre-gyp-module-test,rxjs/operators,rxjs/testing,rxjs/webSocket,undefined,i18next-conv,@fortawesome/fontawesome-common-types,argv,indexof,custom-license,private,public-domain-module,@sofie-automation/corelib,@sofie-automation/shared-lib,@sofie-automation/job-worker",

packages/job-worker/src/ingest/mosDevice/__tests__/mosIngest.test.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
handleMosSwapStories,
1414
} from '../mosStoryJobs'
1515
import { handleMosRundownData, handleMosRundownReadyToAir, handleMosRundownStatus } from '../mosRundownJobs'
16-
import { parseMosString } from '../lib'
16+
import { getMosIngestSegmentExternalId, parseMosString } from '../lib'
1717
import { MockJobContext, setupDefaultJobEnvironment } from '../../../__mocks__/context'
1818
import { setupMockIngestDevice, setupMockShowStyleCompound } from '../../../__mocks__/presetCollections'
1919
import { fixSnapshot } from '../../../__mocks__/helpers/snapshot'
@@ -569,7 +569,9 @@ describe('Test recieved mos ingest payloads', () => {
569569
replace: false,
570570
})
571571
).rejects.toThrow(
572-
`Parts ${mosTypes.mosString128.stringify(newPartData.ID)} already exist in rundown ${rundown.externalId}`
572+
`Parts ${getMosIngestSegmentExternalId(
573+
mosTypes.mosString128.stringify(newPartData.ID)
574+
)} already exist in rundown ${rundown.externalId}`
573575
)
574576
})
575577

@@ -1077,7 +1079,9 @@ describe('Test recieved mos ingest payloads', () => {
10771079
stories,
10781080
})
10791081
).rejects.toThrow(
1080-
`Part ${mosTypes.mosString128.stringify(beforeStoryId)} in rundown ${rundown.externalId} not found`
1082+
`Part ${getMosIngestSegmentExternalId(mosTypes.mosString128.stringify(beforeStoryId))} in rundown ${
1083+
rundown.externalId
1084+
} not found`
10811085
)
10821086
})
10831087

@@ -1099,7 +1103,9 @@ describe('Test recieved mos ingest payloads', () => {
10991103
stories,
11001104
})
11011105
).rejects.toThrow(
1102-
`Part ${mosTypes.mosString128.stringify(beforeStoryId)} in rundown ${rundown.externalId} not found`
1106+
`Part ${getMosIngestSegmentExternalId(mosTypes.mosString128.stringify(beforeStoryId))} in rundown ${
1107+
rundown.externalId
1108+
} not found`
11031109
)
11041110
})
11051111

0 commit comments

Comments
 (0)