Skip to content

Commit

Permalink
fix(GB): #203 boxing day substitution rules
Browse files Browse the repository at this point in the history
  • Loading branch information
@commenthol
commenthol committed Mar 30, 2021
1 parent 5ca2753 commit a90f92a
Show file tree
Hide file tree
Showing 19 changed files with 127 additions and 7 deletions.
2 changes: 1 addition & 1 deletion data/countries/GB.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ holidays:
substitutes 12-26 if saturday then next monday:
substitute: true
_name: 12-26
substitutes 12-26 if sunday then next monday:
substitutes 12-26 if sunday then next monday if monday then next tuesday:
substitute: true
_name: 12-26
'2012-06-05':
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-2016.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
"end": "2016-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/GB-2021.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday",
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Mon"
},
{
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-2022.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
"end": "2022-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-ALD-2016.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
"end": "2016-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/GB-ALD-2021.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday",
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Mon"
},
{
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-ALD-2022.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
"end": "2022-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-ENG-2016.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
"end": "2016-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/GB-ENG-2021.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday",
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Mon"
},
{
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-ENG-2022.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
"end": "2022-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-NIR-2016.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
"end": "2016-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/GB-NIR-2021.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday",
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Mon"
},
{
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-NIR-2022.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
"end": "2022-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-SCT-2016.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
"end": "2016-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/GB-SCT-2021.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday",
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Mon"
},
{
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-SCT-2022.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
"end": "2022-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-WLS-2016.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
"end": "2016-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2016-12-27 00:00:00",
"start": "2016-12-27T00:00:00.000Z",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/GB-WLS-2021.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday",
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Mon"
},
{
Expand Down
10 changes: 10 additions & 0 deletions test/fixtures/GB-WLS-2022.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,16 @@
"rule": "12-26",
"_weekday": "Mon"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
"end": "2022-12-28T00:00:00.000Z",
"name": "Boxing Day (substitute day)",
"type": "public",
"substitute": true,
"rule": "substitutes 12-26 if sunday then next monday if monday then next tuesday",
"_weekday": "Tue"
},
{
"date": "2022-12-27 00:00:00",
"start": "2022-12-27T00:00:00.000Z",
Expand Down

0 comments on commit a90f92a

Please sign in to comment.