pact_broker 1.1.0 → 1.2.0

data/spec/lib/pact_broker/repositories/webhook_repository_spec.rb

@@ -34,19 +34,10 @@ module PactBroker
         :consumer_id=> consumer.id,
         :provider_id=> provider.id } }
 
-      before do
-        allow(SecureRandom).to receive(:urlsafe_base64).and_return(uuid)
-      end
-
       describe "#create" do
 
-        subject { WebhookRepository.new.create webhook, consumer, provider }
-
+        subject { WebhookRepository.new.create uuid, webhook, consumer, provider }
 
-        it "generates a UUID" do
-          expect(SecureRandom).to receive(:urlsafe_base64)
-          subject
-        end
 
         it "saves webhook" do
           subject
@@ -67,9 +58,8 @@ module PactBroker
       describe "delete_by_uuid" do
 
         before do
-          allow(SecureRandom).to receive(:urlsafe_base64).and_return(uuid, 'another-uuid')
-          WebhookRepository.new.create webhook, consumer, provider
-          WebhookRepository.new.create webhook, consumer, provider
+          WebhookRepository.new.create uuid, webhook, consumer, provider
+          WebhookRepository.new.create 'another-uuid', webhook, consumer, provider
         end
 
         subject { WebhookRepository.new.delete_by_uuid uuid }
@@ -91,7 +81,7 @@ module PactBroker
 
         before do
           allow(SecureRandom).to receive(:urlsafe_base64).and_return(uuid, 'another-uuid')
-          WebhookRepository.new.create webhook, consumer, provider
+          WebhookRepository.new.create uuid, webhook, consumer, provider
         end
 
         context "when the pacticipant is the consumer" do
@@ -125,7 +115,7 @@ module PactBroker
 
         context "when a webhook is found" do
           before do
-            WebhookRepository.new.create webhook, consumer, provider
+            WebhookRepository.new.create uuid, webhook, consumer, provider
           end
 
           it "returns a webhook with the consumer set" do
@@ -200,9 +190,8 @@ module PactBroker
 
       describe "find_all" do
         before do
-          allow(SecureRandom).to receive(:urlsafe_base64).and_return(uuid, 'some-other-uuid')
-          WebhookRepository.new.create webhook, consumer, provider
-          WebhookRepository.new.create webhook, consumer, provider
+          WebhookRepository.new.create uuid, webhook, consumer, provider
+          WebhookRepository.new.create 'some-other-uuid', webhook, consumer, provider
         end
 
         subject { WebhookRepository.new.find_all }

data/spec/lib/pact_broker/services/pact_service_spec.rb

@@ -6,6 +6,26 @@ module PactBroker
   module Services
     module PactService
 
+      describe "find_distinct_pacts_between" do
+        let(:pact_1) { double('pact 1', json_content: 'content 1')}
+        let(:pact_2) { double('pact 2', json_content: 'content 2')}
+        let(:pact_3) { double('pact 3', json_content: 'content 2')}
+        let(:pact_4) { double('pact 4', json_content: 'content 3')}
+
+        let(:all_pacts) { [pact_4, pact_3, pact_2, pact_1]}
+
+        before do
+          allow_any_instance_of(Repositories::PactRepository).to receive(:find_all_pacts_between).and_return(all_pacts)
+        end
+
+        subject { PactService.find_distinct_pacts_between 'consumer', :and => 'provider' }
+
+        it "returns the distinct pacts" do
+          expect(subject).to eq [pact_4, pact_2, pact_1]
+        end
+
+      end
+
       describe "#pact_has_changed_since_previous_version?" do
 
         let(:json_content) { { 'some' => 'json'}.to_json }

data/spec/lib/pact_broker/services/pacticipant_service_spec.rb

@@ -11,10 +11,95 @@ module PactBroker
 
       subject{ PacticipantService }
 
+      describe ".messages_for_potential_duplicate_pacticipants" do
+
+        let(:base_url) { 'http://example.org' }
+        let(:fred_duplicates) { [double('Frederich pacticipant')] }
+        let(:mary_dulicates) { [double('Marta pacticipant')] }
+
+        before do
+          allow(PacticipantService).to receive(:find_potential_duplicate_pacticipants).with("Fred").and_return(fred_duplicates)
+          allow(PacticipantService).to receive(:find_potential_duplicate_pacticipants).with("Mary").and_return(mary_dulicates)
+          allow(Messages).to receive(:potential_duplicate_pacticipant_message).and_return("message1", "message2")
+        end
+
+        subject { PacticipantService.messages_for_potential_duplicate_pacticipants ["Fred", "Mary"], base_url }
+
+        it "finds the potential duplicates for each name" do
+          expect(PacticipantService).to receive(:find_potential_duplicate_pacticipants).with("Fred")
+          expect(PacticipantService).to receive(:find_potential_duplicate_pacticipants).with("Mary")
+          subject
+        end
+
+        context "when there are potential duplicates" do
+
+          it "creates a message for each dupliate" do
+            expect(Messages).to receive(:potential_duplicate_pacticipant_message).with("Fred", fred_duplicates, base_url)
+            expect(Messages).to receive(:potential_duplicate_pacticipant_message).with("Mary", mary_dulicates, base_url)
+            subject
+          end
+
+          it "returns an array of messages" do
+            expect(subject).to eq ["message1", "message2"]
+          end
+        end
+
+        context "when there are no potential duplicates" do
+          let(:fred_duplicates) { [] }
+          let(:mary_dulicates) { [] }
+
+          it "returns an empty array" do
+            expect(subject).to eq []
+          end
+        end
+      end
+
+      describe ".find_potential_duplicate_pacticipants" do
+        let(:pacticipant_name) { 'pacticipant_name' }
+        let(:duplicates) { ["Fred", "Mary"] }
+        let(:pacticipant_names) { double("pacticipant_names") }
+        let(:fred) { double('fred pacticipant')}
+        let(:mary) { double('mary pacticipant')}
+        let(:pacticipant_repository) { instance_double(PactBroker::Repositories::PacticipantRepository)}
+
+        before do
+          allow(PactBroker::Functions::FindPotentialDuplicatePacticipantNames).to receive(:call).and_return(duplicates)
+          allow(PactBroker::Repositories::PacticipantRepository).to receive(:new).and_return(pacticipant_repository)
+          allow(pacticipant_repository).to receive(:pacticipant_names).and_return(pacticipant_names)
+          allow(pacticipant_repository).to receive(:find_by_name).with("Fred").and_return(fred)
+          allow(pacticipant_repository).to receive(:find_by_name).with("Mary").and_return(mary)
+        end
+
+        it "finds all the pacticipant names" do
+          expect(pacticipant_repository).to receive(:pacticipant_names)
+          subject.find_potential_duplicate_pacticipants pacticipant_name
+        end
+
+        it "calculates the duplicates" do
+          expect(PactBroker::Functions::FindPotentialDuplicatePacticipantNames).to receive(:call).with(pacticipant_name, pacticipant_names)
+          subject.find_potential_duplicate_pacticipants pacticipant_name
+        end
+
+        it "retrieves the pacticipants by name" do
+          expect(pacticipant_repository).to receive(:find_by_name).with("Fred")
+          expect(pacticipant_repository).to receive(:find_by_name).with("Mary")
+          subject.find_potential_duplicate_pacticipants pacticipant_name
+        end
+
+        it "returns the duplicate pacticipants" do
+          expect(subject.find_potential_duplicate_pacticipants(pacticipant_name)).to eq [fred, mary]
+        end
+
+        it "logs the names" do
+          expect(PactBroker.logger).to receive(:info).with(/pacticipant_name.*Fred, Mary/)
+          subject.find_potential_duplicate_pacticipants pacticipant_name
+        end
+      end
+
       describe ".find_relationships" do
 
-        let(:consumer) { instance_double("PactBroker::Models::Pacticpant")}
-        let(:provider) { instance_double("PactBroker::Models::Pacticpant")}
+        let(:consumer) { instance_double("PactBroker::Models::Pacticipant")}
+        let(:provider) { instance_double("PactBroker::Models::Pacticipant")}
         let(:pact) { instance_double("PactBroker::Models::Pact", consumer: consumer, provider: provider)}
         let(:pacts) { [pact]}
 

data/spec/support/provider_state_builder.rb

@@ -36,7 +36,7 @@ class ProviderStateBuilder
   end
 
   def create_ces_cps_pact
-    @pact_id = pact_repository.create(version_id: @contract_email_service_version_id, provider_id: @contract_proposal_service_id, json_content: json_content).id
+    @pact_id = pact_repository.create(version_id: @contract_email_service_version_id, provider_id: @contract_proposal_service_id, json_content: default_json_content).id
     self
   end
 
@@ -56,7 +56,7 @@ class ProviderStateBuilder
   end
 
   def create_condor_pricing_service_pact
-    @pact_id = pact_repository.create(version_id: @condor_version_id, provider_id: @pricing_service_id, json_content: json_content).id
+    @pact_id = pact_repository.create(version_id: @condor_version_id, provider_id: @pricing_service_id, json_content: default_json_content).id
     self
   end
 
@@ -114,14 +114,14 @@ class ProviderStateBuilder
     self
   end
 
-  def create_pact
+  def create_pact json_content = default_json_content
     @pact = PactBroker::Models::Pact.create(consumer_version: @consumer_version, provider: @provider, json_content: json_content)
     self
   end
 
   def create_webhook
     request = PactBroker::Models::WebhookRequest.new(method: 'POST', url: 'http://example.org', headers: {'Content-Type' => 'application/json'})
-    @webhook = WebhookRepository.new.create PactBroker::Models::Webhook.new(request: request), @consumer, @provider
+    @webhook = WebhookRepository.new.create PactBroker::Services::WebhookService.next_uuid, PactBroker::Models::Webhook.new(request: request), @consumer, @provider
     self
   end
 
@@ -136,11 +136,11 @@ class ProviderStateBuilder
   # end
 
   # def create_condor_pricing_service_pact version, provider
-  #   pact_repository.create(consumer_version: version, provider: provider, json_content: json_content)
+  #   pact_repository.create(consumer_version: version, provider: provider, json_content: default_json_content)
   # end
 
-  def json_content
-    json_content = {
+  def default_json_content
+    {
       "consumer"     => {
          "name" => "Condor"
        },

data/tasks/rspec.rake

@@ -2,5 +2,5 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.pattern = FileList['spec/**/*_spec.rb']
+  task.pattern = 'spec/**/*_spec.rb'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -131,6 +131,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,6 +141,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: padrino
   requirement: !ruby/object:Gem::Requirement
@@ -326,6 +332,8 @@ files:
 - lib/pact_broker/api/decorators/pact_decorator.rb
 - lib/pact_broker/api/decorators/pact_details_decorator.rb
 - lib/pact_broker/api/decorators/pact_pacticipant_decorator.rb
+- lib/pact_broker/api/decorators/pact_version_decorator.rb
+- lib/pact_broker/api/decorators/pact_versions_decorator.rb
 - lib/pact_broker/api/decorators/pacticipant_collection_decorator.rb
 - lib/pact_broker/api/decorators/pacticipant_decorator.rb
 - lib/pact_broker/api/decorators/relationships_csv_decorator.rb
@@ -344,13 +352,16 @@ files:
 - lib/pact_broker/api/resources/latest_pact.rb
 - lib/pact_broker/api/resources/latest_pacts.rb
 - lib/pact_broker/api/resources/pact.rb
+- lib/pact_broker/api/resources/pact_versions.rb
 - lib/pact_broker/api/resources/pact_webhooks.rb
 - lib/pact_broker/api/resources/pacticipant.rb
+- lib/pact_broker/api/resources/pacticipant_resource_methods.rb
 - lib/pact_broker/api/resources/pacticipants.rb
 - lib/pact_broker/api/resources/relationships.rb
 - lib/pact_broker/api/resources/tag.rb
 - lib/pact_broker/api/resources/webhook.rb
 - lib/pact_broker/api/resources/webhook_execution.rb
+- lib/pact_broker/api/resources/webhook_resource_methods.rb
 - lib/pact_broker/api/resources/webhooks.rb
 - lib/pact_broker/app.rb
 - lib/pact_broker/configuration.rb
@@ -361,6 +372,7 @@ files:
 - lib/pact_broker/doc/views/pacticipants.markdown
 - lib/pact_broker/doc/views/self.markdown
 - lib/pact_broker/doc/views/webhooks.markdown
+- lib/pact_broker/functions/find_potential_duplicate_pacticipant_names.rb
 - lib/pact_broker/functions/groupify.rb
 - lib/pact_broker/jobs/after_pact_save.rb
 - lib/pact_broker/json.rb
@@ -431,12 +443,14 @@ files:
 - public/js/bootstrap.js
 - public/js/bootstrap.min.js
 - public/stylesheets/github.css
+- public/stylesheets/pact.css
 - public/stylesheets/relationships.css
 - script/update-hal-browser
 - spec/fixtures/renderer_pact.json
 - spec/integration/endpoints/group.rb
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/pact_version_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/relationships_csv_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/representable_pact_spec.rb
@@ -450,18 +464,23 @@ files:
 - spec/lib/pact_broker/api/resources/pact_spec.rb
 - spec/lib/pact_broker/api/resources/pact_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipant_spec.rb
+- spec/lib/pact_broker/api/resources/pacticipants_spec.rb
 - spec/lib/pact_broker/api/resources/tag_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_execution_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_spec.rb
 - spec/lib/pact_broker/api/resources/webhooks_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/doc/controllers/app_spec.rb
+- spec/lib/pact_broker/functions/find_potential_duplicate_pacticipant_names_spec.rb
 - spec/lib/pact_broker/functions/groupify_spec.rb
+- spec/lib/pact_broker/messages_spec.rb
 - spec/lib/pact_broker/models/group_spec.rb
 - spec/lib/pact_broker/models/order_versions_spec.rb
+- spec/lib/pact_broker/models/pacticipant_spec.rb
 - spec/lib/pact_broker/models/webhook_request_spec.rb
 - spec/lib/pact_broker/models/webhook_spec.rb
 - spec/lib/pact_broker/repositories/pact_repository_spec.rb
+- spec/lib/pact_broker/repositories/pacticipant_repository_spec.rb
 - spec/lib/pact_broker/repositories/tag_repository_spec.rb
 - spec/lib/pact_broker/repositories/version_repository_spec.rb
 - spec/lib/pact_broker/repositories/webhook_repository_spec.rb
@@ -549,6 +568,7 @@ test_files:
 - spec/integration/endpoints/group.rb
 - spec/lib/pact_broker/api/decorators/pact_collection_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pact_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/pact_version_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/pacticipant_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/relationships_csv_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/representable_pact_spec.rb
@@ -562,18 +582,23 @@ test_files:
 - spec/lib/pact_broker/api/resources/pact_spec.rb
 - spec/lib/pact_broker/api/resources/pact_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/pacticipant_spec.rb
+- spec/lib/pact_broker/api/resources/pacticipants_spec.rb
 - spec/lib/pact_broker/api/resources/tag_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_execution_spec.rb
 - spec/lib/pact_broker/api/resources/webhook_spec.rb
 - spec/lib/pact_broker/api/resources/webhooks_spec.rb
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/doc/controllers/app_spec.rb
+- spec/lib/pact_broker/functions/find_potential_duplicate_pacticipant_names_spec.rb
 - spec/lib/pact_broker/functions/groupify_spec.rb
+- spec/lib/pact_broker/messages_spec.rb
 - spec/lib/pact_broker/models/group_spec.rb
 - spec/lib/pact_broker/models/order_versions_spec.rb
+- spec/lib/pact_broker/models/pacticipant_spec.rb
 - spec/lib/pact_broker/models/webhook_request_spec.rb
 - spec/lib/pact_broker/models/webhook_spec.rb
 - spec/lib/pact_broker/repositories/pact_repository_spec.rb
+- spec/lib/pact_broker/repositories/pacticipant_repository_spec.rb
 - spec/lib/pact_broker/repositories/tag_repository_spec.rb
 - spec/lib/pact_broker/repositories/version_repository_spec.rb
 - spec/lib/pact_broker/repositories/webhook_repository_spec.rb