From 0dabace1670a0532d78dce3a72be7a8218b0197e Mon Sep 17 00:00:00 2001 From: eromano Date: Fri, 29 Jul 2022 17:09:53 +0200 Subject: [PATCH] fix unit test and storybook Signed-off-by: eromano --- .travis.yml | 2 +- angular.json | 23 ++++++++----------- .../widgets/core/form.model.spec.ts | 2 +- .../display-rich-text.widget.spec.ts | 2 +- package.json | 2 +- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8638504962..f8853030f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -130,7 +130,7 @@ jobs: script: # Build Demo shell & Storybook for production docker" - NODE_OPTIONS=--max_old_space_size=8192 nx build demoshell --configuration production - - NODE_OPTIONS=--max_old_space_size=8192 nx run stories:build-storybook --configuration ci --projectBuildConfig=stories:build-storybook + - NODE_OPTIONS=--max_old_space_size=8192 nx run stories:build-storybook --configuration ci - ./scripts/travis/release/release-docker.sh workspaces: create: diff --git a/angular.json b/angular.json index a328abf817..884956c1d7 100644 --- a/angular.json +++ b/angular.json @@ -807,13 +807,11 @@ "projectType": "library", "architect": { "storybook": { - "builder": "@nrwl/storybook:storybook", + "builder": "@storybook/angular:start-storybook", "options": { - "uiFramework": "@storybook/angular", + "browserTarget": "stories:build-storybook", "port": 4400, - "config": { - "configFolder": "lib/stories/.storybook" - } + "configFolder": "lib/stories/.storybook" }, "configurations": { "ci": { @@ -822,16 +820,13 @@ } }, "build-storybook": { - "builder": "@nrwl/storybook:build", - "outputs": [ - "{options.outputPath}" - ], + "builder": "@storybook/angular:build-storybook", + "outputs": ["{options.outputPath}"], "options": { - "uiFramework": "@storybook/angular", - "outputPath": "dist/storybook/stories", - "config": { - "configFolder": "lib/stories/.storybook" - } + "outputDir": "dist/storybook/stories", + "configDir": "lib/stories/.storybook", + "browserTarget": "stories:build-storybook", + "compodoc": false }, "configurations": { "ci": { diff --git a/lib/core/src/lib/form/components/widgets/core/form.model.spec.ts b/lib/core/src/lib/form/components/widgets/core/form.model.spec.ts index bb6ff1bab2..c65760fc7c 100644 --- a/lib/core/src/lib/form/components/widgets/core/form.model.spec.ts +++ b/lib/core/src/lib/form/components/widgets/core/form.model.spec.ts @@ -24,7 +24,7 @@ import { FormFieldModel } from './form-field.model'; import { FormOutcomeModel } from './form-outcome.model'; import { FormModel } from './form.model'; import { TabModel } from './tab.model'; -import { cloudFormMock, fakeMetadataForm, fakeViewerForm } from '../../mock/form.mock'; +import { fakeMetadataForm, fakeViewerForm } from '../../mock/form.mock'; import { Node } from '@alfresco/js-api'; import { UploadWidgetContentLinkModel } from './upload-widget-content-link.model'; import { AlfrescoApiService } from '../../../../services'; diff --git a/lib/core/src/lib/form/components/widgets/display-rich-text/display-rich-text.widget.spec.ts b/lib/core/src/lib/form/components/widgets/display-rich-text/display-rich-text.widget.spec.ts index 77e507e549..40de5aac7e 100644 --- a/lib/core/src/lib/form/components/widgets/display-rich-text/display-rich-text.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/display-rich-text/display-rich-text.widget.spec.ts @@ -1,7 +1,7 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { CoreTestingModule, setupTestBed } from 'core/testing'; +import { CoreTestingModule, setupTestBed } from '../../../../testing'; import { DisplayRichTextWidgetComponent } from './display-rich-text.widget'; diff --git a/package.json b/package.json index 42f0a71e6e..d218556977 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "@paperist/types-remark": "0.1.3", "@playwright/test": "^1.20.0", "@quanzo/change-font-size": "1.0.0", - "@storybook/addon-essentials": "6.5.9", + "@storybook/addon-essentials": "^6.5.9", "@storybook/angular": "6.5.9", "@storybook/builder-webpack5": "6.5.9", "@storybook/manager-webpack5": "6.5.9",