generator-jhipster 7.2.0 → 7.4.1

package/generators/client/index.js

@@ -22,9 +22,11 @@ const _ = require('lodash');
 const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const prompts = require('./prompts');
 const writeAngularFiles = require('./files-angular').writeFiles;
-const writeReactFiles = require('./files-react').writeFiles;
-const { writeFiles: writeVueFiles, customizeFiles: customizeVueFiles } = require('./files-vue');
+const { cleanup: cleanupReact, writeFiles: writeReactFiles } = require('./files-react');
+const { cleanup: cleanupVue, writeFiles: writeVueFiles, customizeFiles: customizeVueFiles } = require('./files-vue');
 const writeCommonFiles = require('./files-common').writeFiles;
+const { clientI18nFiles } = require('../languages/files');
+
 const packagejs = require('../../package.json');
 const constants = require('../generator-constants');
 const statistics = require('../statistics');
@@ -42,8 +44,6 @@ const { CommonDBTypes } = require('../../jdl/jhipster/field-types');
 const TYPE_STRING = CommonDBTypes.STRING;
 const TYPE_UUID = CommonDBTypes.UUID;
 
-let useBlueprints;
-
 module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, { unique: 'namespace', ...features });
@@ -74,8 +74,12 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
     this.loadRuntimeOptions();
 
     this.existingProject = !!this.jhipsterConfig.clientFramework;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_CLIENT);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_CLIENT);
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -106,7 +110,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -122,7 +126,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -158,32 +162,32 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
   // Public API method used by the getter and also by Blueprints
   _composing() {
     return {
-      composeCommon() {
-        this.composeWithJHipster(GENERATOR_COMMON, true);
+      async composeCommon() {
+        await this.composeWithJHipster(GENERATOR_COMMON, true);
       },
-      composeCypress() {
+      async composeCypress() {
         const testFrameworks = this.jhipsterConfig.testFrameworks;
         if (!Array.isArray(testFrameworks) || !testFrameworks.includes(CYPRESS)) return;
-        this.composeWithJHipster(GENERATOR_CYPRESS, { existingProject: this.existingProject }, true);
+        await this.composeWithJHipster(GENERATOR_CYPRESS, { existingProject: this.existingProject }, true);
       },
-      composeLanguages() {
+      async composeLanguages() {
         // We don't expose client/server to cli, composing with languages is used for test purposes.
         if (this.jhipsterConfig.enableTranslation === false) return;
 
-        this.composeWithJHipster(GENERATOR_LANGUAGES, true);
+        await this.composeWithJHipster(GENERATOR_LANGUAGES, true);
       },
     };
   }
 
   get composing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._composing();
   }
 
@@ -200,12 +204,6 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
         this.loadTranslationConfig();
       },
 
-      checkMicrofrontend() {
-        if (this.microfrontend && !this.clientFrameworkAngular) {
-          throw new Error(`Microfrontend requires ${ANGULAR} client framework.`);
-        }
-      },
-
       validateSkipServer() {
         if (
           this.jhipsterConfig.skipServer &&
@@ -241,7 +239,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -264,11 +262,24 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
           this.skipUserManagement = true;
         }
       },
+
+      async loadNativeLanguage() {
+        if (!this.jhipsterConfig.baseName) return;
+        const context = {};
+        this.loadAppConfig(undefined, context);
+        this.loadDerivedAppConfig(context);
+        this.loadClientConfig(undefined, context);
+        this.loadDerivedClientConfig(context);
+        this.loadServerConfig(undefined, context);
+        this.loadPlatformConfig(undefined, context);
+        this.loadTranslationConfig(undefined, context);
+        await this._loadClientTranslations(context);
+      },
     };
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -285,6 +296,14 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
         this.userPrimaryKeyTypeUUID = this.user.primaryKey.type === TYPE_UUID;
       },
 
+      loadEntities() {
+        if (!this.configOptions.sharedEntities) {
+          this.localEntities = [];
+          return;
+        }
+        this.localEntities = Object.values(this.configOptions.sharedEntities).filter(entity => !entity.builtIn && !entity.skipClient);
+      },
+
       insight() {
         statistics.sendSubGenEvent('generator', GENERATOR_CLIENT, {
           app: {
@@ -299,29 +318,32 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
   // Public API method used by the getter and also by Blueprints
   _writing() {
     return {
+      cleanupReact,
+      cleanupVue,
+
       write() {
         if (this.skipClient) return;
         switch (this.clientFramework) {
           case ANGULAR:
-            return writeAngularFiles.call(this, useBlueprints);
+            return writeAngularFiles.call(this);
           case REACT:
-            return writeReactFiles.call(this, useBlueprints);
+            return writeReactFiles.call(this);
           case VUE:
-            return writeVueFiles.call(this, useBlueprints);
+            return writeVueFiles.call(this);
           default:
           // do nothing by default
         }
       },
       writeCommonFiles() {
         if (this.skipClient) return;
-        return writeCommonFiles.call(this, useBlueprints);
+        return writeCommonFiles.call(this);
       },
 
       ...super._missingPostWriting(),
@@ -329,7 +351,7 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -368,13 +390,19 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
 
       microfrontend() {
         if (!this.microfrontend) return;
-        this.addWebpackConfig("require('./webpack.microfrontend')(config, options, targetOptions)");
+        if (this.clientFrameworkAngular) {
+          this.addWebpackConfig("require('./webpack.microfrontend')(config, options, targetOptions)");
+        } else if (this.clientFrameworkVue) {
+          this.addWebpackConfig("require('./webpack.microfrontend')({ serve: options.env.WEBPACK_SERVE })");
+        } else {
+          throw new Error(`Client framework ${this.clientFramework} doesn't support microfrontends`);
+        }
       },
     };
   }
 
   get postWriting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._postWriting();
   }
 
@@ -396,7 +424,61 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
+
+  /**
+   * @experimental
+   * Load client native translation.
+   */
+  async _loadClientTranslations(configContext = this) {
+    configContext.clientTranslations = this.configOptions.clientTranslations;
+    if (configContext.clientTranslations) {
+      this.clientTranslations = configContext.clientTranslations;
+      return;
+    }
+    const { nativeLanguage } = configContext;
+    this.clientTranslations = configContext.clientTranslations = this.configOptions.clientTranslations = {};
+    const rootTemplatesPath = this.fetchFromInstalledJHipster('languages/templates/');
+
+    // Prepare and load en translation
+    const translationFiles = await this.writeFiles({
+      sections: clientI18nFiles,
+      rootTemplatesPath,
+      context: {
+        ...configContext,
+        lang: 'en',
+        clientSrcDir: '__tmp__',
+      },
+    });
+
+    // Prepare and load native translation
+    configContext.lang = configContext.nativeLanguage;
+    if (nativeLanguage && nativeLanguage !== 'en') {
+      translationFiles.push(
+        ...(await this.writeFiles({
+          sections: clientI18nFiles,
+          rootTemplatesPath,
+          context: {
+            ...configContext,
+            lang: configContext.nativeLanguage,
+            clientSrcDir: '__tmp__',
+          },
+        }))
+      );
+    }
+    for (const translationFile of translationFiles) {
+      _.merge(this.clientTranslations, this.readDestinationJSON(translationFile));
+      delete this.env.sharedFs.get(translationFile).state;
+    }
+  }
+
+  /**
+   * @experimental
+   * Get translation value for a key.
+   */
+  _getClientTranslation(translationKey) {
+    return _.get(this.clientTranslations, translationKey, `Translation missing for ${translationKey}`);
+  }
 };

package/generators/client/needle-api/needle-client-angular.js

@@ -236,7 +236,7 @@ module.exports = class extends needleClientBase {
 
       if (!isSpecificEntityAlreadyGenerated) {
         const modulePath =
-          this.generator.jhipsterConfig.microfrontend && this.generator.jhipsterConfig.applicationType === 'gateway' && microserviceName
+          this.generator.microfrontend && this.generator.applicationTypeGateway && microserviceName
             ? `${microserviceName}/${entityFileName}`
             : `./${entityFolderName}/${entityFileName}.module`;
         const moduleName = microserviceName

package/generators/client/needle-api/needle-client-vue.js

@@ -24,7 +24,17 @@ const needleClientBase = require('./needle-client');
 module.exports = class extends needleClientBase {
   addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue = _.startCase(routerName)) {
     const errorMessage = `${chalk.yellow('Reference to ') + routerName} ${chalk.yellow('not added to menu.\n')}`;
-    const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/core/jhi-navbar/jhi-navbar.vue`;
+    const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/entities/entities-menu.vue`;
+
+    const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(
+      filePath,
+      `<b-dropdown-item to="/${routerName}">`,
+      this.generator
+    );
+    if (isSpecificEntityAlreadyGenerated) {
+      return;
+    }
+
     const menuI18nTitle = enableTranslation ? ` v-text="$t('global.menu.entities.${entityTranslationKeyMenu}')"` : '';
     const entityEntry =
       // prettier-ignore
@@ -41,6 +51,16 @@ module.exports = class extends needleClientBase {
   addEntityToRouterImport(entityName, fileName, folderName, readOnly) {
     const errorMessage = `${chalk.yellow('Reference to entity ') + entityName} ${chalk.yellow('not added to router entities import.\n')}`;
     const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/router/entities.ts`;
+
+    const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(
+      filePath,
+      `import('@/entities/${folderName}/${fileName}.vue');`,
+      this.generator
+    );
+    if (isSpecificEntityAlreadyGenerated) {
+      return;
+    }
+
     let entityEntry;
     if (!readOnly) {
       // prettier-ignore
@@ -70,8 +90,7 @@ module.exports = class extends needleClientBase {
     const errorMessage = `${chalk.yellow('Reference to entity ') + entityName} ${chalk.yellow('not added to router entities.\n')}`;
     const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/router/entities.ts`;
 
-    const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(filePath, `path: '/${entityFileName}'`, this.generator);
-
+    const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile(filePath, `path: '${entityFileName}'`, this.generator);
     if (isSpecificEntityAlreadyGenerated) {
       return;
     }
@@ -81,25 +100,25 @@ module.exports = class extends needleClientBase {
       // prettier-ignore
       entityEntry = this.generator.stripMargin(
                 `|{
-                |    path: '/${entityFileName}',
+                |    path: '${entityFileName}',
                 |    name: '${entityName}',
                 |    component: ${entityName},
                 |    meta: { authorities: [Authority.USER] }
                 |  },
                 |  {
-                |    path: '/${entityFileName}/new',
+                |    path: '${entityFileName}/new',
                 |    name: '${entityName}Create',
                 |    component: ${entityName}Update,
                 |    meta: { authorities: [Authority.USER] }
                 |  },
                 |  {
-                |    path: '/${entityFileName}/:${entityInstance}Id/edit',
+                |    path: '${entityFileName}/:${entityInstance}Id/edit',
                 |    name: '${entityName}Edit',
                 |    component: ${entityName}Update,
                 |    meta: { authorities: [Authority.USER] }
                 |  },
                 |  {
-                |    path: '/${entityFileName}/:${entityInstance}Id/view',
+                |    path: '${entityFileName}/:${entityInstance}Id/view',
                 |    name: '${entityName}View',
                 |    component: ${entityName}Details,
                 |    meta: { authorities: [Authority.USER] }
@@ -124,6 +143,7 @@ module.exports = class extends needleClientBase {
     }
 
     const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-add-entity-to-router', entityEntry);
+    rewriteFileModel.prettierAware = true;
     this.addBlockContentToFile(rewriteFileModel, errorMessage);
   }
 
@@ -152,4 +172,34 @@ module.exports = class extends needleClientBase {
     const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-add-entity-service-to-main', entityEntry);
     this.addBlockContentToFile(rewriteFileModel, errorMessage);
   }
+
+  addEntityServiceToEntitiesComponentImport(entityName, entityClass, entityFileName, entityFolderName) {
+    const errorMessage = `${chalk.yellow('Reference to entity ') + entityClass} ${chalk.yellow(
+      'not added to import in entities component.\n'
+    )}`;
+    const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/entities/entities.component.ts`;
+
+    // prettier-ignore
+    const entityEntry = `import ${entityName}Service from './${entityFolderName}/${entityFileName}.service';`;
+
+    const rewriteFileModel = this.generateFileModel(
+      filePath,
+      'jhipster-needle-add-entity-service-to-entities-component-import',
+      entityEntry
+    );
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
+
+  addEntityServiceToEntitiesComponent(entityInstance, entityName) {
+    const errorMessage = `${chalk.yellow('Reference to entity ') + entityName} ${chalk.yellow(
+      'not added to service in entities component.\n'
+    )}`;
+    const filePath = `${this.CLIENT_MAIN_SRC_DIR}/app/entities/entities.component.ts`;
+
+    // prettier-ignore
+    const entityEntry = `@Provide('${entityInstance}Service') private ${entityInstance}Service = () => new ${entityName}Service();`;
+
+    const rewriteFileModel = this.generateFileModel(filePath, 'jhipster-needle-add-entity-service-to-entities-component', entityEntry);
+    this.addBlockContentToFile(rewriteFileModel, errorMessage);
+  }
 };

package/generators/client/templates/angular/.eslintrc.json.ejs

@@ -92,6 +92,7 @@
     "@typescript-eslint/no-parameter-properties": ["warn", { "allows": ["public", "private", "protected"] }],
     "@typescript-eslint/no-shadow": ["error"],
     "@typescript-eslint/no-unnecessary-condition": "error",
+    "@typescript-eslint/no-unsafe-argument": "off",
     "@typescript-eslint/no-unsafe-assignment": "off",
     "@typescript-eslint/no-unsafe-call": "off",
     "@typescript-eslint/no-unsafe-member-access": "off",

package/generators/client/templates/angular/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@angular/common": "12.2.5",
-    "bootstrap": "4.6.0",
+    "@angular/common": "12.2.12",
+    "bootstrap": "4.6.1",
     "@fortawesome/angular-fontawesome": "0.9.0",
     "@fortawesome/fontawesome-svg-core": "1.2.36",
     "@fortawesome/free-solid-svg-icons": "5.15.4",
@@ -12,37 +12,37 @@
     "ngx-infinite-scroll": "10.0.1",
     "ngx-webstorage": "8.0.0",
     "rxjs": "6.6.7",
-    "swagger-ui-dist": "3.52.2",
+    "swagger-ui-dist": "4.1.2",
     "tslib": "2.3.1",
     "zone.js": "0.11.4"
   },
   "devDependencies": {
-    "@angular/cli": "12.2.5",
-    "@angular-builders/custom-webpack": "12.1.2",
+    "@angular/cli": "12.2.12",
+    "@angular-builders/custom-webpack": "12.1.3",
     "@angular-builders/jest": "12.1.2",
-    "@angular-eslint/eslint-plugin": "12.4.1",
-    "@types/node": "16.9.1",
-    "@types/jest": "27.0.1",
-    "@typescript-eslint/eslint-plugin": "4.31.1",
-    "browser-sync": "2.27.5",
+    "@angular-eslint/eslint-plugin": "12.7.0",
+    "@types/node": "16.11.11",
+    "@types/jest": "27.0.3",
+    "@typescript-eslint/eslint-plugin": "5.5.0",
+    "browser-sync": "2.27.7",
     "browser-sync-webpack-plugin": "2.3.0",
-    "copy-webpack-plugin": "9.0.1",
+    "copy-webpack-plugin": "10.0.0",
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.3.0",
-    "eslint-webpack-plugin": "3.0.1",
+    "eslint-webpack-plugin": "3.1.1",
     "folder-hash": "4.0.1",
-    "jest": "27.2.0",
-    "jest-preset-angular": "9.0.7",
+    "jest": "27.4.3",
+    "jest-preset-angular": "10.1.0",
     "jest-date-mock": "1.0.8",
-    "jest-junit": "12.2.0",
+    "jest-junit": "13.0.0",
     "jest-sonar-reporter": "2.0.0",
-    "merge-jsons-webpack-plugin": "1.0.21",
+    "merge-jsons-webpack-plugin": "2.0.1",
     "rimraf": "3.0.2",
-    "ts-jest": "27.0.5",
+    "ts-jest": "27.0.7",
     "typescript": "4.3.5",
     "webpack": "5.50.0",
-    "webpack-bundle-analyzer": "4.4.2",
+    "webpack-bundle-analyzer": "4.5.0",
     "webpack-merge": "5.8.0",
-    "webpack-notifier": "1.13.0"
+    "webpack-notifier": "1.14.1"
   }
 }

package/generators/client/templates/angular/package.json.ejs

@@ -20,7 +20,7 @@
 {
   "name": "<%= dasherizedBaseName %>",
   "version": "0.0.1-SNAPSHOT",
-  "description": "Description for <%= baseName %>",
+  "description": "<%= projectDescription %>",
   "private": true,
   "license": "UNLICENSED",
   "cacheDirectories": [
@@ -175,6 +175,7 @@
     "test": "ng test --coverage --log-heap-usage -w=2",
     "test:watch": "<%= clientPackageManager %> run test -- --watch",
     "watch": "concurrently npm:start<% if(!skipServer) { %> npm:backend:start<% } %>",
+    "build-watch": "concurrently 'npm run webapp:build:dev -- --watch'<% if(!skipServer) { %> npm:backend:start<% } %>",
     "webapp:build": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:dev",
     "webapp:build:dev": "ng build --configuration development",
     "webapp:build:prod": "ng build --configuration production",

package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs

@@ -24,68 +24,66 @@ import { of, throwError } from 'rxjs';
 import { ActivateService } from './activate.service';
 import { ActivateComponent } from './activate.component';
 
-describe('Component Tests', () => {
-  describe('ActivateComponent', () => {
-    let comp: ActivateComponent;
-
-    beforeEach(
-      waitForAsync(() => {
-        TestBed.configureTestingModule({
-          imports: [HttpClientTestingModule],
-          declarations: [ActivateComponent],
-          providers: [
-            {
-              provide: ActivatedRoute,
-              useValue: { queryParams: of({ key: 'ABC123' }) },
-            },
-          ],
-        })
-          .overrideTemplate(ActivateComponent, '')
-          .compileComponents();
+describe('ActivateComponent', () => {
+  let comp: ActivateComponent;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        declarations: [ActivateComponent],
+        providers: [
+          {
+            provide: ActivatedRoute,
+            useValue: { queryParams: of({ key: 'ABC123' }) },
+          },
+        ],
       })
-    );
-
-    beforeEach(() => {
-      const fixture = TestBed.createComponent(ActivateComponent);
-      comp = fixture.componentInstance;
-    });
+        .overrideTemplate(ActivateComponent, '')
+        .compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    const fixture = TestBed.createComponent(ActivateComponent);
+    comp = fixture.componentInstance;
+  });
 
-    it('calls activate.get with the key from params', inject(
-      [ActivateService],
-      fakeAsync((service: ActivateService) => {
-        jest.spyOn(service, 'get').mockReturnValue(of());
+  it('calls activate.get with the key from params', inject(
+    [ActivateService],
+    fakeAsync((service: ActivateService) => {
+      jest.spyOn(service, 'get').mockReturnValue(of());
 
-        comp.ngOnInit();
-        tick();
+      comp.ngOnInit();
+      tick();
 
-        expect(service.get).toHaveBeenCalledWith('ABC123');
-      })
-    ));
+      expect(service.get).toHaveBeenCalledWith('ABC123');
+    })
+  ));
 
-    it('should set set success to true upon successful activation', inject(
-      [ActivateService],
-      fakeAsync((service: ActivateService) => {
-        jest.spyOn(service, 'get').mockReturnValue(of({}));
+  it('should set set success to true upon successful activation', inject(
+    [ActivateService],
+    fakeAsync((service: ActivateService) => {
+      jest.spyOn(service, 'get').mockReturnValue(of({}));
 
-        comp.ngOnInit();
-        tick();
+      comp.ngOnInit();
+      tick();
 
-        expect(comp.error).toBe(false);
-        expect(comp.success).toBe(true);
-      })
-    ));
+      expect(comp.error).toBe(false);
+      expect(comp.success).toBe(true);
+    })
+  ));
 
-    it('should set set error to true upon activation failure', inject(
-      [ActivateService],
-      fakeAsync((service: ActivateService) => {
-        jest.spyOn(service, 'get').mockReturnValue(throwError('ERROR'));
+  it('should set set error to true upon activation failure', inject(
+    [ActivateService],
+    fakeAsync((service: ActivateService) => {
+      jest.spyOn(service, 'get').mockReturnValue(throwError('ERROR'));
 
-        comp.ngOnInit();
-        tick();
+      comp.ngOnInit();
+      tick();
 
-        expect(comp.error).toBe(true);
-        expect(comp.success).toBe(false);
-      })
-    ));
-  });
+      expect(comp.error).toBe(true);
+      expect(comp.success).toBe(false);
+    })
+  ));
 });