Merge pull request #442 from KngHawkon/knghawkon/fixing-test-norwegia…

…n-advent Fix sundays in advent norway (w/test fix)
commenthol · Dec 10, 2023 · dc823ee · dc823ee
2 parents c2841d5 + cd5bd13
commit dc823ee
Show file tree

Hide file tree

Showing 27 changed files with 149 additions and 148 deletions.
diff --git a/data/countries/NO.yaml b/data/countries/NO.yaml
@@ -6,6 +6,7 @@ holidays:
   # @source https://www.timeanddate.com/holidays/norway/2023
   # @attrib https://no.wikipedia.org/wiki/Norges_offisielle_flaggdager
   # @attrib https://no.wikipedia.org/wiki/Allehelgensaften
+  # @attrib https://no.wikipedia.org/wiki/Advent
   NO:
     names:
       no: Norge
@@ -115,22 +116,22 @@ holidays:
       2nd sunday in November:
         _name: Fathers Day
         type: observance
-      4th sunday before 12-24:
+      4th sunday before 12-25:
         name:
           no: Første søndag i advent
           en: First Sunday of Advent
         type: observance
-      3rd sunday before 12-24:
+      3rd sunday before 12-25:
         name:
           no: Andre søndag i advent
           en: Second Sunday of Advent
         type: observance
-      2nd sunday before 12-24:
+      2nd sunday before 12-25:
         name:
           no: Tredje søndag i advent
           en: Third Sunday of Advent
         type: observance
-      1st sunday before 12-24:
+      1st sunday before 12-25:
         name:
           no: Fjerde søndag i advent
           en: Fourth Sunday of Advent

diff --git a/test/fixtures/NO-2015.json b/test/fixtures/NO-2015.json
@@ -266,7 +266,7 @@
     "end": "2015-11-29T23:00:00.000Z",
     "name": "Første søndag i advent",
     "type": "observance",
-    "rule": "4th sunday before 12-24",
+    "rule": "4th sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -275,7 +275,7 @@
     "end": "2015-12-06T23:00:00.000Z",
     "name": "Andre søndag i advent",
     "type": "observance",
-    "rule": "3rd sunday before 12-24",
+    "rule": "3rd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -284,7 +284,7 @@
     "end": "2015-12-13T23:00:00.000Z",
     "name": "Tredje søndag i advent",
     "type": "observance",
-    "rule": "2nd sunday before 12-24",
+    "rule": "2nd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -293,7 +293,7 @@
     "end": "2015-12-20T23:00:00.000Z",
     "name": "Fjerde søndag i advent",
     "type": "observance",
-    "rule": "1st sunday before 12-24",
+    "rule": "1st sunday before 12-25",
     "_weekday": "Sun"
   },
   {

diff --git a/test/fixtures/NO-2016.json b/test/fixtures/NO-2016.json
@@ -266,7 +266,7 @@
     "end": "2016-11-27T23:00:00.000Z",
     "name": "Første søndag i advent",
     "type": "observance",
-    "rule": "4th sunday before 12-24",
+    "rule": "4th sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -275,7 +275,7 @@
     "end": "2016-12-04T23:00:00.000Z",
     "name": "Andre søndag i advent",
     "type": "observance",
-    "rule": "3rd sunday before 12-24",
+    "rule": "3rd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -284,7 +284,7 @@
     "end": "2016-12-11T23:00:00.000Z",
     "name": "Tredje søndag i advent",
     "type": "observance",
-    "rule": "2nd sunday before 12-24",
+    "rule": "2nd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -293,7 +293,7 @@
     "end": "2016-12-18T23:00:00.000Z",
     "name": "Fjerde søndag i advent",
     "type": "observance",
-    "rule": "1st sunday before 12-24",
+    "rule": "1st sunday before 12-25",
     "_weekday": "Sun"
   },
   {

diff --git a/test/fixtures/NO-2017.json b/test/fixtures/NO-2017.json
@@ -260,40 +260,40 @@
     "rule": "2nd sunday in November",
     "_weekday": "Sun"
   },
-  {
-    "date": "2017-11-26 00:00:00",
-    "start": "2017-11-25T23:00:00.000Z",
-    "end": "2017-11-26T23:00:00.000Z",
-    "name": "Første søndag i advent",
-    "type": "observance",
-    "rule": "4th sunday before 12-24",
-    "_weekday": "Sun"
-  },
   {
     "date": "2017-12-03 00:00:00",
     "start": "2017-12-02T23:00:00.000Z",
     "end": "2017-12-03T23:00:00.000Z",
-    "name": "Andre søndag i advent",
+    "name": "Første søndag i advent",
     "type": "observance",
-    "rule": "3rd sunday before 12-24",
+    "rule": "4th sunday before 12-25",
     "_weekday": "Sun"
   },
   {
     "date": "2017-12-10 00:00:00",
     "start": "2017-12-09T23:00:00.000Z",
     "end": "2017-12-10T23:00:00.000Z",
-    "name": "Tredje søndag i advent",
+    "name": "Andre søndag i advent",
     "type": "observance",
-    "rule": "2nd sunday before 12-24",
+    "rule": "3rd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
     "date": "2017-12-17 00:00:00",
     "start": "2017-12-16T23:00:00.000Z",
     "end": "2017-12-17T23:00:00.000Z",
+    "name": "Tredje søndag i advent",
+    "type": "observance",
+    "rule": "2nd sunday before 12-25",
+    "_weekday": "Sun"
+  },
+  {
+    "date": "2017-12-24 00:00:00",
+    "start": "2017-12-23T23:00:00.000Z",
+    "end": "2017-12-24T23:00:00.000Z",
     "name": "Fjerde søndag i advent",
     "type": "observance",
-    "rule": "1st sunday before 12-24",
+    "rule": "1st sunday before 12-25",
     "_weekday": "Sun"
   },
   {

diff --git a/test/fixtures/NO-2018.json b/test/fixtures/NO-2018.json
@@ -266,7 +266,7 @@
     "end": "2018-12-02T23:00:00.000Z",
     "name": "Første søndag i advent",
     "type": "observance",
-    "rule": "4th sunday before 12-24",
+    "rule": "4th sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -275,7 +275,7 @@
     "end": "2018-12-09T23:00:00.000Z",
     "name": "Andre søndag i advent",
     "type": "observance",
-    "rule": "3rd sunday before 12-24",
+    "rule": "3rd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -284,7 +284,7 @@
     "end": "2018-12-16T23:00:00.000Z",
     "name": "Tredje søndag i advent",
     "type": "observance",
-    "rule": "2nd sunday before 12-24",
+    "rule": "2nd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -293,7 +293,7 @@
     "end": "2018-12-23T23:00:00.000Z",
     "name": "Fjerde søndag i advent",
     "type": "observance",
-    "rule": "1st sunday before 12-24",
+    "rule": "1st sunday before 12-25",
     "_weekday": "Sun"
   },
   {

diff --git a/test/fixtures/NO-2019.json b/test/fixtures/NO-2019.json
@@ -266,7 +266,7 @@
     "end": "2019-12-01T23:00:00.000Z",
     "name": "Første søndag i advent",
     "type": "observance",
-    "rule": "4th sunday before 12-24",
+    "rule": "4th sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -275,7 +275,7 @@
     "end": "2019-12-08T23:00:00.000Z",
     "name": "Andre søndag i advent",
     "type": "observance",
-    "rule": "3rd sunday before 12-24",
+    "rule": "3rd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -284,7 +284,7 @@
     "end": "2019-12-15T23:00:00.000Z",
     "name": "Tredje søndag i advent",
     "type": "observance",
-    "rule": "2nd sunday before 12-24",
+    "rule": "2nd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -293,7 +293,7 @@
     "end": "2019-12-22T23:00:00.000Z",
     "name": "Fjerde søndag i advent",
     "type": "observance",
-    "rule": "1st sunday before 12-24",
+    "rule": "1st sunday before 12-25",
     "_weekday": "Sun"
   },
   {

diff --git a/test/fixtures/NO-2020.json b/test/fixtures/NO-2020.json
@@ -266,7 +266,7 @@
     "end": "2020-11-29T23:00:00.000Z",
     "name": "Første søndag i advent",
     "type": "observance",
-    "rule": "4th sunday before 12-24",
+    "rule": "4th sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -275,7 +275,7 @@
     "end": "2020-12-06T23:00:00.000Z",
     "name": "Andre søndag i advent",
     "type": "observance",
-    "rule": "3rd sunday before 12-24",
+    "rule": "3rd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -284,7 +284,7 @@
     "end": "2020-12-13T23:00:00.000Z",
     "name": "Tredje søndag i advent",
     "type": "observance",
-    "rule": "2nd sunday before 12-24",
+    "rule": "2nd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -293,7 +293,7 @@
     "end": "2020-12-20T23:00:00.000Z",
     "name": "Fjerde søndag i advent",
     "type": "observance",
-    "rule": "1st sunday before 12-24",
+    "rule": "1st sunday before 12-25",
     "_weekday": "Sun"
   },
   {

diff --git a/test/fixtures/NO-2021.json b/test/fixtures/NO-2021.json
@@ -266,7 +266,7 @@
     "end": "2021-11-28T23:00:00.000Z",
     "name": "Første søndag i advent",
     "type": "observance",
-    "rule": "4th sunday before 12-24",
+    "rule": "4th sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -275,7 +275,7 @@
     "end": "2021-12-05T23:00:00.000Z",
     "name": "Andre søndag i advent",
     "type": "observance",
-    "rule": "3rd sunday before 12-24",
+    "rule": "3rd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -284,7 +284,7 @@
     "end": "2021-12-12T23:00:00.000Z",
     "name": "Tredje søndag i advent",
     "type": "observance",
-    "rule": "2nd sunday before 12-24",
+    "rule": "2nd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -293,7 +293,7 @@
     "end": "2021-12-19T23:00:00.000Z",
     "name": "Fjerde søndag i advent",
     "type": "observance",
-    "rule": "1st sunday before 12-24",
+    "rule": "1st sunday before 12-25",
     "_weekday": "Sun"
   },
   {

diff --git a/test/fixtures/NO-2022.json b/test/fixtures/NO-2022.json
@@ -266,7 +266,7 @@
     "end": "2022-11-27T23:00:00.000Z",
     "name": "Første søndag i advent",
     "type": "observance",
-    "rule": "4th sunday before 12-24",
+    "rule": "4th sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -275,7 +275,7 @@
     "end": "2022-12-04T23:00:00.000Z",
     "name": "Andre søndag i advent",
     "type": "observance",
-    "rule": "3rd sunday before 12-24",
+    "rule": "3rd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -284,7 +284,7 @@
     "end": "2022-12-11T23:00:00.000Z",
     "name": "Tredje søndag i advent",
     "type": "observance",
-    "rule": "2nd sunday before 12-24",
+    "rule": "2nd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
@@ -293,7 +293,7 @@
     "end": "2022-12-18T23:00:00.000Z",
     "name": "Fjerde søndag i advent",
     "type": "observance",
-    "rule": "1st sunday before 12-24",
+    "rule": "1st sunday before 12-25",
     "_weekday": "Sun"
   },
   {

diff --git a/test/fixtures/NO-2023.json b/test/fixtures/NO-2023.json
@@ -260,40 +260,40 @@
     "rule": "2nd sunday in November",
     "_weekday": "Sun"
   },
-  {
-    "date": "2023-11-26 00:00:00",
-    "start": "2023-11-25T23:00:00.000Z",
-    "end": "2023-11-26T23:00:00.000Z",
-    "name": "Første søndag i advent",
-    "type": "observance",
-    "rule": "4th sunday before 12-24",
-    "_weekday": "Sun"
-  },
   {
     "date": "2023-12-03 00:00:00",
     "start": "2023-12-02T23:00:00.000Z",
     "end": "2023-12-03T23:00:00.000Z",
-    "name": "Andre søndag i advent",
+    "name": "Første søndag i advent",
     "type": "observance",
-    "rule": "3rd sunday before 12-24",
+    "rule": "4th sunday before 12-25",
     "_weekday": "Sun"
   },
   {
     "date": "2023-12-10 00:00:00",
     "start": "2023-12-09T23:00:00.000Z",
     "end": "2023-12-10T23:00:00.000Z",
-    "name": "Tredje søndag i advent",
+    "name": "Andre søndag i advent",
     "type": "observance",
-    "rule": "2nd sunday before 12-24",
+    "rule": "3rd sunday before 12-25",
     "_weekday": "Sun"
   },
   {
     "date": "2023-12-17 00:00:00",
     "start": "2023-12-16T23:00:00.000Z",
     "end": "2023-12-17T23:00:00.000Z",
+    "name": "Tredje søndag i advent",
+    "type": "observance",
+    "rule": "2nd sunday before 12-25",
+    "_weekday": "Sun"
+  },
+  {
+    "date": "2023-12-24 00:00:00",
+    "start": "2023-12-23T23:00:00.000Z",
+    "end": "2023-12-24T23:00:00.000Z",
     "name": "Fjerde søndag i advent",
     "type": "observance",
-    "rule": "1st sunday before 12-24",
+    "rule": "1st sunday before 12-25",
     "_weekday": "Sun"
   },
   {