一度公開したお知らせを誰でも公開の状態で保存できるように変更

app/views/announcements/_announcement.html.slim

@@ -44,7 +44,14 @@
       .card-footer
         .card-main-actions
           ul.card-main-actions__items
-            - if @announcement.wip || admin_or_mentor_login? || @announcement.user_id == current_user.id
+            // 要デザイン（ここから）
+            - if announcement.published_at
+              li.card-main-actions__item
+                = link_to edit_announcement_path(announcement), class: 'card-main-actions__delete' do
+                  i.fas.fa-pen#new
+                  | 内容修正
+            // 要デザイン（ここまで）
+            - else
               li.card-main-actions__item
                 = link_to edit_announcement_path(announcement), class: 'card-main-actions__action a-button is-md is-secondary is-block', id: 'js-shortcut-edit' do
                   i.fas.fa-pen#new

app/views/announcements/_form.html.slim

@@ -39,19 +39,19 @@
     ul.form-actions__items
       li.form-actions__item.is-main
         = f.submit 'WIP', class: 'a-button is-lg is-primary is-block', id: 'js-shortcut-wip'
-      - if admin_or_mentor_login?
+      - if admin_or_mentor_login? && announcement.new_record?
         li.form-actions__item.is-main.is-help
-          - if announcement.new_record?
-            = f.submit '作成', class: 'a-button is-lg is-warning is-block', id: 'js-shortcut-submit'
-          - else
-            = f.submit '公開', class: 'a-button is-lg is-warning is-block', id: 'js-shortcut-submit'
+          = f.submit '作成', class: 'a-button is-lg is-warning is-block', id: 'js-shortcut-submit'
+      - if admin_or_mentor_login? || announcement.published_at
+        li.form-actions__item.is-main.is-help
+          = f.submit '公開', class: 'a-button is-lg is-warning is-block', id: 'js-shortcut-submit'
       li.form-actions__item.is-sub
         - case params[:action]
         - when 'new', 'create'
           = link_to 'キャンセル', announcements_path, class: 'a-button is-md is-secondary is-block'
         - when 'edit', 'update'
           = link_to 'キャンセル', announcement_path, class: 'a-button is-md is-secondary is-block'
-    - unless admin_or_mentor_login?
+    - unless admin_or_mentor_login? || announcement.published_at
       .form-actions__description.a-short-text
         p
           | お知らせを作成しましたら、WIPで保存し、作成したお知らせのコメントから @mentor へ確認・公開の連絡をお願いします。

test/system/announcements_test.rb

@@ -140,20 +140,51 @@ class AnnouncementsTest < ApplicationSystemTestCase
     assert_no_text 'お知らせ「就活希望者のみお知らせします」'
   end
 
-  test "general user can't edit submitted announcement" do
-    announcement = announcements(:announcement1)
-    visit_with_auth announcement_path(announcement), 'kimura'
+  test "general user can't create announcement" do
+    visit_with_auth '/announcements', 'kimura'
+    click_link 'お知らせ作成'
+    assert has_no_button? '作成'
+    assert_text 'お知らせを作成しましたら、WIPで保存し、作成したお知らせのコメントから @mentor へ確認・公開の連絡をお願いします。'
+  end
+
+  test 'admin user can publish wip announcement' do
+    announcement = announcements(:announcement_wip)
+    visit_with_auth announcement_path(announcement), 'komagata'
     within '.thread__inner' do
-      assert_no_text '内容修正'
+      click_link '内容修正'
     end
+    assert has_button? '公開'
+    assert_no_text 'お知らせを作成しましたら、WIPで保存し、作成したお知らせのコメントから @mentor へ確認・公開の連絡をお願いします。'
   end
 
-  test 'general user can edit wip announcement' do
+  test "general user can't publish wip announcement" do
     announcement = announcements(:announcement_wip)
     visit_with_auth announcement_path(announcement), 'kimura'
     within '.thread__inner' do
-      assert_text '内容修正'
+      click_link '内容修正'
+    end
+    assert has_no_button? '公開'
+    assert_text 'お知らせを作成しましたら、WIPで保存し、作成したお知らせのコメントから @mentor へ確認・公開の連絡をお願いします。'
+  end
+
+  test 'adimin user can publish submitted announcement' do
+    announcement = announcements(:announcement1)
+    visit_with_auth announcement_path(announcement), 'komagata'
+    within '.thread__inner' do
+      click_link '内容修正'
+    end
+    assert has_button? '公開'
+    assert_no_text 'お知らせを作成しましたら、WIPで保存し、作成したお知らせのコメントから @mentor へ確認・公開の連絡をお願いします。'
+  end
+
+  test 'general user can publish submitted announcement' do
+    announcement = announcements(:announcement1)
+    visit_with_auth announcement_path(announcement), 'kimura'
+    within '.thread__inner' do
+      click_link '内容修正'
     end
+    assert has_button? '公開'
+    assert_no_text 'お知らせを作成しましたら、WIPで保存し、作成したお知らせのコメントから @mentor へ確認・公開の連絡をお願いします。'
   end
 
   test 'general user can copy submitted announcement' do