Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Holiday accompanying coronation day #101

Merged
merged 7 commits into from
Dec 23, 2018

Conversation

k1LoW
Copy link
Member

@k1LoW k1LoW commented Dec 8, 2018

即位の礼に伴う祝日の修正です。

内閣府のページ に反映された段階でマージをしようと思います。

@k1LoW k1LoW self-assigned this Dec 8, 2018
@k1LoW
Copy link
Member Author

k1LoW commented Dec 18, 2018

「天皇の即位の日及び即位礼正殿の儀の行われる日を休日とする法律」について
天皇の即位の日の平成31年(2019年)5月1日及び即位礼正殿の儀が行われる日の平成31年(2019年)10月22日は、休日となります。また、これらの休日は国民の祝日扱いとなるため、平成31年(2019年)4月30日と5月2日も休日となります

expect(@google_calendar.holiday?(date[0])).to eq true
end
end

it 'holidays_detailed.yml shoud have date of Google calendar' do
@gholidays.each do |date, name|
expect(@holidays_detailed.key?(date)).to eq true
expect(@holidays_detailed[date]['name']).to eq name
expect(@holidays_detailed[date]['name']).to eq(name).or eq('休日').or eq('休日(祝日扱い)')
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

テスト対象との表記違いのため

@@ -21,14 +21,15 @@

it 'Google calendar result should have date of holidays_detailed.yml' do
@span.each do |date|
next if date[0] == Date.new(2019, 10, 22)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

テストに利用しているGoogle Calendarに10月22日の祝日がまだ来ていないため

@k1LoW
Copy link
Member Author

k1LoW commented Dec 19, 2018

@holiday-jp/maintainers こちら近日中にリリースをします。各ライブラリの修正準備をお願いします 🙇

@k1LoW k1LoW merged commit 7feef73 into master Dec 23, 2018
@k1LoW k1LoW deleted the holiday-accompanying-coronation-day branch December 23, 2018 06:28
k1LoW added a commit that referenced this pull request Dec 23, 2018
…on-day

Holiday accompanying coronation day
k1LoW added a commit that referenced this pull request Dec 23, 2018
…on-day

Holiday accompanying coronation day
@k1LoW
Copy link
Member Author

k1LoW commented Dec 23, 2018

@holiday-jp/maintainers マージしました

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant