excluding cypress tests from mocha and refactoring node_module paths #…

…753
bpatrik · Nov 16, 2023 · ee8a942 · ee8a942
1 parent a323634
commit ee8a942
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 31 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,8 +13,8 @@
     "create-release": "gulp create-release",
     "build-backend": "tsc",
     "pretest": "tsc",
-    "test": "ng test  && nyc mocha --recursive test",
-    "test-backend": "tsc && mocha --recursive test",
+    "test": "ng test  && nyc mocha --recursive test --exclude test/cypress/**/*.js",
+    "test-backend": "tsc && mocha --recursive test --exclude test/cypress/**/*.js",
     "coverage": "nyc report --reporter=lcov",
     "start": "node ./src/backend/index",
     "run-dev": "ng build  --configuration=dev",
@@ -112,7 +112,7 @@
     "codelyzer": "6.0.2",
     "core-js": "3.29.0",
     "coveralls": "3.1.1",
-    "cypress": "latest",
+    "cypress": "13.1.0",
     "deep-equal-in-any-order": "2.0.5",
     "ejs-loader": "0.5.0",
     "eslint": "8.36.0",

diff --git a/src/backend/middlewares/admin/SettingsMWs.ts b/src/backend/middlewares/admin/SettingsMWs.ts
@@ -3,7 +3,7 @@ import {ErrorCodes, ErrorDTO} from '../../../common/entities/Error';
 import {Logger} from '../../Logger';
 import {Config} from '../../../common/config/private/Config';
 import {ConfigDiagnostics} from '../../model/diagnostics/ConfigDiagnostics';
-import {ConfigClassBuilder} from '../../../../node_modules/typeconfig/node';
+import {ConfigClassBuilder} from 'typeconfig/node';
 import {TAGS} from '../../../common/config/public/ClientConfig';
 import {ObjectManagers} from '../../model/ObjectManagers';
 import {ExtensionConfigWrapper} from '../../model/extension/ExtensionConfigWrapper';

diff --git a/src/backend/model/extension/ExtensionConfigWrapper.ts b/src/backend/model/extension/ExtensionConfigWrapper.ts
@@ -1,6 +1,6 @@
-import {IConfigClass} from '../../../../node_modules/typeconfig/common';
+import {IConfigClass} from 'typeconfig/common';
 import {Config, PrivateConfigClass} from '../../../common/config/private/Config';
-import {ConfigClassBuilder} from '../../../../node_modules/typeconfig/node';
+import {ConfigClassBuilder} from 'typeconfig/node';
 import {IExtensionConfig} from './IExtension';
 import {Utils} from '../../../common/Utils';
 import {ObjectManagers} from '../ObjectManagers';

diff --git a/src/common/config/private/MessagingConfig.ts b/src/common/config/private/MessagingConfig.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-inferrable-types */
-import {SubConfigClass} from '../../../../node_modules/typeconfig/src/decorators/class/SubConfigClass';
+import {ConfigProperty, SubConfigClass} from 'typeconfig/common';
 import {ConfigPriority, TAGS} from '../public/ClientConfig';
-import {ConfigProperty} from '../../../../node_modules/typeconfig/src/decorators/property/ConfigPropoerty';
 
 declare let $localize: (s: TemplateStringsArray) => string;
 
@@ -96,6 +95,7 @@ export class EmailMessagingConfig {
   smtp?: EmailSMTPMessagingConfig = new EmailSMTPMessagingConfig();
 
 }
+
 @SubConfigClass<TAGS>({softReadonly: true})
 export class MessagingConfig {
   @ConfigProperty({

diff --git a/src/common/config/private/PrivateConfig.ts b/src/common/config/private/PrivateConfig.ts
@@ -26,8 +26,7 @@ import {
   ConfigPriority,
   TAGS
 } from '../public/ClientConfig';
-import {SubConfigClass} from 'typeconfig/src/decorators/class/SubConfigClass';
-import {ConfigProperty} from 'typeconfig/src/decorators/property/ConfigPropoerty';
+import {ConfigProperty, SubConfigClass} from 'typeconfig/common';
 import {DefaultsJobs} from '../../entities/job/JobDTO';
 import {SearchQueryDTO, SearchQueryTypes, TextSearch,} from '../../entities/SearchQueryDTO';
 import {SortByTypes} from '../../entities/SortingMethods';

diff --git a/src/frontend/app/ui/admin/admin.component.ts b/src/frontend/app/ui/admin/admin.component.ts
@@ -9,7 +9,7 @@ import {ConfigStyle, SettingsService} from '../settings/settings.service';
 import {ConfigPriority} from '../../../../common/config/public/ClientConfig';
 import {WebConfig} from '../../../../common/config/private/WebConfig';
 import {ISettingsComponent} from '../settings/template/ISettingsComponent';
-import {WebConfigClassBuilder} from '../../../../../node_modules/typeconfig/src/decorators/builders/WebConfigClassBuilder';
+import {WebConfigClassBuilder} from 'typeconfig/src/decorators/builders/WebConfigClassBuilder';
 import {enumToTranslatedArray} from '../EnumTranslations';
 import {PiTitleService} from '../../model/pi-title.service';
 

diff --git a/src/frontend/app/ui/gallery/blog/blog.gallery.component.ts b/src/frontend/app/ui/gallery/blog/blog.gallery.component.ts
@@ -1,6 +1,5 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {Component, EventEmitter, Input, Output,OnChanges} from '@angular/core';
 import {BlogService, GroupedMarkdown} from './blog.service';
-import {OnChanges} from '../../../../../../node_modules/@angular/core';
 import {map, Observable} from 'rxjs';
 
 @Component({

diff --git a/src/frontend/app/ui/gallery/search/search-field/search-field.gallery.component.ts b/src/frontend/app/ui/gallery/search/search-field/search-field.gallery.component.ts
@@ -4,7 +4,7 @@ import {AutoCompleteService} from '../autocomplete.service';
 import {SearchQueryDTO} from '../../../../../../common/entities/SearchQueryDTO';
 import {ControlValueAccessor, NG_VALIDATORS, NG_VALUE_ACCESSOR, ValidationErrors, Validator,} from '@angular/forms';
 import {SearchQueryParserService} from '../search-query-parser.service';
-import {BsModalRef, BsModalService,} from '../../../../../../../node_modules/ngx-bootstrap/modal';
+import {BsModalRef, BsModalService,} from 'ngx-bootstrap/modal';
 import {Utils} from '../../../../../../common/Utils';
 
 @Component({

diff --git a/src/frontend/app/ui/settings/settings.service.ts b/src/frontend/app/ui/settings/settings.service.ts
@@ -10,7 +10,7 @@ import {CookieService} from 'ngx-cookie-service';
 import {DefaultsJobs} from '../../../../common/entities/job/JobDTO';
 import {StatisticDTO} from '../../../../common/entities/settings/StatisticDTO';
 import {ScheduledJobsService} from './scheduled-jobs.service';
-import {IWebConfigClassPrivate} from '../../../../../node_modules/typeconfig/src/decorators/class/IWebConfigClass';
+import {IWebConfigClassPrivate} from 'typeconfig/src/decorators/class/IWebConfigClass';
 
 
 export enum ConfigStyle {

diff --git a/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.ts b/src/frontend/app/ui/settings/template/settings-entry/settings-entry.component.ts
@@ -16,7 +16,7 @@ import {ConfigStyle, SettingsService} from '../../settings.service';
 import {WebConfig} from '../../../../../../common/config/private/WebConfig';
 import {JobScheduleConfig, UserConfig} from '../../../../../../common/config/private/PrivateConfig';
 import {enumToTranslatedArray} from '../../../EnumTranslations';
-import {BsModalService} from '../../../../../../../node_modules/ngx-bootstrap/modal';
+import {BsModalService} from 'ngx-bootstrap/modal';
 import {CustomSettingsEntries} from '../CustomSettingsEntries';
 import {GroupByTypes, SortByTypes} from '../../../../../../common/entities/SortingMethods';
 

diff --git a/...ettings/template/settings-entry/sorting-method/sorting-method.settings-entry.component.ts b/...ettings/template/settings-entry/sorting-method/sorting-method.settings-entry.component.ts
@@ -5,12 +5,12 @@ import {
   NG_VALUE_ACCESSOR,
   ValidationErrors,
   Validator
-} from '../../../../../../../../node_modules/@angular/forms';
+} from '@angular/forms';
 import {SortByDirectionalTypes, SortingMethod} from '../../../../../../../common/entities/SortingMethods';
 import {enumToTranslatedArray} from '../../../../EnumTranslations';
 import {AutoCompleteService} from '../../../../gallery/search/autocomplete.service';
-import {RouterLink} from '../../../../../../../../node_modules/@angular/router';
-import {forwardRef} from '../../../../../../../../node_modules/@angular/core';
+import {RouterLink} from '@angular/router';
+import {forwardRef} from '@angular/core';
 import {Utils} from '../../../../../../../common/Utils';
 
 @Component({

diff --git a/src/frontend/app/ui/settings/template/template.component.ts b/src/frontend/app/ui/settings/template/template.component.ts
@@ -9,11 +9,11 @@ import {JobDTOUtils} from '../../../../../common/entities/job/JobDTO';
 import {ScheduledJobsService} from '../scheduled-jobs.service';
 import {UntypedFormControl} from '@angular/forms';
 import {Subscription} from 'rxjs';
-import {IWebConfigClassPrivate} from '../../../../../../node_modules/typeconfig/src/decorators/class/IWebConfigClass';
+import {IWebConfigClassPrivate} from 'typeconfig/src/decorators/class/IWebConfigClass';
 import {ConfigPriority, TAGS} from '../../../../../common/config/public/ClientConfig';
 import {Utils} from '../../../../../common/Utils';
 import {UserRoles} from '../../../../../common/entities/UserDTO';
-import {WebConfigClassBuilder} from '../../../../../../node_modules/typeconfig/src/decorators/builders/WebConfigClassBuilder';
+import {WebConfigClassBuilder} from 'typeconfig/web';
 import {ErrorDTO} from '../../../../../common/entities/Error';
 import {ISettingsComponent} from './ISettingsComponent';
 import {CustomSettingsEntries} from './CustomSettingsEntries';

diff --git a/test/backend/unit/middlewares/admin/SettingsMWs.ts b/test/backend/unit/middlewares/admin/SettingsMWs.ts
@@ -6,10 +6,10 @@ import {SettingsMWs} from '../../../../../src/backend/middlewares/admin/Settings
 import {ServerUserConfig} from '../../../../../src/common/config/private/PrivateConfig';
 import {Config} from '../../../../../src/common/config/private/Config';
 import {UserRoles} from '../../../../../src/common/entities/UserDTO';
-import {ConfigClassBuilder} from '../../../../../node_modules/typeconfig/node';
 import * as fs from 'fs';
 import * as path from 'path';
 import {ExtensionConfigWrapper} from '../../../../../src/backend/model/extension/ExtensionConfigWrapper';
+import {ConfigClassBuilder} from 'typeconfig/node';
 
 
 declare const describe: any;