Merge pull request #7769 from fjordllc/bug/incorrect-wip-report-submi…

…ssion-status-message

WIP状態の日報を提出する際に入力内容にエラーがある場合のバグを解消

app/controllers/reports_controller.rb

@@ -58,6 +58,7 @@ def create
   end
 
   def update
+    before_wip_status = @report.wip
     set_wip
     @report.practice_ids = nil if params[:report][:practice_ids].nil?
     @report.assign_attributes(report_params)
@@ -66,6 +67,7 @@ def update
       Newspaper.publish(:report_save, { report: @report })
       redirect_to redirect_url(@report), notice: notice_message(@report), flash: flash_contents(@report)
     else
+      @report.wip = before_wip_status
       render :edit
     end
   end

test/system/reports_test.rb

@@ -735,4 +735,23 @@ def wait_for_watch_change
     end
     assert_equal '.file-input', find('textarea.a-text-input')['data-input']
   end
+
+  test 'submit wip report with error' do
+    report = reports(:report9)
+    visit_with_auth "/reports/#{report.id}", 'sotugyou'
+
+    click_link '内容修正'
+    uncheck '学習時間は無し', allow_label_click: true
+    click_link '学習時間追加'
+
+    first('.learning-time').all('.learning-time__started-at select')[0].select('07')
+    first('.learning-time').all('.learning-time__started-at select')[1].select('30')
+    first('.learning-time').all('.learning-time__finished-at select')[0].select('07')
+    first('.learning-time').all('.learning-time__finished-at select')[1].select('30')
+
+    click_button '提出'
+    assert_text '学習時間は不正な値です'
+    assert_no_text 'この日報はすでに提出済みです。'
+    assert_button '提出'
+  end
 end