From 6b7478871973e6aad9a9ea3325bf78adb99c00fe Mon Sep 17 00:00:00 2001 From: keiz1213 Date: Mon, 19 Sep 2022 13:25:38 +0900 Subject: [PATCH 01/14] =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=81=8C=E6=8F=90=E5=87=BA=E7=89=A9=E3=81=AE=E3=82=B3=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=8B?= =?UTF-8?q?=E3=82=89=E7=A2=BA=E8=AA=8Dok=E3=81=AB=E3=81=97=E3=81=9F?= =?UTF-8?q?=E6=99=82=E3=81=AE=E3=83=88=E3=83=BC=E3=82=B9=E3=83=88=E3=81=8C?= =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/comments.vue | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/javascript/comments.vue b/app/javascript/comments.vue index 90ed75171f7..57630dd64b5 100644 --- a/app/javascript/comments.vue +++ b/app/javascript/comments.vue @@ -294,16 +294,18 @@ export default { } }, postComment() { - this.createComment() - if (this.isUnassignedAndUnchekedProduct) { - this.checkProduct( - this.commentableId, - this.currentUserId, - '/api/products/checker', - 'PATCH', - this.token() - ) - } + this.createComment({ toastMessage: null }) + if ( + this.commentableType === 'Product' && + this.productCheckerId === null && this.checkId === null) { + this.checkProduct( + this.commentableId, + this.currentUserId, + '/api/products/checker', + 'PATCH', + this.token() + ) + } }, async fetchUncheckedProducts(page) { return fetch(`/api/products/unchecked?page=${page}`, { From 073ee4f278f8c320a9cb1aebed3598e6f4566827 Mon Sep 17 00:00:00 2001 From: keiz1213 Date: Mon, 19 Sep 2022 13:56:02 +0900 Subject: [PATCH 02/14] =?UTF-8?q?lint=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/comments.vue | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/javascript/comments.vue b/app/javascript/comments.vue index 57630dd64b5..217bafd3000 100644 --- a/app/javascript/comments.vue +++ b/app/javascript/comments.vue @@ -297,15 +297,17 @@ export default { this.createComment({ toastMessage: null }) if ( this.commentableType === 'Product' && - this.productCheckerId === null && this.checkId === null) { - this.checkProduct( - this.commentableId, - this.currentUserId, - '/api/products/checker', - 'PATCH', - this.token() - ) - } + this.productCheckerId === null && + this.checkId === null + ) { + this.checkProduct( + this.commentableId, + this.currentUserId, + '/api/products/checker', + 'PATCH', + this.token() + ) + } }, async fetchUncheckedProducts(page) { return fetch(`/api/products/unchecked?page=${page}`, { From 0e27b25c822fc480b2ecc980fafbf9078930b873 Mon Sep 17 00:00:00 2001 From: keiz1213 Date: Mon, 19 Sep 2022 22:38:24 +0900 Subject: [PATCH 03/14] =?UTF-8?q?createComment=E3=81=AE=E5=BC=95=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=A8=E6=9D=A1=E4=BB=B6=E5=BC=8F=E3=81=AE?= =?UTF-8?q?=E5=88=87=E3=82=8A=E5=87=BA=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/comments.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/javascript/comments.vue b/app/javascript/comments.vue index 217bafd3000..d9ccf70ace4 100644 --- a/app/javascript/comments.vue +++ b/app/javascript/comments.vue @@ -294,12 +294,8 @@ export default { } }, postComment() { - this.createComment({ toastMessage: null }) - if ( - this.commentableType === 'Product' && - this.productCheckerId === null && - this.checkId === null - ) { + this.createComment({}) + if (this.isUnassignedAndUnchekedProduct) { this.checkProduct( this.commentableId, this.currentUserId, From 6dd821b8a22a45cfce66b96fc760d7cb6753d800 Mon Sep 17 00:00:00 2001 From: keiz1213 Date: Tue, 20 Sep 2022 22:09:58 +0900 Subject: [PATCH 04/14] =?UTF-8?q?createComment=E3=81=AE=E3=83=87=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=AB=E3=83=88=E3=81=AE=E5=BC=95=E6=95=B0=E3=82=92?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/comments.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/comments.vue b/app/javascript/comments.vue index d9ccf70ace4..90ed75171f7 100644 --- a/app/javascript/comments.vue +++ b/app/javascript/comments.vue @@ -294,7 +294,7 @@ export default { } }, postComment() { - this.createComment({}) + this.createComment() if (this.isUnassignedAndUnchekedProduct) { this.checkProduct( this.commentableId, From 358cc07f557e76f7bd2c8efacd09fad49ea74749 Mon Sep 17 00:00:00 2001 From: teppei machida Date: Wed, 31 Aug 2022 14:01:37 +0900 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BC=91=E4=BC=9A=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=83=9C=E3=83=83=E3=82=AF=E3=82=B9=E3=81=AE?= =?UTF-8?q?=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blocks/form/_block-checks.sass | 2 ++ app/views/hibernation/new.html.slim | 22 +++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/application/blocks/form/_block-checks.sass b/app/assets/stylesheets/application/blocks/form/_block-checks.sass index e7ead314340..e7984c84553 100644 --- a/app/assets/stylesheets/application/blocks/form/_block-checks.sass +++ b/app/assets/stylesheets/application/blocks/form/_block-checks.sass @@ -8,6 +8,8 @@ max-width: 20rem .block-checks.is-1-item & max-width: 100% + .block-checks.is-1-item.is-centered & + width: 20rem .block-checks.is-2-items & flex: 0 0 calc((100% - .5rem) / 2) max-width: calc((100% - .5rem) / 2) diff --git a/app/views/hibernation/new.html.slim b/app/views/hibernation/new.html.slim index 6e893a04330..111867f546d 100644 --- a/app/views/hibernation/new.html.slim +++ b/app/views/hibernation/new.html.slim @@ -21,17 +21,6 @@ header.page-header html: { name: 'hibernation' }, class: 'form' do |f| .form__items - // - 休会についての注意を実装したら表示する - .form-item - label.a-form-label.is-required - | 休会についての注意を読みましたか？ - .block-checks.is-2-items - .block-checks__item - .a-block-check.is-checkbox - input.a-toggle-checkbox#aaa(type='checkbox') - label.a-block-check__label(for='aaa') - | 読みました .form-item = f.label :scheduled_return_on, class: 'a-form-label is-required' @@ -79,6 +68,17 @@ header.page-header | こちら | のページの「分報 URL」欄に分報チャンネルの URL を登録してください。 + + .form-item + label.a-form-label.is-required + | 休会についての注意を読みましたか？ + .block-checks.is-1-item.is-centered + .block-checks__item + .a-block-check.is-checkbox + input.a-toggle-checkbox#aaa(type='checkbox') + label.a-block-check__label(for='aaa') + | 読みました + .form-actions ul.form-actions__items li.form-actions__item.is-main From 39435ff63a233c116262bed87719c1df6c1a6e4b Mon Sep 17 00:00:00 2001 From: teppei machida Date: Wed, 21 Sep 2022 16:40:41 +0900 Subject: [PATCH 06/14] :cop: --- app/views/hibernation/new.html.slim | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/hibernation/new.html.slim b/app/views/hibernation/new.html.slim index 111867f546d..01cc52cbeb4 100644 --- a/app/views/hibernation/new.html.slim +++ b/app/views/hibernation/new.html.slim @@ -68,7 +68,6 @@ header.page-header | こちら | のページの「分報 URL」欄に分報チャンネルの URL を登録してください。 - .form-item label.a-form-label.is-required | 休会についての注意を読みましたか？ From 22bea4c1e452b7d4f12e022defa9628e70afb7f8 Mon Sep 17 00:00:00 2001 From: TakashimaAyaka Date: Tue, 20 Sep 2022 23:08:51 +0900 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BC=91=E4=BC=9A=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=81=AE=E6=B3=A8=E6=84=8F=E3=82=92=E3=80=8C?= =?UTF-8?q?=E8=AA=AD=E3=81=BF=E3=81=BE=E3=81=97=E3=81=9F=E3=80=8D=E3=81=AE?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=83=9C=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9=E3=81=A8=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=8C=E9=80=A3?= =?UTF-8?q?=E5=8B=95=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/hibernation_agreements.js | 14 ++++++++++++++ app/javascript/packs/application.js | 1 + app/views/hibernation/new.html.slim | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 app/javascript/hibernation_agreements.js diff --git a/app/javascript/hibernation_agreements.js b/app/javascript/hibernation_agreements.js new file mode 100644 index 00000000000..a6f40a085d8 --- /dev/null +++ b/app/javascript/hibernation_agreements.js @@ -0,0 +1,14 @@ +document.addEventListener('DOMContentLoaded', () => { + const checkbox = document.querySelector('.js-hibernation-agreements-checkbox') + const submit = document.querySelector('.js-hibernation-agreements-submit') + + checkbox.addEventListener('change', () => { + if (checkbox.checked) { + submit.classList.remove('is-disabled') + submit.classList.add('is-danger') + } else { + submit.classList.add('is-disabled') + submit.classList.remove('is-danger') + } + }) +}) diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 71f1366556b..8626e67bb97 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -61,6 +61,7 @@ import '../training-info-toggler.js' import '../company-products.js' import '../welcome_message_for_adviser.js' import '../regular-events.js' +import '../hibernation_agreements.js' import VueMounter from '../VueMounter.js' import Hello from '../components/hello.vue' diff --git a/app/views/hibernation/new.html.slim b/app/views/hibernation/new.html.slim index 01cc52cbeb4..1a0b279be5c 100644 --- a/app/views/hibernation/new.html.slim +++ b/app/views/hibernation/new.html.slim @@ -74,7 +74,7 @@ header.page-header .block-checks.is-1-item.is-centered .block-checks__item .a-block-check.is-checkbox - input.a-toggle-checkbox#aaa(type='checkbox') + input.a-toggle-checkbox.js-hibernation-agreements-checkbox#aaa(type='checkbox') label.a-block-check__label(for='aaa') | 読みました @@ -85,5 +85,5 @@ header.page-header class: 'a-button is-md is-secondary is-block' li.form-actions__item.is-main = f.submit '休会する', - class: 'a-button is-md is-danger is-block', + class: 'a-button is-md is-block js-hibernation-agreements-submit is-disabled', data: { confirm: '本当によろしいですか？' } From b81f5d2eaf174c2450a033b615f1727df47be7cc Mon Sep 17 00:00:00 2001 From: TakashimaAyaka Date: Fri, 23 Sep 2022 17:58:07 +0900 Subject: [PATCH 08/14] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/system/hibernation_test.rb | 2 ++ test/system/notification/hibernation_test.rb | 3 +++ 2 files changed, 5 insertions(+) diff --git a/test/system/hibernation_test.rb b/test/system/hibernation_test.rb index 0bdbf1b9bf4..129c7784908 100644 --- a/test/system/hibernation_test.rb +++ b/test/system/hibernation_test.rb @@ -19,6 +19,7 @@ class HibernationTest < ApplicationSystemTestCase end VCR.use_cassette 'subscription/update', vcr_options do + find('.is-checkbox').click click_on '休会する' page.driver.browser.switch_to.alert.accept assert_text '休会処理が完了しました' @@ -31,6 +32,7 @@ class HibernationTest < ApplicationSystemTestCase fill_in('hibernation[reason]', with: 'test') end + find('.is-checkbox').click click_on '休会する' page.driver.browser.switch_to.alert.accept assert_text '復帰予定日を入力してください' diff --git a/test/system/notification/hibernation_test.rb b/test/system/notification/hibernation_test.rb index 37d03a3eb9f..e5f9dc2c17b 100644 --- a/test/system/notification/hibernation_test.rb +++ b/test/system/notification/hibernation_test.rb @@ -22,6 +22,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'kimura' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' + find('.is-checkbox').click accept_confirm do click_button '休会する' end @@ -44,6 +45,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'kensyu' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' + find('.is-checkbox').click accept_confirm do click_button '休会する' end @@ -66,6 +68,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'senpai' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' + find('.is-checkbox').click accept_confirm do click_button '休会する' end From 5cfd3a6e10ae5f57193e138fbec720e24bca8547 Mon Sep 17 00:00:00 2001 From: TakashimaAyaka Date: Mon, 3 Oct 2022 22:20:04 +0900 Subject: [PATCH 09/14] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=83=9C=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9=E3=82=92=E7=A2=BA=E8=AA=8D=E3=81=99=E3=82=8B=E3=83=A1?= =?UTF-8?q?=E3=82=BD=E3=83=83=E3=83=89=E3=82=92capybara=E3=81=AE=E3=82=82?= =?UTF-8?q?=E3=81=AE=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/system/hibernation_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/system/hibernation_test.rb b/test/system/hibernation_test.rb index 129c7784908..1c8540c156e 100644 --- a/test/system/hibernation_test.rb +++ b/test/system/hibernation_test.rb @@ -32,7 +32,7 @@ class HibernationTest < ApplicationSystemTestCase fill_in('hibernation[reason]', with: 'test') end - find('.is-checkbox').click + check 'is-checkbox' click_on '休会する' page.driver.browser.switch_to.alert.accept assert_text '復帰予定日を入力してください' From 598e5d459799bb78aee6cf6eb4efe07a75987e3f Mon Sep 17 00:00:00 2001 From: TakashimaAyaka Date: Mon, 3 Oct 2022 22:30:09 +0900 Subject: [PATCH 10/14] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=83=9C=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9=E3=82=92=E7=A2=BA=E8=AA=8D=E3=81=99=E3=82=8B=E3=83=A1?= =?UTF-8?q?=E3=82=BD=E3=83=83=E3=83=89=E3=82=92capybara=E3=81=AE=E3=82=82?= =?UTF-8?q?=E3=81=AE=E3=81=AB=E3=81=97=E3=81=9F=EF=BC=88=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E6=BC=8F=E3=82=8C=E3=81=AE=E5=AF=BE=E5=BF=9C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/system/hibernation_test.rb | 2 +- test/system/notification/hibernation_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/system/hibernation_test.rb b/test/system/hibernation_test.rb index 1c8540c156e..6018b33dd8c 100644 --- a/test/system/hibernation_test.rb +++ b/test/system/hibernation_test.rb @@ -19,7 +19,7 @@ class HibernationTest < ApplicationSystemTestCase end VCR.use_cassette 'subscription/update', vcr_options do - find('.is-checkbox').click + check 'is-checkbox' click_on '休会する' page.driver.browser.switch_to.alert.accept assert_text '休会処理が完了しました' diff --git a/test/system/notification/hibernation_test.rb b/test/system/notification/hibernation_test.rb index e5f9dc2c17b..4a35326aa7d 100644 --- a/test/system/notification/hibernation_test.rb +++ b/test/system/notification/hibernation_test.rb @@ -22,7 +22,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'kimura' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' - find('.is-checkbox').click + check 'is-checkbox' accept_confirm do click_button '休会する' end @@ -45,7 +45,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'kensyu' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' - find('.is-checkbox').click + check 'is-checkbox' accept_confirm do click_button '休会する' end @@ -68,7 +68,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'senpai' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' - find('.is-checkbox').click + check 'is-checkbox' accept_confirm do click_button '休会する' end From b5d4e52410475ccacc50a8cbd0bdc90796393799 Mon Sep 17 00:00:00 2001 From: TakashimaAyaka Date: Tue, 4 Oct 2022 20:09:07 +0900 Subject: [PATCH 11/14] =?UTF-8?q?=E6=97=A5=E4=BB=98=E3=82=92=E8=B6=85?= =?UTF-8?q?=E3=81=88=E3=81=9F=E3=82=89=E3=83=86=E3=82=B9=E3=83=88=E3=81=8C?= =?UTF-8?q?=E8=90=BD=E3=81=A1=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/system/notification/hibernation_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/system/notification/hibernation_test.rb b/test/system/notification/hibernation_test.rb index 4a35326aa7d..e5f9dc2c17b 100644 --- a/test/system/notification/hibernation_test.rb +++ b/test/system/notification/hibernation_test.rb @@ -22,7 +22,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'kimura' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' - check 'is-checkbox' + find('.is-checkbox').click accept_confirm do click_button '休会する' end @@ -45,7 +45,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'kensyu' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' - check 'is-checkbox' + find('.is-checkbox').click accept_confirm do click_button '休会する' end @@ -68,7 +68,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'senpai' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' - check 'is-checkbox' + find('.is-checkbox').click accept_confirm do click_button '休会する' end From 169b0290614547292b264b4893d3d44d25b5c2c4 Mon Sep 17 00:00:00 2001 From: TakashimaAyaka Date: Tue, 4 Oct 2022 22:01:26 +0900 Subject: [PATCH 12/14] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=8C?= =?UTF-8?q?=E9=80=9A=E3=82=89=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=81=A7=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=83=9C?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=B9=E3=81=AE=E3=83=A1=E3=82=BD=E3=83=83?= =?UTF-8?q?=E3=83=89=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/system/hibernation_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/system/hibernation_test.rb b/test/system/hibernation_test.rb index 6018b33dd8c..129c7784908 100644 --- a/test/system/hibernation_test.rb +++ b/test/system/hibernation_test.rb @@ -19,7 +19,7 @@ class HibernationTest < ApplicationSystemTestCase end VCR.use_cassette 'subscription/update', vcr_options do - check 'is-checkbox' + find('.is-checkbox').click click_on '休会する' page.driver.browser.switch_to.alert.accept assert_text '休会処理が完了しました' @@ -32,7 +32,7 @@ class HibernationTest < ApplicationSystemTestCase fill_in('hibernation[reason]', with: 'test') end - check 'is-checkbox' + find('.is-checkbox').click click_on '休会する' page.driver.browser.switch_to.alert.accept assert_text '復帰予定日を入力してください' From 1676ce083cab3dedf6d52878ecd33a5e3bd10dd0 Mon Sep 17 00:00:00 2001 From: TakashimaAyaka Date: Fri, 7 Oct 2022 19:04:30 +0900 Subject: [PATCH 13/14] =?UTF-8?q?html=E5=86=85=E3=81=AEid=E3=82=92?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/hibernation/new.html.slim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/hibernation/new.html.slim b/app/views/hibernation/new.html.slim index 1a0b279be5c..beaa7621123 100644 --- a/app/views/hibernation/new.html.slim +++ b/app/views/hibernation/new.html.slim @@ -74,8 +74,8 @@ header.page-header .block-checks.is-1-item.is-centered .block-checks__item .a-block-check.is-checkbox - input.a-toggle-checkbox.js-hibernation-agreements-checkbox#aaa(type='checkbox') - label.a-block-check__label(for='aaa') + input.a-toggle-checkbox.js-hibernation-agreements-checkbox#check-to-read(type='checkbox') + label.a-block-check__label(for='check-to-read') | 読みました .form-actions From b4f3f09c07b989498272aa55166f510ac84a13e0 Mon Sep 17 00:00:00 2001 From: TakashimaAyaka Date: Tue, 11 Oct 2022 19:28:33 +0900 Subject: [PATCH 14/14] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=A7?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B=E3=82=AF=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E5=90=8D=E3=82=92=E5=85=B7=E4=BD=93=E7=9A=84=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/hibernation/new.html.slim | 2 +- test/system/hibernation_test.rb | 4 ++-- test/system/notification/hibernation_test.rb | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/hibernation/new.html.slim b/app/views/hibernation/new.html.slim index beaa7621123..d7c7653e53c 100644 --- a/app/views/hibernation/new.html.slim +++ b/app/views/hibernation/new.html.slim @@ -73,7 +73,7 @@ header.page-header | 休会についての注意を読みましたか？ .block-checks.is-1-item.is-centered .block-checks__item - .a-block-check.is-checkbox + .a-block-check.is-checkbox.check-box-to-read input.a-toggle-checkbox.js-hibernation-agreements-checkbox#check-to-read(type='checkbox') label.a-block-check__label(for='check-to-read') | 読みました diff --git a/test/system/hibernation_test.rb b/test/system/hibernation_test.rb index 129c7784908..c19a7300e89 100644 --- a/test/system/hibernation_test.rb +++ b/test/system/hibernation_test.rb @@ -19,7 +19,7 @@ class HibernationTest < ApplicationSystemTestCase end VCR.use_cassette 'subscription/update', vcr_options do - find('.is-checkbox').click + find('.check-box-to-read').click click_on '休会する' page.driver.browser.switch_to.alert.accept assert_text '休会処理が完了しました' @@ -32,7 +32,7 @@ class HibernationTest < ApplicationSystemTestCase fill_in('hibernation[reason]', with: 'test') end - find('.is-checkbox').click + find('.check-box-to-read').click click_on '休会する' page.driver.browser.switch_to.alert.accept assert_text '復帰予定日を入力してください' diff --git a/test/system/notification/hibernation_test.rb b/test/system/notification/hibernation_test.rb index e5f9dc2c17b..6d58cefc51e 100644 --- a/test/system/notification/hibernation_test.rb +++ b/test/system/notification/hibernation_test.rb @@ -22,7 +22,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'kimura' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' - find('.is-checkbox').click + find('.check-box-to-read').click accept_confirm do click_button '休会する' end @@ -45,7 +45,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'kensyu' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' - find('.is-checkbox').click + find('.check-box-to-read').click accept_confirm do click_button '休会する' end @@ -68,7 +68,7 @@ class Notification::HibernationTest < ApplicationSystemTestCase visit_with_auth new_hibernation_path, 'senpai' fill_in 'hibernation[scheduled_return_on]', with: Time.current.next_month fill_in 'hibernation[reason]', with: 'テストのため' - find('.is-checkbox').click + find('.check-box-to-read').click accept_confirm do click_button '休会する' end