pact_broker 2.0.0.beta.6 → 2.0.0.beta.7

data/spec/lib/pact_broker/versions/parse_semantic_version_spec.rb

@@ -22,10 +22,13 @@ module PactBroker
             expect(subject).to be < ParseSemanticVersion.call("1.3.1")
           end
 
+          it "allows versions with one or two parts for backwards compatibility" do
+            expect(ParseSemanticVersion.call("1")).to eq ::SemVer.new(1,0,0)
+            expect(ParseSemanticVersion.call("1.2")).to eq ::SemVer.new(1,2,0)
+          end
+
           it "returns nil when version is invalid" do
             expect(ParseSemanticVersion.call("abc")).to be_nil
-            expect(ParseSemanticVersion.call("1")).to be_nil
-            expect(ParseSemanticVersion.call("1.2")).to be_nil
           end
 
           it "accepts semver metadata" do

data/spec/lib/pact_broker/webhooks/job_spec.rb

@@ -0,0 +1,67 @@
+require 'pact_broker/webhooks/job'
+
+module PactBroker
+  module Webhooks
+    describe Job do
+
+      before do
+        allow(PactBroker::Webhooks::Service).to receive(:execute_webhook_now)
+      end
+
+      let(:webhook) { double("webhook", uuid: '1234') }
+
+      context "when an error occurs for the first time" do
+        before do
+          allow(PactBroker::Webhooks::Service).to receive(:execute_webhook_now).and_raise("an error")
+        end
+
+        it "reschedules the job in 10 seconds" do
+          expect(Job).to receive(:perform_in).with(10, {webhook: webhook, error_count: 1})
+          Job.new.perform(webhook: webhook)
+        end
+      end
+
+      context "when the webhook execution result is not successful for the first time" do
+        before do
+          allow(PactBroker::Webhooks::Service).to receive(:execute_webhook_now).and_return(instance_double("PactBroker::Domain::WebhookExecutionResult", success?: false))
+        end
+
+        it "reschedules the job in 10 seconds" do
+          expect(Job).to receive(:perform_in).with(10, {webhook: webhook, error_count: 1})
+          Job.new.perform(webhook: webhook)
+        end
+      end
+
+      context "when an error occurs for the second time" do
+        before do
+          allow(PactBroker::Webhooks::Service).to receive(:execute_webhook_now).and_raise("an error")
+        end
+
+        it "reschedules the job in 60 seconds" do
+          expect(Job).to receive(:perform_in).with(60, {webhook: webhook, error_count: 2  })
+          Job.new.perform(webhook: webhook, error_count: 1)
+        end
+      end
+
+      context "when an error occurs for the last time" do
+        before do
+          allow(PactBroker::Webhooks::Service).to receive(:execute_webhook_now).and_raise("an error")
+        end
+
+        subject { Job.new.perform(webhook: webhook, error_count: 6) }
+
+        it "does not reschedule the job" do
+          expect(Job).to_not receive(:perform_in)
+          subject
+        end
+
+        it "logs that it has failed" do
+          allow(Job.logger).to receive(:error)
+          expect(Job.logger).to receive(:error).with(/Failed to execute/)
+          subject
+        end
+      end
+
+    end
+  end
+end

data/spec/lib/pact_broker/webhooks/service_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 require 'pact_broker/webhooks/service'
+require 'webmock/rspec'
+require 'sucker_punch/testing/inline'
 
 module PactBroker
 
@@ -12,11 +14,11 @@ module PactBroker
         let(:consumer_version) { PactBroker::Domain::Version.new(number: '1.2.3') }
         let(:consumer) { PactBroker::Domain::Pacticipant.new(name: 'Consumer') }
         let(:provider) { PactBroker::Domain::Pacticipant.new(name: 'Provider') }
-        let(:webhooks) { [instance_double(PactBroker::Domain::Webhook)]}
+        let(:webhooks) { [instance_double(PactBroker::Domain::Webhook, description: 'description', uuid: '1244')]}
 
         before do
           allow_any_instance_of(PactBroker::Webhooks::Repository).to receive(:find_by_consumer_and_provider).and_return(webhooks)
-          allow(Service).to receive(:run_later)
+          allow(Job).to receive(:perform_async)
         end
 
         subject { Service.execute_webhooks pact }
@@ -45,7 +47,42 @@ module PactBroker
             subject
           end
         end
+
+        context "when there is a scheduling error" do
+          before do
+            allow(Job).to receive(:perform_async).and_raise("an error")
+          end
+
+          it "logs the error" do
+            allow(Service.logger).to receive(:error)
+            expect(Service.logger).to receive(:error).with(/an error/)
+            subject
+          end
+        end
+      end
+
+      describe ".execute_webhooks integration test" do
+        let!(:http_request) do
+          stub_request(:get, "http://example.org").
+            to_return(:status => 200)
+        end
+
+        let(:pact) do
+          ProviderStateBuilder.new
+            .create_consumer
+            .create_provider
+            .create_consumer_version
+            .create_pact
+            .create_webhook(method: 'GET', url: 'http://example.org')
+            .and_return(:pact)
+        end
+
+
+        it "executes the HTTP request of the webhook" do
+          PactBroker::Webhooks::Service.execute_webhooks pact
+          expect(http_request).to have_been_made
+        end
       end
     end
   end
-end
+end

data/spec/support/provider_state_builder.rb

@@ -144,8 +144,9 @@ class ProviderStateBuilder
     self
   end
 
-  def create_webhook
-    request = PactBroker::Domain::WebhookRequest.new(method: 'POST', url: 'http://example.org', headers: {'Content-Type' => 'application/json'})
+  def create_webhook params = {}
+    default_params = {method: 'POST', url: 'http://example.org', headers: {'Content-Type' => 'application/json'}}
+    request = PactBroker::Domain::WebhookRequest.new(default_params.merge(params))
     @webhook = PactBroker::Webhooks::Repository.new.create PactBroker::Webhooks::Service.next_uuid, PactBroker::Domain::Webhook.new(request: request), @consumer, @provider
     self
   end

data/tasks/db.rake

@@ -26,8 +26,9 @@ namespace :db do
   end
 
   desc 'Migrate the Database'
-  task :migrate => 'db:env' do
-    PactBroker::Database.migrate
+  task :migrate, [:target] => 'db:env' do |t, args|
+    target = args[:target] ? args[:target].to_i : nil
+    PactBroker::Database.migrate(target)
   end
 
   desc 'Rollback database to specified version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.6
+  version: 2.0.0.beta.7
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
@@ -221,21 +221,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: sucker_punch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -457,7 +471,7 @@ files:
 - lib/pact_broker/api/decorators/tag_decorator.rb
 - lib/pact_broker/api/decorators/timestamps.rb
 - lib/pact_broker/api/decorators/verification_decorator.rb
-- lib/pact_broker/api/decorators/verifications_decorator.rb
+- lib/pact_broker/api/decorators/verification_summary_decorator.rb
 - lib/pact_broker/api/decorators/version_decorator.rb
 - lib/pact_broker/api/decorators/versions_decorator.rb
 - lib/pact_broker/api/decorators/webhook_decorator.rb
@@ -539,12 +553,10 @@ files:
 - lib/pact_broker/pacticipants/repository.rb
 - lib/pact_broker/pacticipants/service.rb
 - lib/pact_broker/pacts/all_pact_publications.rb
-- lib/pact_broker/pacts/all_pacts.rb
 - lib/pact_broker/pacts/create_formatted_diff.rb
 - lib/pact_broker/pacts/diff.rb
 - lib/pact_broker/pacts/latest_pact_publications.rb
 - lib/pact_broker/pacts/latest_pact_publications_by_consumer_version.rb
-- lib/pact_broker/pacts/latest_pacts.rb
 - lib/pact_broker/pacts/latest_tagged_pact_publications.rb
 - lib/pact_broker/pacts/merger.rb
 - lib/pact_broker/pacts/pact_params.rb
@@ -578,10 +590,12 @@ files:
 - lib/pact_broker/verifications/latest_verifications_by_consumer_version.rb
 - lib/pact_broker/verifications/repository.rb
 - lib/pact_broker/verifications/service.rb
+- lib/pact_broker/verifications/summary_for_consumer_version.rb
 - lib/pact_broker/version.rb
 - lib/pact_broker/versions/parse_semantic_version.rb
 - lib/pact_broker/versions/repository.rb
 - lib/pact_broker/versions/service.rb
+- lib/pact_broker/webhooks/job.rb
 - lib/pact_broker/webhooks/repository.rb
 - lib/pact_broker/webhooks/service.rb
 - lib/pact_broker/webhooks/webhook.rb
@@ -614,10 +628,13 @@ files:
 - public/stylesheets/github.css
 - public/stylesheets/pact.css
 - public/stylesheets/relationships.css
+- script/foo-bar.json
 - script/publish-2.sh
+- script/publish-new.sh
 - script/publish-not-a-pact.sh
 - script/publish.sh
 - script/record_verification.sh
+- script/recreate-pg-db.sh
 - script/update-hal-browser
 - spec/features/create_webhook_spec.rb
 - spec/features/delete_pact_spec.rb
@@ -662,7 +679,7 @@ files:
 - spec/lib/pact_broker/api/decorators/representable_pact_spec.rb
 - spec/lib/pact_broker/api/decorators/tag_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_decorator_spec.rb
-- spec/lib/pact_broker/api/decorators/verifications_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/verification_summary_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/version_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/versions_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/webhook_decorator_spec.rb
@@ -715,8 +732,10 @@ files:
 - spec/lib/pact_broker/ui/view_models/relationships_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/service_spec.rb
+- spec/lib/pact_broker/verifications/summary_for_consumer_version_spec.rb
 - spec/lib/pact_broker/versions/parse_semantic_version_spec.rb
 - spec/lib/pact_broker/versions/repository_spec.rb
+- spec/lib/pact_broker/webhooks/job_spec.rb
 - spec/lib/pact_broker/webhooks/repository_spec.rb
 - spec/lib/pact_broker/webhooks/service_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb
@@ -842,7 +861,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/representable_pact_spec.rb
 - spec/lib/pact_broker/api/decorators/tag_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_decorator_spec.rb
-- spec/lib/pact_broker/api/decorators/verifications_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/verification_summary_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/version_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/versions_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/webhook_decorator_spec.rb
@@ -895,8 +914,10 @@ test_files:
 - spec/lib/pact_broker/ui/view_models/relationships_spec.rb
 - spec/lib/pact_broker/verifications/repository_spec.rb
 - spec/lib/pact_broker/verifications/service_spec.rb
+- spec/lib/pact_broker/verifications/summary_for_consumer_version_spec.rb
 - spec/lib/pact_broker/versions/parse_semantic_version_spec.rb
 - spec/lib/pact_broker/versions/repository_spec.rb
+- spec/lib/pact_broker/webhooks/job_spec.rb
 - spec/lib/pact_broker/webhooks/repository_spec.rb
 - spec/lib/pact_broker/webhooks/service_spec.rb
 - spec/lib/rack/hal_browser/redirect_spec.rb

data/lib/pact_broker/api/decorators/verifications_decorator.rb

@@ -1,30 +0,0 @@
-require_relative 'base_decorator'
-require_relative 'version_decorator'
-
-module PactBroker
-  module Api
-    module Decorators
-
-      class VerificationsDecorator < BaseDecorator
-
-        property :success, exec_context: :decorator, if: :any_verifications?
-        collection :entries, as: :'verification-results', embedded: true, :extend => PactBroker::Api::Decorators::VerificationDecorator
-
-        link :self do | context |
-          {
-            href: context.fetch(:resource_url),
-            title: "Latest verification results for consumer #{context.fetch(:consumer_name)} version #{context.fetch(:consumer_version_number)}"
-          }
-        end
-
-        def success
-          represented.collect(&:success).all?
-        end
-
-        def any_verifications? context
-          represented.any?
-        end
-      end
-    end
-  end
-end

data/lib/pact_broker/pacts/all_pacts.rb

@@ -1,12 +0,0 @@
-require 'pact_broker/pacts/all_pact_publications'
-
-module PactBroker
-  module Pacts
-
-    # See /DEVELOPER_DOCUMENTATION.md for all_pacts view
-    class AllPacts < AllPactPublications
-      set_dataset(:all_pacts)
-    end
-
-  end
-end

data/lib/pact_broker/pacts/latest_pacts.rb

@@ -1,12 +0,0 @@
-require 'pact_broker/pacts/all_pacts'
-
-module PactBroker
-  module Pacts
-
-    # See /DEVELOPER_DOCUMENTATION.md for latest_pacts view
-    class LatestPacts < AllPacts
-      set_dataset(:latest_pacts)
-    end
-
-  end
-end