Merge branch 'master' into feature/org-admin-refresh

libs/components/jest.config.js

@@ -2,14 +2,13 @@ const { pathsToModuleNameMapper } = require("ts-jest");
 
 const { compilerOptions } = require("./tsconfig");
 
+const sharedConfig = require("../../libs/shared/jest.config.base");
+
 module.exports = {
+  ...sharedConfig,
   displayName: "libs/components tests",
   preset: "jest-preset-angular",
-  testMatch: ["**/+(*.)+(spec).+(ts)"],
-  setupFilesAfterEnv: ["<rootDir>/spec/test.setup.ts"],
-  collectCoverage: true,
-  coverageReporters: ["html", "lcov"],
-  coverageDirectory: "coverage",
+  setupFilesAfterEnv: ["<rootDir>/test.setup.ts"],
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),

libs/components/src/button/button.directive.ts

@@ -61,11 +61,11 @@ export class ButtonDirective {
       "focus:tw-z-10",
     ]
       .concat(this.block ? ["tw-w-full", "tw-block"] : ["tw-inline-block"])
-      .concat(buttonStyles[this.buttonType] ?? []);
+      .concat(buttonStyles[this.buttonType ?? "secondary"]);
   }
 
   @Input()
-  buttonType: ButtonTypes = "secondary";
+  buttonType: ButtonTypes = null;
 
   @Input()
   block = false;

libs/components/tsconfig.spec.json

@@ -1,3 +1,4 @@
 {
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "files": ["./test.setup.ts"]
 }