deac/holidays
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote branch 'dgrambow/master'

Browse source 
Conflicts:
	lib/holidays.rb
This commit is contained in:
Alex Dunae 2010-11-12 12:26:48 -08:00
commit 40f393d529
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/holidays.rb
View file

@ -393,7 +393,7 @@ class Date
# :first, :second, :third, :fourth or :fifth
if week > 0
return ((week - 1) * 7) + 1 + ((7 + wday - Date.civil(year, month,(week-1)*7 + 1).wday) % 7)
return ((week - 1) * 7) + 1 + ((wday - Date.civil(year, month,(week-1)*7 + 1).wday) % 7)
end
days = MONTH_LENGTHS[month-1]

2
test/test_date.rb
View file

@ -6,7 +6,7 @@ class DateTests < Test::Unit::TestCase
end
def test_extending_date_class
assert @date.respond_to?('holiday?')
assert @date.respond_to?('holidays')
assert @date.respond_to?('holiday?')
end