From 2a7282efe4695c1c39e5ebf62c5a7d95e04fb255 Mon Sep 17 00:00:00 2001 From: Frederic Beaudoin Date: Wed, 28 Aug 2024 14:18:17 -0400 Subject: [PATCH] Fix stencil build https://coveord.atlassian.net/browse/KIT-2425 --- package-lock.json | 9 +------ packages/atomic-angular/package.json | 1 - .../result-template-decorators.spec.tsx | 10 +++----- .../src/utils/initialization-utils.spec.ts | 6 ++--- .../atomic/src/utils/result-utils.spec.ts | 25 +++++++++---------- packages/samples/angular/package.json | 5 ++-- 6 files changed, 22 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index c28f680b347..1e98fc5e71e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20468,17 +20468,12 @@ "@types/istanbul-lib-report": "*" } }, - "node_modules/@types/jasmine": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.4.tgz", - "integrity": "sha512-px7OMFO/ncXxixDe1zR13V1iycqWae0MxTaw62RpFlksUi5QuNWgQJFkTQjIOvrmutJbI7Fp2Y2N1F6D2R4G6w==", - "dev": true - }, "node_modules/@types/jest": { "version": "29.5.12", "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz", "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==", "dev": true, + "license": "MIT", "dependencies": { "expect": "^29.0.0", "pretty-format": "^29.0.0" @@ -51966,7 +51961,6 @@ "@angular/cli": "17.3.9", "@angular/compiler-cli": "17.3.12", "@coveo/headless": "2.80.0", - "@types/jasmine": "5.1.4", "@types/node": "20.14.12", "jasmine-core": "5.2.0", "karma": "6.4.3", @@ -57588,7 +57582,6 @@ "@angular-devkit/build-angular": "17.3.9", "@angular/cli": "17.3.9", "@angular/compiler-cli": "17.3.12", - "@types/jasmine": "5.1.4", "@types/node": "20.14.12", "@typescript-eslint/eslint-plugin": "^7.0.0", "cypress": "13.13.1", diff --git a/packages/atomic-angular/package.json b/packages/atomic-angular/package.json index aff53dc7b4b..a10a83396ac 100644 --- a/packages/atomic-angular/package.json +++ b/packages/atomic-angular/package.json @@ -31,7 +31,6 @@ "@angular/cli": "17.3.9", "@angular/compiler-cli": "17.3.12", "@coveo/headless": "2.80.0", - "@types/jasmine": "5.1.4", "@types/node": "20.14.12", "jasmine-core": "5.2.0", "karma": "6.4.3", diff --git a/packages/atomic/src/components/search/result-template-components/result-template-decorators.spec.tsx b/packages/atomic/src/components/search/result-template-components/result-template-decorators.spec.tsx index c9856778a6e..114c63d84e5 100644 --- a/packages/atomic/src/components/search/result-template-components/result-template-decorators.spec.tsx +++ b/packages/atomic/src/components/search/result-template-components/result-template-decorators.spec.tsx @@ -1,4 +1,4 @@ -import {buildInteractiveResult, TestUtils} from '@coveo/headless'; +import {buildInteractiveResult, Result, SearchEngine} from '@coveo/headless'; import {h} from '@stencil/core'; import {newSpecPage, SpecPage} from '@stencil/core/testing'; import {MissingParentError} from '../../common/item-list/item-decorators'; @@ -54,17 +54,15 @@ describe('resultContext method', () => { }); it("revolves the bindings when it's a child of an atomic-result element", async () => { - const mockEngine = TestUtils.buildMockSearchEngine( - TestUtils.createMockState() - ); - const mockResult = TestUtils.buildMockResult(); + const mockEngine = jest.mocked({} as SearchEngine); + const mockResult = jest.mocked({} as Result); const page = await newSpecPage({ components: [AtomicResult], template: () => ( { it(`when "engine" is defined should render the content `, () => { component['bindings'] = { - engine: TestUtils.buildMockSearchEngine(TestUtils.createMockState()), + engine: jest.mocked({} as SearchEngine), i18n: i18next, store: createAtomicStore(), interfaceElement: document.createElement('atomic-search-interface'), @@ -127,7 +127,7 @@ describe('BindStateToController decorator', () => { console.error = jest.fn(); component = { bindings: { - engine: TestUtils.buildMockSearchEngine(TestUtils.createMockState()), + engine: jest.mocked({} as SearchEngine), i18n: i18next, store: createAtomicStore(), interfaceElement: document.createElement('atomic-search-interface'), diff --git a/packages/atomic/src/utils/result-utils.spec.ts b/packages/atomic/src/utils/result-utils.spec.ts index 630cf07c6fa..eb3676bf98e 100644 --- a/packages/atomic/src/utils/result-utils.spec.ts +++ b/packages/atomic/src/utils/result-utils.spec.ts @@ -1,24 +1,23 @@ import { buildSearchEngine, getSampleSearchEngineConfiguration, + Raw, + Result, } from '@coveo/headless'; -import {TestUtils} from '@coveo/headless'; import {Bindings} from '../components/search/atomic-search-interface/atomic-search-interface'; import {buildStringTemplateFromResult} from './result-utils'; describe('buildStringTemplateFromResult', () => { + const mockRaw = jest.mocked({source: 'the source'} as Raw); + const mockResult = jest.mocked({ + title: 'foo', + uri: 'http://uri.foo.com', + raw: mockRaw, + } as Result); const engine = buildSearchEngine({ configuration: getSampleSearchEngineConfiguration(), }); const bindings = {engine} as Bindings; - const result = TestUtils.buildMockResult({ - title: 'foo', - uri: 'http://uri.foo.com', - raw: { - ...TestUtils.buildMockResult().raw, - source: 'the source', - }, - }); it('should create string templates', () => { const templates = [ @@ -30,9 +29,9 @@ describe('buildStringTemplateFromResult', () => { ]; templates.forEach((template) => - expect(buildStringTemplateFromResult(template.in, result, bindings)).toBe( - template.out - ) + expect( + buildStringTemplateFromResult(template.in, mockResult, bindings) + ).toBe(template.out) ); }); @@ -41,7 +40,7 @@ describe('buildStringTemplateFromResult', () => { expect( buildStringTemplateFromResult( '${title}/${raw.notafield}', - result, + mockResult, bindings ) ).toBe('foo/'); diff --git a/packages/samples/angular/package.json b/packages/samples/angular/package.json index 6cb2194fbc6..8562c219ce0 100644 --- a/packages/samples/angular/package.json +++ b/packages/samples/angular/package.json @@ -28,14 +28,13 @@ "@angular-devkit/build-angular": "17.3.9", "@angular/cli": "17.3.9", "@angular/compiler-cli": "17.3.12", - "@types/jasmine": "5.1.4", "@types/node": "20.14.12", "@typescript-eslint/eslint-plugin": "^7.0.0", "cypress": "13.13.1", "cypress-repeat": "2.3.5", "gts": "5.3.1", + "jest": "29.7.0", "ncp": "2.0.0", - "typescript": "5.4.5", - "jest": "29.7.0" + "typescript": "5.4.5" } }