feat: correct logs relation to pb:logs in the triggered webhooks reso…

…urce
pact-foundation · Jan 30, 2020 · 89ea1a5 · 89ea1a5
1 parent db1ed1e
commit 89ea1a5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lib/pact_broker/api/decorators/triggered_webhook_decorator.rb b/lib/pact_broker/api/decorators/triggered_webhook_decorator.rb
@@ -12,14 +12,22 @@ class TriggeredWebhookDecorator < BaseDecorator
 
         property :created_at, as: :triggeredAt
 
-        link :logs do | context |
+        link :'pb:logs' do | context |
           {
             href: triggered_webhook_logs_url(represented, context[:base_url]),
             title: "Webhook execution logs",
             name: represented.request_description
           }
         end
 
+        link :logs do | context |
+          {
+            href: triggered_webhook_logs_url(represented, context[:base_url]),
+            title: "DEPRECATED - Use pb:logs",
+            name: represented.request_description
+          }
+        end
+
         link :'pb:webhook' do | context |
           {
             href: webhook_url(represented.webhook_uuid, context[:base_url]),

diff --git a/lib/pact_broker/api/resources/triggered_webhook_logs.rb b/lib/pact_broker/api/resources/triggered_webhook_logs.rb
@@ -26,7 +26,7 @@ def to_text
 
         def triggered_webhook
           @triggered_webhook ||= begin
-            criteria = {webhook_uuid: identifier_from_path[:uuid], trigger_uuid: identifier_from_path[:trigger_uuid]}
+            criteria = { webhook_uuid: identifier_from_path[:uuid], trigger_uuid: identifier_from_path[:trigger_uuid] }
             PactBroker::Webhooks::TriggeredWebhook.where(criteria).single_record
           end
         end

diff --git a/spec/lib/pact_broker/api/decorators/triggered_webhook_decorator_spec.rb b/spec/lib/pact_broker/api/decorators/triggered_webhook_decorator_spec.rb
@@ -43,7 +43,7 @@ module Decorators
         subject { JSON.parse(json, symbolize_names: true) }
 
         it "includes a link to the logs" do
-          expect(subject[:_links][:logs][:href]).to eq logs_url
+          expect(subject[:_links][:'pb:logs'][:href]).to eq logs_url
         end
 
         it "includes a link to the webhook" do