Merge pull request #71 from DivanteLtd/fix/tests-after-merge

Fix/tests after merge
vuestorefront · Oct 14, 2019 · f7ada61 · f7ada61
2 parents b84a263 + 678ac3f
commit f7ada61
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -11,6 +11,7 @@ module.exports = {
  coverageDirectory: "coverage",
  coverageReporters: ["html", "lcov", "text"],
  collectCoverageFrom: ["packages/*/src/**/*.ts"],
+ watchPathIgnorePatterns: ["/node_modules/"],
  moduleFileExtensions: ["ts", "tsx", "js", "json"],
  moduleNameMapper: {
  "^@shopware-pwa/(.*?)$": "<rootDir>/packages/$1/src"

diff --git a/packages/shopware-6-client/src/interfaces/models/checkout/customer/Customer.ts b/packages/shopware-6-client/src/interfaces/models/checkout/customer/Customer.ts
@@ -6,7 +6,7 @@ import { ShippingAddress } from "./ShippingAddress";
 import { BillingAddress } from "./BillingAddress";
 import { CustomerAddress } from "./CustomerAddress";
 import { Promotion } from "../promotion/Promotion";
-import { TagEntity } from "../../system/tag/Tag";
+import { Tag } from "../../system/tag/Tag";
 import { CustomField } from "../../common/CustomField";
 
 export interface Customer {
@@ -44,7 +44,7 @@ export interface Customer {
  addresses: Array<CustomerAddress>;
  orderCustomers: Array<OrderCustomer> | null;
  autoIncrement: number;
- tags: TagEntity[] | null;
+ tags: Tag[] | null;
  promotions: Promotion[] | null;
  customFields: CustomField[];
  productReviews: ProductReview[];

diff --git a/packages/shopware-6-client/src/interfaces/models/content/category/Category.ts b/packages/shopware-6-client/src/interfaces/models/content/category/Category.ts
@@ -3,7 +3,7 @@ import { Category } from "./Category";
 import { CmsPage } from "../cms/CmsPage";
 import { Product } from "../product/Product";
 import { Entity } from "../../common/Entity";
-import { TagEntity } from "../../system/tag/Tag";
+import { Tag } from "../../system/tag/Tag";
 import { CategoryTranslation } from "./CategoryTranslation";
 import { CustomField } from "../../common/CustomField";
 
@@ -25,7 +25,7 @@ export interface Category extends Entity {
  nestedProducts: Product[] | null;
  afterCategoryId: string | null;
  customFields: CustomField[];
- tags: TagEntity[] | null;
+ tags: Tag[] | null;
  cmsPageId: string | null;
  cmsPage: CmsPage | null;
  slotConfig: [] | null;

diff --git a/packages/shopware-6-client/src/interfaces/models/content/media/Media.ts b/packages/shopware-6-client/src/interfaces/models/content/media/Media.ts
@@ -6,7 +6,7 @@ import { MediaThumbnail } from "./MediaThumbnail";
 import { MediaFolder } from "./MediaFolder";
 import { PropertyGroupOption } from "../property/PropertyGroupOption";
 import { MailTemplateMedia } from "../mail-template/MailTemplateMedia";
-import { TagEntity } from "../../system/tag/Tag";
+import { Tag } from "../../system/tag/Tag";
 import { DocumentBaseConfig } from "../../checkout/document/DocumentBaseConfig";
 import { ShippingMethod } from "../../checkout/shipping/ShippingMethod";
 import { PaymentMethod } from "../../checkout/payment/PaymentMethod";
@@ -44,7 +44,7 @@ export interface Media {
  propertyGroupOptions: PropertyGroupOption[] | null;
  mailTemplateMedia: MailTemplateMedia[] | null;
  customFields: CustomField[];
- tags: TagEntity | null;
+ tags: Tag | null;
  thumbnailsRo: string | null;
  documentBaseConfigs: DocumentBaseConfig[] | null;
  shippingMethods: ShippingMethod[] | null;

diff --git a/packages/shopware-6-client/src/interfaces/models/content/product/Product.ts b/packages/shopware-6-client/src/interfaces/models/content/product/Product.ts
@@ -13,7 +13,7 @@ import { ProductManufacturer } from "./ProductManufacturer";
 import { ProductTranslation } from "./ProductTranslation";
 import { PropertyGroupOption } from "../property/PropertyGroupOption";
 import { Category } from "../category/Category";
-import { TagEntity } from "../../system/tag/Tag";
+import { Tag } from "../../system/tag/Tag";
 import { CustomField } from "../../common/CustomField";
 
 export interface Product {
@@ -74,7 +74,7 @@ export interface Product {
  media: ProductMedia[];
  translations: ProductTranslation[];
  categories: Category[];
- tags: TagEntity[];
+ tags: Tag[];
  properties: PropertyGroupOption[] | null;
  options: PropertyGroupOption[] | null;
  categoriesRo: Category[] | null;