pact_broker 2.77.0 → 2.80.0

data/spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb

@@ -1,16 +1,16 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'pact_broker/domain'
-require 'pact_broker/api/decorators'
+require "pact_broker/domain"
+require "pact_broker/api/decorators"
 
 module PactBroker::Api::Decorators
 
   describe PactCollectionDecorator do
 
     let(:pact) do
-      provider = PactBroker::Domain::Pacticipant.create(:name => 'Pricing Service')
-      consumer = PactBroker::Domain::Pacticipant.create(:name => 'Condor')
-      version = PactBroker::Domain::Version.create(:number => '1.3.0', :pacticipant => consumer)
+      provider = PactBroker::Domain::Pacticipant.create(:name => "Pricing Service")
+      consumer = PactBroker::Domain::Pacticipant.create(:name => "Condor")
+      version = PactBroker::Domain::Version.create(:number => "1.3.0", :pacticipant => consumer)
       pact = PactBroker::Domain::Pact.create(:consumer_version => version, :provider => provider)
       pact
     end

data/spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb

@@ -1,26 +1,26 @@
-require 'spec_helper'
-require 'pact_broker/api/decorators/pact_decorator'
+require "spec_helper"
+require "pact_broker/api/decorators/pact_decorator"
 
 module PactBroker
   module Api
     module Decorators
       describe PactDecorator do
         before do
-          allow(decorator).to receive(:templated_diff_url).and_return('templated-diff-url')
-          allow(decorator).to receive(:verification_publication_url).and_return('verification-publication-url')
+          allow(decorator).to receive(:templated_diff_url).and_return("templated-diff-url")
+          allow(decorator).to receive(:verification_publication_url).and_return("verification-publication-url")
         end
         let(:content_hash) {
           {
-            'consumer' => {'name' => 'Consumer'},
-            'provider' => {'name' => 'Provider'},
-            'interactions' => [],
-            'metadata' => {}
+            "consumer" => {"name" => "Consumer"},
+            "provider" => {"name" => "Provider"},
+            "interactions" => [],
+            "metadata" => {}
           }
         }
 
-        let(:base_url) { 'http://example.org' }
+        let(:base_url) { "http://example.org" }
         let(:created_at) { Time.new(2014, 3, 4) }
-        let(:pact) { double('pact',
+        let(:pact) { double("pact",
           content_hash: content_hash,
           created_at: created_at,
           consumer: consumer,
@@ -28,14 +28,14 @@ module PactBroker
           provider: provider,
           provider_name: provider.name,
           consumer_version: consumer_version,
-          consumer_version_number: '1234',
-          pact_version_sha: '9999',
+          consumer_version_number: "1234",
+          pact_version_sha: "9999",
           revision_number: 2,
-          name: 'A Pact'
+          name: "A Pact"
         )}
-        let(:consumer) { instance_double(PactBroker::Domain::Pacticipant, name: 'A Consumer')}
-        let(:provider) { instance_double(PactBroker::Domain::Pacticipant, name: 'A Provider')}
-        let(:consumer_version) { instance_double(PactBroker::Domain::Version, number: '1234', pacticipant: consumer)}
+        let(:consumer) { instance_double(PactBroker::Domain::Pacticipant, name: "A Consumer")}
+        let(:provider) { instance_double(PactBroker::Domain::Pacticipant, name: "A Provider")}
+        let(:consumer_version) { instance_double(PactBroker::Domain::Version, number: "1234", pacticipant: consumer)}
         let(:metadata) { "abcd" }
         let(:decorator) { PactDecorator.new(pact) }
         let(:json) { decorator.to_json(user_options: { base_url: base_url, metadata: metadata }) }
@@ -49,7 +49,7 @@ module PactBroker
           end
 
           it "includes the json_content" do
-            expect(subject[:consumer]).to eq name: 'Consumer'
+            expect(subject[:consumer]).to eq name: "Consumer"
           end
 
           it "includes the createdAt date" do
@@ -57,17 +57,17 @@ module PactBroker
           end
 
           it "includes a link to itself" do
-            expect(subject[:_links][:self]).to eq href: 'http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1234', name: 'A Pact', title: 'Pact'
+            expect(subject[:_links][:self]).to eq href: "http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1234", name: "A Pact", title: "Pact"
           end
 
           it "includes a link to the diff with the previous distinct version" do
-            expect(subject[:_links][:'pb:diff-previous-distinct']).to eq({href: 'http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1234/diff/previous-distinct',
-              title: 'Diff with previous distinct version of this pact'})
+            expect(subject[:_links][:'pb:diff-previous-distinct']).to eq({href: "http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1234/diff/previous-distinct",
+              title: "Diff with previous distinct version of this pact"})
           end
 
           it "includes a link to the previous distinct pact version" do
-            expect(subject[:_links][:'pb:previous-distinct']).to eq({href: 'http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1234/previous-distinct',
-              title: 'Previous distinct version of this pact'})
+            expect(subject[:_links][:'pb:previous-distinct']).to eq({href: "http://example.org/pacts/provider/A%20Provider/consumer/A%20Consumer/version/1234/previous-distinct",
+              title: "Previous distinct version of this pact"})
           end
 
           it "includes a link to tag this version" do
@@ -75,11 +75,11 @@ module PactBroker
           end
 
           it "includes a link to the consumer" do
-            expect(subject[:_links][:'pb:consumer']).to eq name: 'A Consumer', title: 'Consumer', href: "http://example.org/pacticipants/A%20Consumer"
+            expect(subject[:_links][:'pb:consumer']).to eq name: "A Consumer", title: "Consumer", href: "http://example.org/pacticipants/A%20Consumer"
           end
 
           it "includes a link to the provider" do
-            expect(subject[:_links][:'pb:provider']).to eq name: 'A Provider', title: 'Provider', href: "http://example.org/pacticipants/A%20Provider"
+            expect(subject[:_links][:'pb:provider']).to eq name: "A Provider", title: "Provider", href: "http://example.org/pacticipants/A%20Provider"
           end
 
           it "includes a link to the webhooks for this pact" do
@@ -115,7 +115,7 @@ module PactBroker
           end
 
           it "includes a link to diff this pact version with another pact version" do
-            expect(subject[:_links][:'pb:diff'][:href]).to eq 'templated-diff-url'
+            expect(subject[:_links][:'pb:diff'][:href]).to eq "templated-diff-url"
             expect(subject[:_links][:'pb:diff'][:templated]).to eq true
           end
 

data/spec/lib/pact_broker/api/decorators/pact_version_decorator_spec.rb

@@ -1,41 +1,47 @@
-require 'spec_helper'
-require 'pact_broker/api/decorators/pact_version_decorator'
+require "spec_helper"
+require "pact_broker/api/decorators/pact_version_decorator"
 
 module PactBroker
   module Api
     module Decorators
       describe PactVersionDecorator do
-
         let(:json_content) {
           {
-            'consumer' => {'name' => 'Consumer'},
-            'provider' => {'name' => 'Provider'},
-            'interactions' => [],
-            'metadata' => {}
+            "consumer" => {"name" => "Consumer"},
+            "provider" => {"name" => "Provider"},
+            "interactions" => [],
+            "metadata" => {}
           }.to_json
         }
 
-        let(:base_url) { 'http://example.org' }
+        let(:base_url) { "http://example.org" }
         let(:created_at) { Time.new(2014, 3, 4) }
-        let(:pact) { double('pact',
+        let(:pact) { double("pact",
           json_content: json_content,
           created_at: created_at,
           consumer: consumer,
           provider: provider,
           consumer_version: consumer_version,
-          consumer_version_number: '1234',
-          name: 'pact_name')}
-        let(:consumer) { instance_double(PactBroker::Domain::Pacticipant, name: 'Consumer')}
-        let(:provider) { instance_double(PactBroker::Domain::Pacticipant, name: 'Provider')}
-        let(:consumer_version) { instance_double(PactBroker::Domain::Version, number: '1234', pacticipant: consumer)}
-        let(:decorator_context) { DecoratorContext.new(base_url, '', {}) }
+          consumer_version_number: "1234",
+          name: "pact_name")}
+        let(:consumer) { instance_double(PactBroker::Domain::Pacticipant, name: "Consumer") }
+        let(:provider) { instance_double(PactBroker::Domain::Pacticipant, name: "Provider") }
+        let(:consumer_version) do
+          instance_double(PactBroker::Domain::Version,
+            number: "1234",
+            branch: "main",
+            pacticipant: consumer,
+            build_url: "http://build"
+          )
+        end
+        let(:decorator_context) { DecoratorContext.new(base_url, "", {}) }
 
         let(:json) { PactVersionDecorator.new(pact).to_json(user_options: decorator_context) }
 
         subject { JSON.parse(json, symbolize_names: true) }
 
         it "includes a link to the pact" do
-          expect(subject[:_links][:self][:href]).to eq 'http://example.org/pacts/provider/Provider/consumer/Consumer/version/1234'
+          expect(subject[:_links][:self][:href]).to eq "http://example.org/pacts/provider/Provider/consumer/Consumer/version/1234"
         end
 
         it "includes the consumer version number" do
@@ -49,7 +55,6 @@ module PactBroker
         it "includes timestamps" do
           expect(subject[:createdAt]).to_not be_nil
         end
-
       end
     end
   end

data/spec/lib/pact_broker/api/decorators/pact_webhooks_status_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'pact_broker/api/decorators/pact_webhooks_status_decorator'
+require "pact_broker/api/decorators/pact_webhooks_status_decorator"
 
 module PactBroker
   module Api
@@ -6,39 +6,42 @@ module PactBroker
       describe PactWebhooksStatusDecorator do
 
         let(:user_options) do
-          {consumer: 'Foo', provider: 'Bar', resource_url: 'http://example.org/foo', base_url: 'http://example.org'}
+          {consumer: "Foo", provider: "Bar", resource_url: "http://example.org/foo", base_url: "http://example.org"}
         end
 
         let(:triggered_webhook) do
-          double('PactBroker::Webhooks::TriggeredWebhook',
+          double("PactBroker::Webhooks::TriggeredWebhook",
             trigger_type: PactBroker::Webhooks::TriggeredWebhook::TRIGGER_TYPE_RESOURCE_CREATION,
             status: status,
             failure?: failure,
             retrying?: retrying,
-            trigger_uuid: '1234',
-            webhook_uuid: '4321',
+            uuid: "1234",
+            webhook_uuid: "4321",
             request_description: "GET http://foo",
             pact_publication: pact,
             number_of_attempts_made: 1,
             number_of_attempts_remaining: 2,
             created_at: DateTime.new(2017),
             updated_at: DateTime.new(2017),
-            event_name: 'some_event'
+            event_name: "some_event",
+            webhook: webhook
           )
         end
 
+        let(:webhook) { double("webhook") }
+
         let(:pact) do
-          double('pact',
-            provider: double(name: 'provider'),
-            consumer: double(name: 'consumer'),
-            consumer_version_number: '1',
-            name: 'foo '
+          double("pact",
+            provider: double(name: "provider"),
+            consumer: double(name: "consumer"),
+            consumer_version_number: "1",
+            name: "foo "
           )
         end
         let(:failure) { false }
         let(:retrying) { false }
         let(:status) { PactBroker::Webhooks::TriggeredWebhook::STATUS_SUCCESS }
-        let(:logs_url) { "http://example.org/webhooks/4321/trigger/1234/logs" }
+        let(:logs_url) { "http://example.org/triggered-webhooks/1234/logs" }
         let(:triggered_webhooks) { [triggered_webhook] }
 
         let(:json) do
@@ -61,8 +64,8 @@ module PactBroker
 
         it "includes the triggered webhooks properties" do
           expect(subject[:_embedded][:triggeredWebhooks].first).to include(
-            status: 'success',
-            triggerType: 'resource_creation',
+            status: "success",
+            triggerType: "resource_creation",
             attemptsMade: 1,
             attemptsRemaining: 2
           )

data/spec/lib/pact_broker/api/decorators/pacticipant_collection_decorator_spec.rb

@@ -1,12 +1,12 @@
-require 'spec_helper'
-require 'pact_broker/api/decorators/pacticipant_collection_decorator'
-require 'pact_broker/domain/pacticipant'
+require "spec_helper"
+require "pact_broker/api/decorators/pacticipant_collection_decorator"
+require "pact_broker/domain/pacticipant"
 
 module PactBroker
   module Api
     module Decorators
       describe PacticipantCollectionDecorator do
-        let(:options) { {user_options: {base_url: 'http://example.org'} } }
+        let(:options) { {user_options: {base_url: "http://example.org"} } }
         let(:pacticipants) { [] }
         let(:json) { PacticipantCollectionDecorator.new(pacticipants).to_json(options) }
 
@@ -23,7 +23,7 @@ module PactBroker
         end
 
         context "with pacticipants" do
-          let(:pacticipant) { PactBroker::Domain::Pacticipant.new(name: 'Name', created_at: DateTime.new, updated_at: DateTime.new)}
+          let(:pacticipant) { PactBroker::Domain::Pacticipant.new(name: "Name", created_at: DateTime.new, updated_at: DateTime.new)}
           let(:pacticipants) { [pacticipant] }
 
           it "displays a list of pacticipants" do
@@ -34,8 +34,8 @@ module PactBroker
       end
 
       describe DeprecatedPacticipantCollectionDecorator do
-        let(:options) { {user_options: {base_url: 'http://example.org'} } }
-        let(:pacticipant) { PactBroker::Domain::Pacticipant.new(name: 'Name', created_at: DateTime.new, updated_at: DateTime.new)}
+        let(:options) { {user_options: {base_url: "http://example.org"} } }
+        let(:pacticipant) { PactBroker::Domain::Pacticipant.new(name: "Name", created_at: DateTime.new, updated_at: DateTime.new)}
         let(:pacticipants) { [pacticipant] }
         let(:json) { DeprecatedPacticipantCollectionDecorator.new(pacticipants).to_json(options) }
 

data/spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb

@@ -1,73 +1,86 @@
-require 'spec_helper'
-require 'pact_broker/api/decorators/pacticipant_decorator'
-require 'pact_broker/domain/pacticipant'
+require "spec_helper"
+require "pact_broker/api/decorators/pacticipant_decorator"
+require "pact_broker/domain/pacticipant"
 
 module PactBroker
-
   module Api
-
     module Decorators
-
       describe PacticipantDecorator do
+        describe "from_json" do
+          let(:pacticipant) { OpenStruct.new }
+          let(:decorator) { PacticipantDecorator.new(pacticipant) }
+          let(:hash) do
+            {
+              name: "Foo",
+              mainBranch: "main"
+            }
+          end
 
-        let(:test_data_builder) { TestDataBuilder.new }
-        let(:pacticipant) do
-          test_data_builder
-            .create_pacticipant('Name')
-            .create_label('foo')
-            .and_return(:pacticipant)
-        end
-
-        let(:created_at) { Time.new(2014, 3, 4) }
-        let(:updated_at) { Time.new(2014, 3, 5) }
-        let(:base_url) { 'http://example.org' }
+          subject { decorator.from_json(hash.to_json) }
 
-        before do
-          pacticipant.created_at = created_at
-          pacticipant.updated_at = updated_at
-          allow_any_instance_of(PacticipantDecorator).to receive(:templated_tag_url_for_pacticipant).and_return('version_tag_url')
+          its(:name) { is_expected.to eq "Foo" }
+          its(:main_branch) { is_expected.to eq "main" }
         end
+        describe "to_json" do
+          let(:pacticipant) do
+            td.create_pacticipant("Name")
+              .create_label("foo")
+              .and_return(:pacticipant)
+          end
 
-        subject { JSON.parse PacticipantDecorator.new(pacticipant).to_json(user_options: {base_url: base_url}), symbolize_names: true }
+          let(:created_at) { Time.new(2014, 3, 4) }
+          let(:updated_at) { Time.new(2014, 3, 5) }
+          let(:base_url) { "http://example.org" }
 
-        it "includes timestamps" do
-          expect(subject[:createdAt]).to eq FormatDateTime.call(created_at)
-          expect(subject[:updatedAt]).to eq FormatDateTime.call(updated_at)
-        end
+          before do
+            pacticipant.created_at = created_at
+            pacticipant.updated_at = updated_at
+            allow_any_instance_of(PacticipantDecorator).to receive(:templated_tag_url_for_pacticipant).and_return("version_tag_url")
+            allow_any_instance_of(PacticipantDecorator).to receive(:templated_version_url_for_pacticipant).and_return("version_url")
+          end
 
-        it "includes embedded labels" do
-          expect(subject[:_embedded][:labels].first).to include name: 'foo'
-          expect(subject[:_embedded][:labels].first[:_links][:self][:href]).to match %r{http://example.org/.*foo}
-        end
+          subject { JSON.parse PacticipantDecorator.new(pacticipant).to_json(user_options: { base_url: base_url }), symbolize_names: true }
 
-        it "creates the URL for a version tag" do
-          expect_any_instance_of(PacticipantDecorator).to receive(:templated_tag_url_for_pacticipant).with("Name", base_url)
-          subject
-        end
+          it "includes timestamps" do
+            expect(subject[:createdAt]).to eq FormatDateTime.call(created_at)
+            expect(subject[:updatedAt]).to eq FormatDateTime.call(updated_at)
+          end
 
-        it "includes a relation for a version tag" do
-          expect(subject[:_links][:'pb:version-tag'][:href]).to eq "version_tag_url"
-        end
+          it "includes embedded labels" do
+            expect(subject[:_embedded][:labels].first).to include name: "foo"
+            expect(subject[:_embedded][:labels].first[:_links][:self][:href]).to match %r{http://example.org/.*foo}
+          end
 
-        context "when there is a latest_version" do
-          before { test_data_builder.create_version("1.2.107") }
-          it "includes an embedded latestVersion" do
-            expect(subject[:_embedded][:latestVersion]).to include number: "1.2.107"
+          it "includes a relation for a version tag" do
+            expect_any_instance_of(PacticipantDecorator).to receive(:templated_tag_url_for_pacticipant).with("Name", base_url)
+            expect(subject[:_links][:'pb:version-tag'][:href]).to eq "version_tag_url"
           end
 
-          it "includes an embedded latest-version for backwards compatibility" do
-            expect(subject[:_embedded][:'latest-version']).to include number: "1.2.107"
+          it "includes a relation for a version" do
+            expect_any_instance_of(PacticipantDecorator).to receive(:templated_version_url_for_pacticipant).with("Name", base_url)
+            expect(subject[:_links][:'pb:version'][:href]).to eq "version_url"
           end
 
-          it "includes a deprecation warning" do
-            expect(subject[:_embedded][:'latest-version']).to include title: "DEPRECATED - please use latestVersion"
+          context "when there is a latest_version" do
+            before { td.create_version("1.2.107") }
+            it "includes an embedded latestVersion" do
+              expect(subject[:_embedded][:latestVersion]).to include number: "1.2.107"
+            end
+
+            it "includes an embedded latest-version for backwards compatibility" do
+              expect(subject[:_embedded][:'latest-version']).to include number: "1.2.107"
+            end
+
+            it "includes a deprecation warning" do
+              expect(subject[:_embedded][:'latest-version']).to include title: "DEPRECATED - please use latestVersion"
+            end
           end
-        end
 
-        context "when there is no latest_version" do
-          it "doesn't blow up" do
-            expect(subject[:_embedded]).to_not have_key(:latestVersion)
-            expect(subject[:_embedded]).to_not have_key(:'latest-version')
+          context "when there is no latest_version" do
+            it "doesn't blow up" do
+              expect(subject[:_embedded]).to_not have_key(:latestVersion)
+              expect(subject[:_embedded]).to_not have_key(:'latest-version')
+            end
           end
         end
       end