holidays 5.7.0 → 6.0.0

data/test/defs/test_defs_ge.rb

@@ -7,35 +7,47 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class GeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ge
-{ Date.civil(2017, 1, 1) => 'ახალი წელი',
-  Date.civil(2017, 1, 2) => 'ბედობა',
-  Date.civil(2017, 1, 7) => 'ქრისტეშობა',
-  Date.civil(2017, 1, 19) => 'ნათლისღება',
-  Date.civil(2017, 3, 3) => 'დედის დღე',
-  Date.civil(2017, 3, 8) => 'ქალთა საერთაშორისო დღე',
-  Date.civil(2017, 4, 9) => 'ეროვნული ერთიანობის დღე',
-  Date.civil(2017, 5, 9) => 'ფაშიზმზე გამარჯვების დღე',
-  Date.civil(2017, 5, 12) => 'წმინდა მოციქულის ანდრია პირველწოდებულის საქართველოში შემოსვლის დღე',
-  Date.civil(2017, 5, 26) => 'დამოუკიდებლობის დღე',
-  Date.civil(2017, 8, 28) => 'მარიამობა',
-  Date.civil(2017, 10, 14) => 'სვეტიცხოვლობა',
-  Date.civil(2017, 11, 23) => 'გიორგობა'
-}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :ge)[0] || {})[:name]
-end
+    assert_equal "ახალი წელი", (Holidays.on(Date.civil(2017, 1, 1), [:ge])[0] || {})[:name]
 
-[Date.civil(2017, 4, 14), Date.civil(2018, 4, 6), Date.civil(2019, 4, 26)].each do |date|
-  assert_equal 'დიდი პარასკევი', Holidays.on(date, :ge)[0][:name]
-end
-[Date.civil(2017, 4, 15), Date.civil(2018, 4, 7), Date.civil(2019, 4, 27)].each do |date|
-  assert_equal 'დიდი შაბათი', Holidays.on(date, :ge)[0][:name]
-end
-[Date.civil(2017, 4, 16), Date.civil(2018, 4, 8), Date.civil(2019, 4, 28)].each do |date|
-  assert_equal 'ბრწყინვალე აღდგომის დღე', Holidays.on(date, :ge)[0][:name]
-end
-[Date.civil(2017, 4, 17), Date.civil(2018, 4, 9), Date.civil(2019, 4, 29)].each do |date|
-  assert_equal 'მიცვალებულთა', Holidays.on(date, :ge)[0][:name]
-end
+    assert_equal "ბედობა", (Holidays.on(Date.civil(2017, 1, 2), [:ge])[0] || {})[:name]
+
+    assert_equal "ქრისტეშობა", (Holidays.on(Date.civil(2017, 1, 7), [:ge])[0] || {})[:name]
+
+    assert_equal "ნათლისღება", (Holidays.on(Date.civil(2017, 1, 19), [:ge])[0] || {})[:name]
+
+    assert_equal "დედის დღე", (Holidays.on(Date.civil(2017, 3, 3), [:ge])[0] || {})[:name]
+
+    assert_equal "ქალთა საერთაშორისო დღე", (Holidays.on(Date.civil(2017, 3, 8), [:ge])[0] || {})[:name]
+
+    assert_equal "ეროვნული ერთიანობის დღე", (Holidays.on(Date.civil(2017, 4, 9), [:ge])[0] || {})[:name]
+
+    assert_equal "ფაშიზმზე გამარჯვების დღე", (Holidays.on(Date.civil(2017, 5, 9), [:ge])[0] || {})[:name]
+
+    assert_equal "წმინდა მოციქულის ანდრია პირველწოდებულის საქართველოში შემოსვლის დღე", (Holidays.on(Date.civil(2017, 5, 12), [:ge])[0] || {})[:name]
+
+    assert_equal "დამოუკიდებლობის დღე", (Holidays.on(Date.civil(2017, 5, 26), [:ge])[0] || {})[:name]
+
+    assert_equal "მარიამობა", (Holidays.on(Date.civil(2017, 8, 28), [:ge])[0] || {})[:name]
+
+    assert_equal "სვეტიცხოვლობა", (Holidays.on(Date.civil(2017, 10, 14), [:ge])[0] || {})[:name]
+
+    assert_equal "გიორგობა", (Holidays.on(Date.civil(2017, 11, 23), [:ge])[0] || {})[:name]
+
+    assert_equal "დიდი პარასკევი", (Holidays.on(Date.civil(2017, 4, 14), [:ge])[0] || {})[:name]
+assert_equal "დიდი პარასკევი", (Holidays.on(Date.civil(2018, 4, 6), [:ge])[0] || {})[:name]
+assert_equal "დიდი პარასკევი", (Holidays.on(Date.civil(2019, 4, 26), [:ge])[0] || {})[:name]
+
+    assert_equal "დიდი შაბათი", (Holidays.on(Date.civil(2017, 4, 15), [:ge])[0] || {})[:name]
+assert_equal "დიდი შაბათი", (Holidays.on(Date.civil(2018, 4, 7), [:ge])[0] || {})[:name]
+assert_equal "დიდი შაბათი", (Holidays.on(Date.civil(2019, 4, 27), [:ge])[0] || {})[:name]
+
+    assert_equal "ბრწყინვალე აღდგომის დღე", (Holidays.on(Date.civil(2017, 4, 16), [:ge])[0] || {})[:name]
+assert_equal "ბრწყინვალე აღდგომის დღე", (Holidays.on(Date.civil(2018, 4, 8), [:ge])[0] || {})[:name]
+assert_equal "ბრწყინვალე აღდგომის დღე", (Holidays.on(Date.civil(2019, 4, 28), [:ge])[0] || {})[:name]
+
+    assert_equal "მიცვალებულთა", (Holidays.on(Date.civil(2017, 4, 17), [:ge])[0] || {})[:name]
+assert_equal "მიცვალებულთა", (Holidays.on(Date.civil(2018, 4, 9), [:ge])[0] || {})[:name]
+assert_equal "მიცვალებულთა", (Holidays.on(Date.civil(2019, 4, 29), [:ge])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_hk.rb

@@ -7,32 +7,53 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class HkDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_hk
-{Date.civil(2016,1,1) => 'New Year\'s Day',
- Date.civil(2016,2,8) => 'Lunar New Year\'s Day',
- Date.civil(2016,2,9) => 'The second day of Lunar New Year',
- Date.civil(2016,2,10) => 'The third day of Lunar New Year',
- Date.civil(2016,3,25) => 'Good Friday',
- Date.civil(2016,3,26) => 'The day following Good Friday',
- Date.civil(2016,3,28) => 'Easter Monday',
- Date.civil(2016,5,2) => 'Labour Day',
- Date.civil(2016,7,1) => 'Hong Kong Special Administrative Region Establishment Day',
- Date.civil(2016,10,1) => 'National Day',
- Date.civil(2016,12,26) => 'Christmas Day',
- Date.civil(2016,12,27) => 'Boxing Day',
- Date.civil(2017,1,2) => 'New Year\'s Day',
- Date.civil(2017,1,28) => 'Lunar New Year\'s Day',
- Date.civil(2017,1,30) => 'The second day of Lunar New Year',
- Date.civil(2017,1,31) => 'The third day of Lunar New Year',
- Date.civil(2017,4,14) => 'Good Friday',
- Date.civil(2017,4,15) => 'The day following Good Friday',
- Date.civil(2017,4,17) => 'Easter Monday',
- Date.civil(2017,5,1) => 'Labour Day',
- Date.civil(2017,7,1) => 'Hong Kong Special Administrative Region Establishment Day',
- Date.civil(2017,10,2) => 'National Day',
- Date.civil(2017,12,25) => 'Christmas Day',
- Date.civil(2017,12,26) => 'Boxing Day'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :hk, :observed)[0] || {})[:name]
-end
+    assert_equal "New Year's Day", (Holidays.on(Date.civil(2016, 1, 1), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Lunar New Year's Day", (Holidays.on(Date.civil(2016, 2, 8), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "The second day of Lunar New Year", (Holidays.on(Date.civil(2016, 2, 9), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "The third day of Lunar New Year", (Holidays.on(Date.civil(2016, 2, 10), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Good Friday", (Holidays.on(Date.civil(2016, 3, 25), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "The day following Good Friday", (Holidays.on(Date.civil(2016, 3, 26), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Easter Monday", (Holidays.on(Date.civil(2016, 3, 28), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Labour Day", (Holidays.on(Date.civil(2016, 5, 2), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Hong Kong Special Administrative Region Establishment Day", (Holidays.on(Date.civil(2016, 7, 1), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "National Day", (Holidays.on(Date.civil(2016, 10, 1), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2016, 12, 26), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Boxing Day", (Holidays.on(Date.civil(2016, 12, 27), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "New Year's Day", (Holidays.on(Date.civil(2017, 1, 2), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Lunar New Year's Day", (Holidays.on(Date.civil(2017, 1, 28), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "The second day of Lunar New Year", (Holidays.on(Date.civil(2017, 1, 30), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "The third day of Lunar New Year", (Holidays.on(Date.civil(2017, 1, 31), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Good Friday", (Holidays.on(Date.civil(2017, 4, 14), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "The day following Good Friday", (Holidays.on(Date.civil(2017, 4, 15), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Easter Monday", (Holidays.on(Date.civil(2017, 4, 17), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Labour Day", (Holidays.on(Date.civil(2017, 5, 1), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Hong Kong Special Administrative Region Establishment Day", (Holidays.on(Date.civil(2017, 7, 1), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "National Day", (Holidays.on(Date.civil(2017, 10, 2), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2017, 12, 25), [:hk], [:observed])[0] || {})[:name]
+
+    assert_equal "Boxing Day", (Holidays.on(Date.civil(2017, 12, 26), [:hk], [:observed])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_hr.rb

@@ -7,25 +7,39 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class HrDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_hr
-{Date.civil(2012,1,1) => 'Nova godina',
- Date.civil(2012,1,6) => 'Sveta tri kralja',
- Date.civil(2012,5,1) => 'Međunarodni praznik rada',
- Date.civil(2012,6,22) => 'Dan antifašističke borbe',
- Date.civil(2012,6,25) => 'Dan državnosti',
- Date.civil(2012,8,5) => 'Dan pobjede i domovinske zahvalnosti i dan hrvatskih branitelja',
- Date.civil(2012,8,15) => 'Velika Gospa',
- Date.civil(2012,10,8) => 'Dan neovisnosti',
- Date.civil(2012,11,1) => 'Dan svih svetih',
- Date.civil(2012,12,25) => 'Božić',
- Date.civil(2012,12,26) => 'Sveti Stjepan'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :hr, :informal)[0] || {})[:name]
-end
+    assert_equal "Nova godina", (Holidays.on(Date.civil(2012, 1, 1), [:hr], [:informal])[0] || {})[:name]
 
-# Tijelovo
-[Date.civil(2008,5,22), Date.civil(2009,6,11), Date.civil(2010,6,3),
- Date.civil(2012,6,7), Date.civil(2013,5,30), Date.civil(2014,6,19)].each do |date|
-  assert_equal 'Tijelovo', Holidays.on(date, :hr)[0][:name]
-end
+    assert_equal "Sveta tri kralja", (Holidays.on(Date.civil(2012, 1, 6), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Međunarodni praznik rada", (Holidays.on(Date.civil(2012, 5, 1), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Dan antifašističke borbe", (Holidays.on(Date.civil(2012, 6, 22), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Dan državnosti", (Holidays.on(Date.civil(2012, 6, 25), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Dan pobjede i domovinske zahvalnosti i dan hrvatskih branitelja", (Holidays.on(Date.civil(2012, 8, 5), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Velika Gospa", (Holidays.on(Date.civil(2012, 8, 15), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Dan neovisnosti", (Holidays.on(Date.civil(2012, 10, 8), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Dan svih svetih", (Holidays.on(Date.civil(2012, 11, 1), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Božić", (Holidays.on(Date.civil(2012, 12, 25), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Sveti Stjepan", (Holidays.on(Date.civil(2012, 12, 26), [:hr], [:informal])[0] || {})[:name]
+
+    assert_equal "Tijelovo", (Holidays.on(Date.civil(2008, 5, 22), [:hr])[0] || {})[:name]
+
+    assert_equal "Tijelovo", (Holidays.on(Date.civil(2009, 6, 11), [:hr])[0] || {})[:name]
+
+    assert_equal "Tijelovo", (Holidays.on(Date.civil(2010, 6, 3), [:hr])[0] || {})[:name]
+
+    assert_equal "Tijelovo", (Holidays.on(Date.civil(2012, 6, 7), [:hr])[0] || {})[:name]
+
+    assert_equal "Tijelovo", (Holidays.on(Date.civil(2013, 5, 30), [:hr])[0] || {})[:name]
+
+    assert_equal "Tijelovo", (Holidays.on(Date.civil(2014, 6, 19), [:hr])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_hu.rb

@@ -7,23 +7,33 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class HuDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_hu
-{Date.civil(2012,1,1) => 'Újév',
- Date.civil(2011,1,1) => 'Újév',
- Date.civil(2012,3,15) => '1848/49-es forradalom és szabadságharc ünnepe',
- Date.civil(2011,4,25) => 'Húsvét hétfő',
- Date.civil(2012,4,9) => 'Húsvét hétfő',
- Date.civil(2012,5,1) => 'A munka ünnepe',
- Date.civil(2011,6,13) => 'Pünkösd hétfő',
- Date.civil(2012,5,28) => 'Pünkösd hétfő',
- Date.civil(2012,8,20) => 'Az államalapítás ünnepe',
- Date.civil(2012,10,23) => '1956-os forradalom és szabadságharc ünnepe',
- Date.civil(2012,11,1) => 'Mindenszentek',
- Date.civil(2012,12,25) => 'Karácsony',
- Date.civil(2012,12,26) => 'Karácsony',}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :hu, :informal)[0] || {})[:name]
-end
+    assert_equal "Újév", (Holidays.on(Date.civil(2012, 1, 1), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "Újév", (Holidays.on(Date.civil(2011, 1, 1), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "1848/49-es forradalom és szabadságharc ünnepe", (Holidays.on(Date.civil(2012, 3, 15), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "Húsvét hétfő", (Holidays.on(Date.civil(2011, 4, 25), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "Húsvét hétfő", (Holidays.on(Date.civil(2012, 4, 9), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "A munka ünnepe", (Holidays.on(Date.civil(2012, 5, 1), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "Pünkösd hétfő", (Holidays.on(Date.civil(2011, 6, 13), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "Pünkösd hétfő", (Holidays.on(Date.civil(2012, 5, 28), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "Az államalapítás ünnepe", (Holidays.on(Date.civil(2012, 8, 20), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "1956-os forradalom és szabadságharc ünnepe", (Holidays.on(Date.civil(2012, 10, 23), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "Mindenszentek", (Holidays.on(Date.civil(2012, 11, 1), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "Karácsony", (Holidays.on(Date.civil(2012, 12, 25), [:hu], [:informal])[0] || {})[:name]
+
+    assert_equal "Karácsony", (Holidays.on(Date.civil(2012, 12, 26), [:hu], [:informal])[0] || {})[:name]
 
-assert_equal [], Holidays.on(Date.civil(2012,3,14), :hu), '2012-03-14 is not a holiday in Hungary'
+    assert_nil (Holidays.on(Date.civil(2012, 3, 14), [:hu])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_ie.rb

@@ -7,31 +7,47 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class IeDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_ie
-{Date.civil(2008,1,1) => 'New Year\'s Day',
- Date.civil(2008,3,17) => 'St. Patrick\'s Day',
- Date.civil(2008,3,24) => 'Easter Monday',
- Date.civil(2008,5,5) => 'May Day',
- Date.civil(2008,6,2) => 'June Bank Holiday',
- Date.civil(2008,8,4) => 'August Bank Holiday',
- Date.civil(2008,10,27) => 'October Bank Holiday',
- Date.civil(2008,12,25) => 'Christmas Day',
- Date.civil(2008,12,26) => 'St. Stephen\'s Day'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :ie)[0] || {})[:name]
-end
-{Date.civil(2012,1,2) => 'New Year\'s Day',
- Date.civil(2012,3,19) => 'St. Patrick\'s Day',
- Date.civil(2012,4,9) => 'Easter Monday',
- Date.civil(2012,5,7) => 'May Day',
- Date.civil(2012,6,4) => 'June Bank Holiday',
- Date.civil(2012,8,6) => 'August Bank Holiday',
- Date.civil(2012,10,29) => 'October Bank Holiday',
- Date.civil(2011,12,26) => 'Christmas Day',
- Date.civil(2011,12,27) => 'St. Stephen\'s Day',
- Date.civil(2012,12,25) => 'Christmas Day',
- Date.civil(2012,12,26) => 'St. Stephen\'s Day',
- Date.civil(2015,12,28) => 'St. Stephen\'s Day'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :ie, :observed)[0] || {})[:name]
-end
+    assert_equal "New Year's Day", (Holidays.on(Date.civil(2008, 1, 1), [:ie])[0] || {})[:name]
+
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2008, 3, 17), [:ie])[0] || {})[:name]
+
+    assert_equal "Easter Monday", (Holidays.on(Date.civil(2008, 3, 24), [:ie])[0] || {})[:name]
+
+    assert_equal "May Day", (Holidays.on(Date.civil(2008, 5, 5), [:ie])[0] || {})[:name]
+
+    assert_equal "June Bank Holiday", (Holidays.on(Date.civil(2008, 6, 2), [:ie])[0] || {})[:name]
+
+    assert_equal "August Bank Holiday", (Holidays.on(Date.civil(2008, 8, 4), [:ie])[0] || {})[:name]
+
+    assert_equal "October Bank Holiday", (Holidays.on(Date.civil(2008, 10, 27), [:ie])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2008, 12, 25), [:ie])[0] || {})[:name]
+
+    assert_equal "St. Stephen's Day", (Holidays.on(Date.civil(2008, 12, 26), [:ie])[0] || {})[:name]
+
+    assert_equal "New Year's Day", (Holidays.on(Date.civil(2012, 1, 2), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "St. Patrick's Day", (Holidays.on(Date.civil(2012, 3, 19), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "Easter Monday", (Holidays.on(Date.civil(2012, 4, 9), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "May Day", (Holidays.on(Date.civil(2012, 5, 7), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "June Bank Holiday", (Holidays.on(Date.civil(2012, 6, 4), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "August Bank Holiday", (Holidays.on(Date.civil(2012, 8, 6), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "October Bank Holiday", (Holidays.on(Date.civil(2012, 10, 29), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2011, 12, 26), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "St. Stephen's Day", (Holidays.on(Date.civil(2011, 12, 27), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "Christmas Day", (Holidays.on(Date.civil(2012, 12, 25), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "St. Stephen's Day", (Holidays.on(Date.civil(2012, 12, 26), [:ie], [:observed])[0] || {})[:name]
+
+    assert_equal "St. Stephen's Day", (Holidays.on(Date.civil(2015, 12, 28), [:ie], [:observed])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_is.rb

@@ -7,28 +7,45 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class IsDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_is
-{Date.civil(2007,1,1) => 'Nýársdagur',
- Date.civil(2007,1,6) => 'Þrettándinn',
- Date.civil(2007,1,19) => 'Bóndadagur',
- Date.civil(2007,2,18) => 'Konudagur',
- Date.civil(2007,4,5) => 'Skírdagur',
- Date.civil(2007,4,6) => 'Föstudaginn langi',
- Date.civil(2007,4,8) => 'Páskadagur',
- Date.civil(2007,4,9) => 'Annar í páskum',
- Date.civil(2007,4,19) => 'Sumardagurinn fyrsti',
- Date.civil(2007,5,1) => 'Verkalýðsdagurinn',
- Date.civil(2007,5,17) => 'Uppstigningardagur',
- Date.civil(2007,5,27) => 'Hvítasunnudagur',
- Date.civil(2007,5,28) => 'Annar í hvítasunnu',
- Date.civil(2007,6,3) => 'Sjómannadagurinn',
- Date.civil(2007,6,17) => 'Lýðveldisdagurinn',
- Date.civil(2007,8,6) => 'Frídagur verslunarmanna',
- Date.civil(2007,12,24) => 'Jól',
- Date.civil(2007,12,25) => 'Jól',
- Date.civil(2007,12,26) => 'Jól',
- Date.civil(2007,12,31) => 'Gamlárskvöld'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :is, :informal)[0] || {})[:name]
-end
+    assert_equal "Nýársdagur", (Holidays.on(Date.civil(2007, 1, 1), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Þrettándinn", (Holidays.on(Date.civil(2007, 1, 6), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Bóndadagur", (Holidays.on(Date.civil(2007, 1, 19), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Konudagur", (Holidays.on(Date.civil(2007, 2, 18), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Skírdagur", (Holidays.on(Date.civil(2007, 4, 5), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Föstudaginn langi", (Holidays.on(Date.civil(2007, 4, 6), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Páskadagur", (Holidays.on(Date.civil(2007, 4, 8), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Annar í páskum", (Holidays.on(Date.civil(2007, 4, 9), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Sumardagurinn fyrsti", (Holidays.on(Date.civil(2007, 4, 19), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Verkalýðsdagurinn", (Holidays.on(Date.civil(2007, 5, 1), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Uppstigningardagur", (Holidays.on(Date.civil(2007, 5, 17), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Hvítasunnudagur", (Holidays.on(Date.civil(2007, 5, 27), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Annar í hvítasunnu", (Holidays.on(Date.civil(2007, 5, 28), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Sjómannadagurinn", (Holidays.on(Date.civil(2007, 6, 3), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Lýðveldisdagurinn", (Holidays.on(Date.civil(2007, 6, 17), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Frídagur verslunarmanna", (Holidays.on(Date.civil(2007, 8, 6), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Jól", (Holidays.on(Date.civil(2007, 12, 24), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Jól", (Holidays.on(Date.civil(2007, 12, 25), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Jól", (Holidays.on(Date.civil(2007, 12, 26), [:is], [:informal])[0] || {})[:name]
+
+    assert_equal "Gamlárskvöld", (Holidays.on(Date.civil(2007, 12, 31), [:is], [:informal])[0] || {})[:name]
 
   end
 end

data/test/defs/test_defs_it.rb

@@ -7,20 +7,29 @@ require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 class ItDefinitionTests < Test::Unit::TestCase  # :nodoc:
 
   def test_it
-{Date.civil(2007,1,1) => 'Capodanno',
- Date.civil(2007,1,6) => 'Epifania',
- Date.civil(2007,4,8) => 'Pasqua',
- Date.civil(2007,4,9) => 'Lunedì dell\'Angelo',
- Date.civil(2007,4,25) => 'Festa della Liberazione',
- Date.civil(2007,5,1) => 'Festa dei Lavoratori',
- Date.civil(2007,6,2) => 'Festa della Repubblica',
- Date.civil(2007,8,15) => 'Assunzione',
- Date.civil(2007,11,1) => 'Ognissanti',
- Date.civil(2007,12,8) => 'Immacolata Concezione',
- Date.civil(2007,12,25) => 'Natale',
- Date.civil(2007,12,26) => 'Santo Stefano'}.each do |date, name|
-  assert_equal name, (Holidays.on(date, :it, :informal)[0] || {})[:name]
-end
+    assert_equal "Capodanno", (Holidays.on(Date.civil(2007, 1, 1), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Epifania", (Holidays.on(Date.civil(2007, 1, 6), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Pasqua", (Holidays.on(Date.civil(2007, 4, 8), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Lunedì dell'Angelo", (Holidays.on(Date.civil(2007, 4, 9), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Festa della Liberazione", (Holidays.on(Date.civil(2007, 4, 25), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Festa dei Lavoratori", (Holidays.on(Date.civil(2007, 5, 1), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Festa della Repubblica", (Holidays.on(Date.civil(2007, 6, 2), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Assunzione", (Holidays.on(Date.civil(2007, 8, 15), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Ognissanti", (Holidays.on(Date.civil(2007, 11, 1), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Immacolata Concezione", (Holidays.on(Date.civil(2007, 12, 8), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Natale", (Holidays.on(Date.civil(2007, 12, 25), [:it], [:informal])[0] || {})[:name]
+
+    assert_equal "Santo Stefano", (Holidays.on(Date.civil(2007, 12, 26), [:it], [:informal])[0] || {})[:name]
 
   end
 end