Merge pull request #1975 from basecamp/flavorjones/fix-webhook-view

Pass correct params to webhook reactivation url helper.

app/views/webhooks/show.html.erb

@@ -22,7 +22,7 @@
   </header>
   <% unless @webhook.active? %>
     <div>
-      <%= button_to "Reactivate", board_webhook_activation_path(@webhook), method: :post %>
+      <%= button_to "Reactivate", board_webhook_activation_path(@webhook.board_id, @webhook), method: :post %>
     </div>
   <% end %>
 

test/controllers/webhooks_controller_test.rb

@@ -14,6 +14,10 @@ class WebhooksControllerTest < ActionDispatch::IntegrationTest
     webhook = webhooks(:active)
     get board_webhook_path(webhook.board, webhook)
     assert_response :success
+
+    webhook = webhooks(:inactive)
+    get board_webhook_path(webhook.board, webhook)
+    assert_response :success
   end
 
   test "new" do
@@ -63,6 +67,11 @@ class WebhooksControllerTest < ActionDispatch::IntegrationTest
     get edit_board_webhook_path(webhook.board, webhook)
     assert_response :success
     assert_select "form"
+
+    webhook = webhooks(:inactive)
+    get edit_board_webhook_path(webhook.board, webhook)
+    assert_response :success
+    assert_select "form"
   end
 
   test "update with valid params" do