pact_broker 1.14.0 → 1.15.0

data/spec/lib/pact_broker/api/contracts/put_pact_params_contract_spec.rb

@@ -4,9 +4,7 @@ require 'pact_broker/api/contracts/put_pact_params_contract'
 module PactBroker
   module Api
     module Contracts
-
       describe PutPactParamsContract do
-
         let(:json_content) { {'some' => 'json' }.to_json }
         let(:pact_params) { Pacts::PactParams.new(attributes) }
 
@@ -24,17 +22,16 @@ module PactBroker
         subject { PutPactParamsContract.new(pact_params) }
 
         describe "errors" do
-
           let(:attributes) { valid_attributes }
 
           before do
-            subject.validate
+            subject.validate(attributes)
           end
 
           context "with valid params" do
 
             it "is empty" do
-              expect(subject.errors.any?).to be false
+              expect(subject.errors).to be_empty
             end
           end
 
@@ -44,7 +41,7 @@ module PactBroker
             end
 
             it "returns an error" do
-              expect(subject.errors.full_messages).to include "Consumer version number can't be blank"
+              expect(subject.errors[:consumer_version_number]).to include("can't be blank")
             end
           end
 
@@ -54,42 +51,41 @@ module PactBroker
             end
 
             it "returns an error" do
-              expect(subject.errors.full_messages).to include "Consumer version number can't be blank"
+              expect(subject.errors[:consumer_version_number]).to include("can't be blank")
             end
           end
 
           context "with an invalid version number" do
-            let(:attributes) { {consumer_version_number: 'blah'} }
+            let(:attributes) do
+              valid_attributes.merge(consumer_version_number: 'blah')
+            end
 
             it "returns an error" do
-              expect(subject.errors[:base].first).to include "Consumer version number 'blah' cannot be parsed to a version number."
+              expect(subject.errors[:consumer_version_number]).to include(/Consumer version number 'blah' cannot be parsed to a version number/)
             end
           end
 
           context "with a consumer name in the pact that does not match the consumer name in the path" do
-
             let(:attributes) do
               valid_attributes.merge(consumer_name: "another consumer")
             end
 
             it "returns an error" do
-              expect(subject.errors.full_messages).to include "Consumer name in pact ('consumer') does not match consumer name in path ('another consumer')."
+              expect(subject.errors[:'consumer.name']).to include("does not match consumer name in path ('another consumer').")
             end
           end
 
           context "with a provider name in the pact that does not match the provider name in the path" do
-
             let(:attributes) do
               valid_attributes.merge(provider_name: "another provider")
             end
 
             it "returns an error" do
-              expect(subject.errors.full_messages).to include "Provider name in pact ('provider') does not match provider name in path ('another provider')."
+              expect(subject.errors[:'provider.name']).to include("does not match provider name in path ('another provider').")
             end
           end
 
           context "when the consumer name in the pact is not present" do
-
             let(:attributes) do
               valid_attributes.tap do | atts |
                 atts.delete(:consumer_name_in_pact)
@@ -97,12 +93,11 @@ module PactBroker
             end
 
             it "returns no error because I don't want to stop a different CDC from being published" do
-              expect(subject.errors.any?).to be false
+              expect(subject.errors).to be_empty
             end
           end
 
           context "when the provider name in the pact is not present" do
-
             let(:attributes) do
               valid_attributes.tap do | atts |
                 atts.delete(:provider_name_in_pact)
@@ -110,12 +105,10 @@ module PactBroker
             end
 
             it "returns no error because I don't want to stop a different CDC from being published" do
-              expect(subject.errors.any?).to be false
+              expect(subject.errors).to be_empty
             end
           end
-
         end
-
       end
     end
   end

data/spec/lib/pact_broker/api/contracts/webhook_contract_spec.rb

@@ -6,8 +6,8 @@ module PactBroker
   module Api
     module Contracts
       describe WebhookContract do
-
         let(:json) { load_fixture 'webhook_valid.json' }
+        let(:hash) { JSON.parse(json) }
         let(:webhook) { PactBroker::Api::Decorators::WebhookDecorator.new(Domain::Webhook.new).from_json(json) }
         let(:subject) { WebhookContract.new(webhook) }
 
@@ -20,21 +20,19 @@ module PactBroker
         describe "errors" do
 
           before do
-            subject.validate
+            subject.validate(hash)
           end
 
           context "with valid fields" do
             it "is empty" do
-              expect(subject.errors.any?).to be false
+              expect(subject.errors).to be_empty
             end
           end
 
           context "with no request defined" do
-
             let(:json) { {}.to_json }
 
             it "contains an error for missing request" do
-              subject.validate
               expect(subject.errors[:request]).to eq ["can't be blank"]
             end
           end
@@ -47,7 +45,7 @@ module PactBroker
             end
 
             it "contains an error for missing method" do
-              expect(subject.errors[:"request.http_method"]).to eq ["can't be blank"]
+              expect(subject.errors[:"request.http_method"]).to include "can't be blank"
             end
           end
 
@@ -59,7 +57,7 @@ module PactBroker
             end
 
             it "contains an error for invalid method" do
-              expect(subject.errors[:"request.method"]).to eq ["is not a recognised HTTP method"]
+              expect(subject.errors[:"request.http_method"]).to include "is not a recognised HTTP method"
             end
           end
 
@@ -71,7 +69,7 @@ module PactBroker
             end
 
             it "contains an error for missing URL" do
-              expect(subject.errors[:"request.url"]).to eq ["can't be blank"]
+              expect(subject.errors[:"request.url"]).to include "can't be blank"
             end
           end
 
@@ -103,4 +101,4 @@ module PactBroker
       end
     end
   end
-end
+end

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

@@ -15,10 +15,10 @@ module PactBroker
             .create_consumer("Consumer")
             .create_version("1.2.3")
             .create_tag("prod")
-          PactBroker::Repositories::TagRepository.new.find tag_name: 'prod', pacticipant_version_number: '1.2.3', pacticipant_name: 'Consumer'
+          PactBroker::Repositories::TagRepository.new.find(tag_name: 'prod', pacticipant_version_number: '1.2.3', pacticipant_name: 'Consumer')
         end
 
-        let(:options) { {base_url: 'http://example.org' }}
+        let(:options) { { user_options: { base_url: 'http://example.org' } } }
 
         subject { JSON.parse TagDecorator.new(tag).to_json(options), symbolize_names: true }
 

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

@@ -13,7 +13,7 @@ module PactBroker
           PactBroker::Repositories::VersionRepository.new.find_by_pacticipant_name_and_number "Consumer", "1.2.3"
         end
 
-        let(:options) { {base_url: 'http://example.org' }}
+        let(:options) { { user_options: { base_url: 'http://example.org' } } }
 
         subject { JSON.parse EmbeddedVersionDecorator.new(version).to_json(options), symbolize_names: true }
 

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

@@ -12,7 +12,7 @@ module PactBroker
         let(:pact) { RepresentablePact.new(ProviderStateBuilder.new.create_pact_with_hierarchy 'Consumer', '1.2.3', 'Provider') }
         let(:base_url) { 'http://example.org' }
 
-        subject { JSON.parse LatestPactDecorator.new(pact).to_json(base_url: base_url), symbolize_names: true}
+        subject { JSON.parse LatestPactDecorator.new(pact).to_json(user_options: { base_url: base_url }), symbolize_names: true}
 
         it "includes the createdAt date" do
           expect(subject[:createdAt]).to_not be_nil

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

@@ -35,7 +35,7 @@ module PactBroker
         let(:provider) { instance_double(PactBroker::Domain::Pacticipant, name: 'A Provider')}
         let(:consumer_version) { instance_double(PactBroker::Domain::Version, number: '1234', pacticipant: consumer)}
 
-        subject { JSON.parse PactDecorator.new(pact).to_json(base_url: base_url), symbolize_names: true}
+        subject { JSON.parse PactDecorator.new(pact).to_json(user_options: { base_url: base_url }), symbolize_names: true}
 
         describe "#to_json" do
 
@@ -105,4 +105,4 @@ module PactBroker
       end
     end
   end
-end
+end

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

@@ -35,7 +35,7 @@ module PactBroker
         let(:consumer_version) { instance_double(PactBroker::Domain::Version, number: '1234', pacticipant: consumer)}
         let(:decorator_context) { DecoratorContext.new(base_url, '') }
 
-        let(:json) { PactVersionDecorator.new(pact).to_json(decorator_context) }
+        let(:json) { PactVersionDecorator.new(pact).to_json(user_options: decorator_context) }
 
         subject { JSON.parse(json, symbolize_names: true) }
 

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

@@ -19,7 +19,7 @@ module PactBroker
           PactBroker::Repositories::TagRepository.new.find tag_name: 'prod', pacticipant_version_number: '1.2.3', pacticipant_name: 'Consumer'
         end
 
-        let(:options) { {base_url: 'http://example.org' }}
+        let(:options) { { user_options: { base_url: 'http://example.org' } } }
 
         subject { JSON.parse TagDecorator.new(tag).to_json(options), symbolize_names: true }
 

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

@@ -14,7 +14,7 @@ module PactBroker
           PactBroker::Repositories::VersionRepository.new.find_by_pacticipant_name_and_number "Consumer", "1.2.3"
         end
 
-        let(:options) { {base_url: 'http://example.org' }}
+        let(:options) { { user_options: { base_url: 'http://example.org' } } }
 
         subject { JSON.parse VersionDecorator.new(version).to_json(options), symbolize_names: true }
 

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

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'pact_broker/api/decorators/versions_decorator'
+require 'pact_broker/domain/version'
+
+module PactBroker
+
+  module Api
+
+    module Decorators
+
+      describe VersionsDecorator do
+
+        let(:options) { {base_url: 'http://example.org', pacticipant_name: "Consumer" }}
+
+        subject { JSON.parse VersionsDecorator.new(versions).to_json(user_options: options), symbolize_names: true }
+
+        context "with no versions" do
+          let(:versions) { [] }
+
+          it "doesn't blow up" do
+            subject
+          end
+        end
+
+        context "with versions" do
+          let(:version) do
+            ProviderStateBuilder.new
+              .create_consumer("Consumer")
+              .create_consumer_version("1.2.3")
+              .create_consumer_version_tag("prod")
+            PactBroker::Repositories::VersionRepository.new.find_by_pacticipant_name_and_number "Consumer", "1.2.3"
+          end
+          let(:versions) { [version] }
+
+          it "displays a list of versions" do
+            expect(subject[:_embedded][:versions]).to be_instance_of(Array)
+            expect(subject[:_embedded][:versions].size).to eq 1
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -5,8 +5,7 @@ module PactBroker
   module Api
     module Decorators
       describe WebhookDecorator do
-
-        let(:headers) { {:'Content-Type' => 'application/json'} }
+        let(:headers) { { :'Content-Type' => 'application/json' } }
         let(:request) do
           {
             method: 'POST',
@@ -32,97 +31,94 @@ module PactBroker
             consumer: consumer,
             provider: provider,
             created_at: created_at,
-            updated_at: updated_at)
+            updated_at: updated_at
+          )
         end
 
         subject { WebhookDecorator.new(webhook) }
 
-        describe "to_json" do
-
-          let(:parsed_json) { JSON.parse(subject.to_json(base_url: 'http://example.org'), symbolize_names: true)}
+        describe 'to_json' do
+          let(:parsed_json) { JSON.parse(subject.to_json(user_options: { base_url: 'http://example.org' }), symbolize_names: true) }
 
-          it "includes the request" do
+          it 'includes the request' do
             expect(parsed_json[:request]).to eq request
           end
 
-          it "includes an embedded consumer" do
+          it 'includes an embedded consumer' do
             expect(parsed_json[:_embedded][:consumer]).to eq ({
-                name: 'Consumer',
-                :_links => {
-                  :self => {
-                    :href=>"http://example.org/pacticipants/Consumer"
-                    }
-                  }
-                })
+              name: 'Consumer',
+              _links: {
+                self: {
+                  href: 'http://example.org/pacticipants/Consumer'
+                }
+              }
+            })
           end
 
-          it "includes an embedded provider" do
+          it 'includes an embedded provider' do
             expect(parsed_json[:_embedded][:provider]).to eq ({
-                name: 'Provider',
-                :_links => {
-                  :self => {
-                    :href=>"http://example.org/pacticipants/Provider"
-                    }
-                  }
-                })
+              name: 'Provider',
+              _links: {
+                self: {
+                  href: 'http://example.org/pacticipants/Provider'
+                }
+              }
+            })
           end
 
-          it "includes a link to itself" do
+          it 'includes a link to itself' do
             expect(parsed_json[:_links][:self][:href]).to eq 'http://example.org/webhooks/some-uuid'
             expect(parsed_json[:_links][:self][:title]).to_not be_nil
           end
 
-          it "includes a link to its parent collection" do
+          it 'includes a link to its parent collection' do
             expect(parsed_json[:_links][:'pact-webhooks'][:href]).to_not be_nil
           end
 
-
-          it "includes a link to the webhooks resource" do
+          it 'includes a link to the webhooks resource' do
             expect(parsed_json[:_links][:webhooks][:href]).to_not be_nil
           end
 
-          it "includes a link to execute the webhook directly" do
+          it 'includes a link to execute the webhook directly' do
             expect(parsed_json[:_links][:execute][:href]).to eq 'http://example.org/webhooks/some-uuid/execute'
           end
 
-          it "includes timestamps" do
+          it 'includes timestamps' do
             expect(parsed_json[:createdAt]).to eq created_at.xmlschema
             expect(parsed_json[:updatedAt]).to eq updated_at.xmlschema
           end
 
-          context "when the headers are empty" do
+          context 'when the headers are empty' do
             let(:headers) { nil }
-            it "does not include the headers" do
+            it 'does not include the headers' do
               expect(parsed_json[:request]).to_not have_key :headers
             end
           end
-
         end
 
-        describe "from_json" do
+        describe 'from_json' do
           let(:hash) { { request: request } }
           let(:json) { hash.to_json }
           let(:webhook) { Domain::Webhook.new }
           let(:parsed_object) { subject.from_json(json) }
 
-          it "parses the request method" do
+          it 'parses the request method' do
             expect(parsed_object.request.method).to eq 'POST'
           end
 
-          it "parses the request URL" do
+          it 'parses the request URL' do
             expect(parsed_object.request.url).to eq 'http://example.org/hook'
           end
 
-          it "parses the request headers" do
+          it 'parses the request headers' do
             expect(parsed_object.request.headers).to eq 'Content-Type' => 'application/json'
           end
 
-          it "parses the request body" do
+          it 'parses the request body' do
             expect(parsed_object.request.body).to eq 'some' => 'body'
           end
         end
-
       end
     end
   end
-end
+end