Skip to content
Snippets Groups Projects
Commit f20e6e36 authored by OZGCloud's avatar OZGCloud
Browse files

Merge remote-tracking branch 'origin/master' into OZG-Angular14

parents 36f4f39f 9ba514fb
No related branches found
No related tags found
No related merge requests found
...@@ -13,14 +13,13 @@ describe('FormatToPrettyDatePipe', () => { ...@@ -13,14 +13,13 @@ describe('FormatToPrettyDatePipe', () => {
}); });
//TODO: Test stabiler machen
it('should return formatted for this year', () => { it('should return formatted for this year', () => {
const date: Date = new Date(); const year: number = new Date().getFullYear();
date.setDate(date.getDate() + 3); const date: Date = new Date(year + '-01-01');
const result: string = pipe.transform(date); const result: string = pipe.transform(date);
expect(result.length).toBeLessThan(9); expect(result).toBe('01. Jan.');
}) })
it('should format in "dd.MM.yyyy"', () => { it('should format in "dd.MM.yyyy"', () => {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>de.itvsh.ozg</groupId> <groupId>de.itvsh.ozg</groupId>
<artifactId>goofy</artifactId> <artifactId>goofy</artifactId>
<version>0.29.0-SNAPSHOT</version> <version>0.30.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>de.itvsh.ozg</groupId> <groupId>de.itvsh.ozg</groupId>
<artifactId>goofy</artifactId> <artifactId>goofy</artifactId>
<version>0.29.0-SNAPSHOT</version> <version>0.30.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>goofy-server</artifactId> <artifactId>goofy-server</artifactId>
......
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<groupId>de.itvsh.ozg</groupId> <groupId>de.itvsh.ozg</groupId>
<artifactId>goofy</artifactId> <artifactId>goofy</artifactId>
<version>0.29.0-SNAPSHOT</version> <version>0.30.0-SNAPSHOT</version>
<name>Goofy Parent</name> <name>Goofy Parent</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>de.itvsh.kop.common</groupId> <groupId>de.itvsh.kop.common</groupId>
<artifactId>kop-common-parent</artifactId> <artifactId>kop-common-parent</artifactId>
<version>1.1.3</version> <version>1.1.5</version>
</parent> </parent>
<modules> <modules>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<pluto.version>0.29.0-SNAPSHOT</pluto.version> <pluto.version>0.30.0-SNAPSHOT</pluto.version>
<jsoup.version>1.15.1</jsoup.version> <jsoup.version>1.15.1</jsoup.version>
</properties> </properties>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment