chore(unit-tests): fix granularities tests (#9192)

KSDaemon · web-flow · commit 2a0a5f2c7029 · 2025-02-06T14:11:52.000+02:00
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,5 +1,5 @@
 **Check List**
-- [ ] Tests has been run in packages where changes made if available
+- [ ] Tests have been run in packages where changes made if available
 - [ ] Linter has been run for changed code
 - [ ] Tests for the changes have been added if not covered yet
 - [ ] Docs have been added / updated if required
diff --git a/packages/cubejs-schema-compiler/test/integration/clickhouse/custom-granularities.test.ts b/packages/cubejs-schema-compiler/test/integration/clickhouse/custom-granularities.test.ts
@@ -41,9 +41,11 @@ describe('Custom Granularities', () => {
           granularities:
             - name: half_year
               interval: 6 months
+              origin: '2024-01-01' # to keep tests stable across time (year change, etc)
             - name: half_year_by_1st_april
               interval: 6 months
-              offset: 3 months
+              #offset: 3 months
+              origin: '2024-04-01' # to keep tests stable across time (year change, etc)
             - name: two_weeks_by_friday
               interval: 2 weeks
               origin: '2024-08-23'
diff --git a/packages/cubejs-schema-compiler/test/integration/mssql/custom-granularities.test.ts b/packages/cubejs-schema-compiler/test/integration/mssql/custom-granularities.test.ts
@@ -37,9 +37,11 @@ describe('Custom Granularities', () => {
           granularities:
             - name: half_year
               interval: 6 months
+              origin: '2024-01-01' # to keep tests stable across time (year change, etc)
             - name: half_year_by_1st_april
               interval: 6 months
-              offset: 3 months
+              #offset: 3 months
+              origin: '2024-04-01' # to keep tests stable across time (year change, etc)
             - name: two_weeks_by_friday
               interval: 2 weeks
               origin: '2024-08-23'
diff --git a/packages/cubejs-schema-compiler/test/integration/mysql/custom-granularities.test.ts b/packages/cubejs-schema-compiler/test/integration/mysql/custom-granularities.test.ts
@@ -37,9 +37,11 @@ describe('Custom Granularities', () => {
           granularities:
             - name: half_year
               interval: 6 months
+              origin: '2024-01-01' # to keep tests stable across time (year change, etc)
             - name: half_year_by_1st_april
               interval: 6 months
-              offset: 3 months
+              #offset: 3 months
+              origin: '2024-04-01' # to keep tests stable across time (year change, etc)
             - name: two_weeks_by_friday
               interval: 2 weeks
               origin: '2024-08-23'
diff --git a/packages/cubejs-schema-compiler/test/integration/postgres/custom-granularities.test.ts b/packages/cubejs-schema-compiler/test/integration/postgres/custom-granularities.test.ts
@@ -39,9 +39,11 @@ describe('Custom Granularities', () => {
           granularities:
             - name: half_year
               interval: 6 months
+              origin: '2024-01-01' # to keep tests stable across time (year change, etc)
             - name: half_year_by_1st_april
               interval: 6 months
-              offset: 3 months
+              #offset: 3 months
+              origin: '2024-04-01' # to keep tests stable across time (year change, etc)
             - name: two_weeks_by_friday
               interval: 2 weeks
               origin: '2024-08-23'
diff --git a/packages/cubejs-testing-drivers/fixtures/_schemas.json b/packages/cubejs-testing-drivers/fixtures/_schemas.json
@@ -92,12 +92,13 @@
           "granularities": [
             {
               "name": "half_year",
-              "interval": "6 months"
+              "interval": "6 months",
+              "origin": "2024-01-01"
             },
             {
               "name": "half_year_by_1st_april",
               "interval": "6 months",
-              "offset": "3 months"
+              "origin": "2024-04-01"
             },
             {
               "name": "two_mo_by_feb",
@@ -118,12 +119,13 @@
           "granularities": [
             {
               "name": "half_year",
-              "interval": "6 months"
+              "interval": "6 months",
+              "origin": "2024-01-01"
             },
             {
               "name": "half_year_by_1st_april",
               "interval": "6 months",
-              "offset": "3 months"
+              "origin": "2024-04-01"
             },
             {
               "name": "two_mo_by_feb",

Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,13 @@`
`92`	`92`	`"granularities": [`
`93`	`93`	`{`
`94`	`94`	`"name": "half_year",`
`95`		`- "interval": "6 months"`
	`95`	`+ "interval": "6 months",`
	`96`	`+ "origin": "2024-01-01"`
`96`	`97`	`},`
`97`	`98`	`{`
`98`	`99`	`"name": "half_year_by_1st_april",`
`99`	`100`	`"interval": "6 months",`
`100`		`- "offset": "3 months"`
	`101`	`+ "origin": "2024-04-01"`
`101`	`102`	`},`
`102`	`103`	`{`
`103`	`104`	`"name": "two_mo_by_feb",`
`@@ -118,12 +119,13 @@`
`118`	`119`	`"granularities": [`
`119`	`120`	`{`
`120`	`121`	`"name": "half_year",`
`121`		`- "interval": "6 months"`
	`122`	`+ "interval": "6 months",`
	`123`	`+ "origin": "2024-01-01"`
`122`	`124`	`},`
`123`	`125`	`{`
`124`	`126`	`"name": "half_year_by_1st_april",`
`125`	`127`	`"interval": "6 months",`
`126`		`- "offset": "3 months"`
	`128`	`+ "origin": "2024-04-01"`
`127`	`129`	`},`
`128`	`130`	`{`
`129`	`131`	`"name": "two_mo_by_feb",`