Browse Source

chore: Fix testing issues

Michael Bromley 2 years ago
parent
commit
2c6121d0ff

+ 1 - 0
.github/workflows/build_and_test.yml

@@ -108,6 +108,7 @@ jobs:
           - 9200
         options: --health-cmd="curl --silent --fail localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=3
     strategy:
+      fail-fast: false
       matrix:
         db: [sqljs, mariadb, mysql, postgres]
     steps:

+ 10 - 10
packages/admin-ui/src/lib/core/src/providers/nav-builder/nav-builder.service.spec.ts

@@ -16,7 +16,7 @@ describe('NavBuilderService', () => {
     it('defineNavMenuSections', done => {
         service.defineNavMenuSections(getBaseNav());
 
-        service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+        service.menuConfig$.pipe(take(1)).subscribe(result => {
             expect(result).toEqual(getBaseNav());
             done();
         });
@@ -31,7 +31,7 @@ describe('NavBuilderService', () => {
                 items: [],
             });
 
-            service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+            service.menuConfig$.pipe(take(1)).subscribe(result => {
                 expect(result.map(section => section.id)).toEqual(['catalog', 'sales', 'reports']);
                 done();
             });
@@ -48,7 +48,7 @@ describe('NavBuilderService', () => {
                 'sales',
             );
 
-            service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+            service.menuConfig$.pipe(take(1)).subscribe(result => {
                 expect(result.map(section => section.id)).toEqual(['catalog', 'reports', 'sales']);
                 done();
             });
@@ -62,7 +62,7 @@ describe('NavBuilderService', () => {
                 items: [],
             });
 
-            service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+            service.menuConfig$.pipe(take(1)).subscribe(result => {
                 expect(result.map(section => section.id)).toEqual(['catalog', 'sales']);
                 expect(result[1].label).toBe('Custom Sales');
                 done();
@@ -80,7 +80,7 @@ describe('NavBuilderService', () => {
                 'catalog',
             );
 
-            service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+            service.menuConfig$.pipe(take(1)).subscribe(result => {
                 expect(result.map(section => section.id)).toEqual(['sales', 'catalog']);
                 expect(result[0].label).toBe('Custom Sales');
                 done();
@@ -101,7 +101,7 @@ describe('NavBuilderService', () => {
                 'farm-tools',
             );
 
-            service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+            service.menuConfig$.pipe(take(1)).subscribe(result => {
                 expect(console.error).toHaveBeenCalledWith(
                     'Could not add menu item "fulfillments", section "farm-tools" does not exist',
                 );
@@ -120,7 +120,7 @@ describe('NavBuilderService', () => {
                 'sales',
             );
 
-            service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+            service.menuConfig$.pipe(take(1)).subscribe(result => {
                 const salesSection = result.find(r => r.id === 'sales')!;
 
                 expect(salesSection.items.map(item => item.id)).toEqual(['orders', 'fulfillments']);
@@ -140,7 +140,7 @@ describe('NavBuilderService', () => {
                 'orders',
             );
 
-            service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+            service.menuConfig$.pipe(take(1)).subscribe(result => {
                 const salesSection = result.find(r => r.id === 'sales')!;
 
                 expect(salesSection.items.map(item => item.id)).toEqual(['fulfillments', 'orders']);
@@ -159,7 +159,7 @@ describe('NavBuilderService', () => {
                 'catalog',
             );
 
-            service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+            service.menuConfig$.pipe(take(1)).subscribe(result => {
                 const catalogSection = result.find(r => r.id === 'catalog')!;
 
                 expect(catalogSection.items.map(item => item.id)).toEqual(['products', 'facets']);
@@ -180,7 +180,7 @@ describe('NavBuilderService', () => {
                 'products',
             );
 
-            service.mainMenuConfig$.pipe(take(1)).subscribe(result => {
+            service.menuConfig$.pipe(take(1)).subscribe(result => {
                 const catalogSection = result.find(r => r.id === 'catalog')!;
 
                 expect(catalogSection.items.map(item => item.id)).toEqual(['facets', 'products']);

+ 4 - 4
packages/admin-ui/src/lib/core/src/shared/pipes/locale-date.pipe.spec.ts

@@ -6,15 +6,15 @@ describe('LocaleDatePipe', () => {
     const testDate = new Date('2021-01-12T09:12:42');
     it('medium format', () => {
         const pipe = new LocaleDatePipe();
-        expect(pipe.transform(testDate, 'medium', LanguageCode.en)).toBe('Jan 12, 2021, 9:12:42AM');
+        expect(pipe.transform(testDate, 'medium', LanguageCode.en)).toBe('Jan 12, 2021, 9:12:42 AM');
     });
     it('mediumTime format', () => {
         const pipe = new LocaleDatePipe();
-        expect(pipe.transform(testDate, 'mediumTime', LanguageCode.en)).toBe('9:12:42AM');
+        expect(pipe.transform(testDate, 'mediumTime', LanguageCode.en)).toBe('9:12:42 AM');
     });
     it('short format', () => {
         const pipe = new LocaleDatePipe();
-        expect(pipe.transform(testDate, 'short', LanguageCode.en)).toBe('1/12/21, 9:12AM');
+        expect(pipe.transform(testDate, 'short', LanguageCode.en)).toBe('1/12/21, 9:12 AM');
     });
     it('longDate format', () => {
         const pipe = new LocaleDatePipe();
@@ -23,7 +23,7 @@ describe('LocaleDatePipe', () => {
 
     it('medium format German', () => {
         const pipe = new LocaleDatePipe();
-        expect(pipe.transform(testDate, 'medium', LanguageCode.de)).toBe('12. Jan. 2021, 9:12:42AM');
+        expect(pipe.transform(testDate, 'medium', LanguageCode.de)).toBe('12. Jan. 2021, 9:12:42 AM');
     });
 
     it('medium format Chinese', () => {

+ 8 - 1
packages/core/vitest.config.ts

@@ -6,6 +6,13 @@ export default defineConfig({
         // SWC required to support decorators used in test plugins
         // See https://github.com/vitest-dev/vitest/issues/708#issuecomment-1118628479
         // Vite plugin
-        swc.vite(),
+        swc.vite({
+            jsc: {
+                transform: {
+                    // See https://github.com/vendure-ecommerce/vendure/issues/2099
+                    useDefineForClassFields: false,
+                },
+            },
+        }),
     ],
 });