pact_broker 2.31.0 → 2.32.0

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

@@ -11,6 +11,7 @@ module PactBroker
       let(:previous_pact_version_sha) { "111" }
       let(:previous_pacts) { { untagged: previous_pact } }
       let(:logger) { double('logger').as_null_object }
+      let(:webhook_options) { { the: 'options'} }
 
       before do
         allow(TriggerService).to receive(:pact_repository).and_return(pact_repository)
@@ -20,27 +21,27 @@ module PactBroker
 
       shared_examples_for "triggering a contract_published event" do
         it "triggers a contract_published webhook" do
-          expect(webhook_service).to receive(:trigger_webhooks).with(pact, nil, PactBroker::Webhooks::WebhookEvent::CONTRACT_PUBLISHED)
+          expect(webhook_service).to receive(:trigger_webhooks).with(pact, nil, PactBroker::Webhooks::WebhookEvent::CONTRACT_PUBLISHED, webhook_options)
           subject
         end
       end
 
       shared_examples_for "triggering a contract_content_changed event" do
         it "triggers a contract_content_changed webhook" do
-          expect(webhook_service).to receive(:trigger_webhooks).with(pact, nil, PactBroker::Webhooks::WebhookEvent::CONTRACT_CONTENT_CHANGED)
+          expect(webhook_service).to receive(:trigger_webhooks).with(pact, nil, PactBroker::Webhooks::WebhookEvent::CONTRACT_CONTENT_CHANGED, webhook_options)
           subject
         end
       end
 
       shared_examples_for "not triggering a contract_content_changed event" do
         it "does not trigger a contract_content_changed webhook" do
-          expect(webhook_service).to_not receive(:trigger_webhooks).with(anything, anything, PactBroker::Webhooks::WebhookEvent::CONTRACT_CONTENT_CHANGED)
+          expect(webhook_service).to_not receive(:trigger_webhooks).with(anything, anything, PactBroker::Webhooks::WebhookEvent::CONTRACT_CONTENT_CHANGED, anything)
           subject
         end
       end
 
       describe "#trigger_webhooks_for_new_pact" do
-        subject { TriggerService.trigger_webhooks_for_new_pact(pact) }
+        subject { TriggerService.trigger_webhooks_for_new_pact(pact, webhook_options) }
 
         context "when no previous untagged pact exists" do
           let(:previous_pact) { nil }
@@ -116,7 +117,7 @@ module PactBroker
         end
         let(:existing_pact_version_sha) { pact_version_sha }
 
-        subject { TriggerService.trigger_webhooks_for_updated_pact(existing_pact, pact) }
+        subject { TriggerService.trigger_webhooks_for_updated_pact(existing_pact, pact, webhook_options) }
 
         context "when the pact version sha of the previous revision is different" do
           let(:existing_pact_version_sha) { "456" }

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

@@ -42,11 +42,18 @@ module PactBroker
 
         let(:pact) { double('pact') }
         let(:verification) { double('verification') }
-
-        subject { WebhookRequestTemplate.new(attributes).build(pact: pact, verification: verification, base_url: base_url) }
+        let(:webhook_context) { { some: "context" } }
+        let(:template_context) do
+          {
+            pact: pact,
+            verification: verification,
+            webhook_context: webhook_context
+          }
+        end
+        subject { WebhookRequestTemplate.new(attributes).build(template_context) }
 
         it "renders the url template" do
-          expect(PactBroker::Webhooks::Render).to receive(:call).with(url, pact, verification, base_url) do | content, pact, verification, &block |
+          expect(PactBroker::Webhooks::Render).to receive(:call).with(url, pact, verification, webhook_context) do | content, pact, verification, &block |
             expect(content).to eq url
             expect(pact).to be pact
             expect(verification).to be verification
@@ -60,7 +67,7 @@ module PactBroker
           let(:body) { 'body' }
 
           it "renders the body template with the String" do
-            expect(PactBroker::Webhooks::Render).to receive(:call).with('body', pact, verification, base_url)
+            expect(PactBroker::Webhooks::Render).to receive(:call).with('body', pact, verification, webhook_context)
             subject
           end
         end
@@ -69,7 +76,7 @@ module PactBroker
           let(:request_body_string) { '{"foo":"bar"}' }
 
           it "renders the body template with JSON" do
-            expect(PactBroker::Webhooks::Render).to receive(:call).with(request_body_string, pact, verification, base_url)
+            expect(PactBroker::Webhooks::Render).to receive(:call).with(request_body_string, pact, verification, webhook_context)
             subject
           end
         end

data/spec/lib/rack/pact_broker/database_transaction_spec.rb

@@ -25,6 +25,16 @@ module Rack
 
       subject { self.send(http_method, "/") }
 
+      it "sets the pactbroker.database_connector on the env" do
+        actual_env = nil
+        allow(api).to receive(:call) do | env |
+          actual_env = env
+          [200, {}, {}]
+        end
+        subject
+        expect(actual_env).to have_key("pactbroker.database_connector")
+      end
+
       context "for get requests" do
         let(:http_method) { :get }
 

data/spec/lib/rack/pact_broker/ui_request_filter_spec.rb

@@ -54,6 +54,15 @@ module Rack
             expect(subject.status).to eq 404
           end
         end
+
+        context "when the request ends in a web asset extension but has Accept application/hal+json" do
+          let(:accept) { "application/hal+json" }
+          let(:path) { "/blah/foo.woff" }
+
+          it "returns a 404" do
+            expect(subject.status).to eq 404
+          end
+        end
       end
     end
   end

data/spec/migrations/23_pact_versions_spec.rb

@@ -65,7 +65,13 @@ describe 'migrate to pact versions (migrate 22-31)', migration: true do
     subject
 
     PactBroker::Pacts::Service.create_or_update_pact(
-      consumer_name: consumer[:name], provider_name: provider[:name], consumer_version_number: '1.2.3', json_content: load_fixture('a_consumer-a_provider.json')
+      {
+        consumer_name: consumer[:name],
+        provider_name: provider[:name],
+        consumer_version_number: '1.2.3',
+        json_content: load_fixture('a_consumer-a_provider.json')
+      },{
+      }
     )
   end
 end

data/spec/support/database_cleaner.rb

@@ -3,7 +3,7 @@ require 'support/migration_helpers'
 
 RSpec.configure do |config|
 
-  config.include MigrationHelpers, migration: true
+  config.include MigrationHelpers, migration: true, data_migration: true
 
   config.before(:suite) do
     if defined?(::DB)
@@ -20,11 +20,21 @@ RSpec.configure do |config|
     PactBroker::Database.drop_objects
   end
 
+
   config.after :each, migration: true do
     PactBroker::Database.migrate
     PactBroker::Database.truncate
   end
 
+  config.after :each, data_migration: true do
+    PactBroker::Database.truncate
+  end
+
+  config.after :all, data_migration: true do
+    PactBroker::Database.migrate
+    PactBroker::Database.truncate
+  end
+
   config.before(:each) do | example |
     unless example.metadata[:no_db_clean] || example.metadata[:migration]
       DatabaseCleaner.start if defined?(::DB)

data/spec/support/metadata_test_server.rb

@@ -0,0 +1,40 @@
+if __FILE__ == $0
+  require 'json'
+  require 'base64'
+  STDOUT.sync = true
+
+  trap(:INT) do
+    @server.shutdown
+    exit
+  end
+
+  def webrick_opts port
+    {
+      Port: port,
+      Host: "0.0.0.0",
+      AccessLog: [],
+    }
+  end
+
+  app = ->(env) do
+    env['rack.input'].rewind
+    body_hash = JSON.parse(env['rack.input'].read)
+    metadata = body_hash["pactUrl"].split("/").last
+
+    metadata_string = Base64.strict_decode64(metadata)
+    metadata = Rack::Utils.parse_nested_query(metadata_string)
+    # hash = JSON.parse(json)
+    [200, {}, [metadata.to_json]]
+
+  end
+
+  require 'webrick'
+  require 'rack'
+  require 'rack/handler/webrick'
+
+  opts = webrick_opts(4445)
+
+  Rack::Handler::WEBrick.run(app, opts) do |server|
+    @server = server
+  end
+end

data/spec/support/verification_job.rb

@@ -0,0 +1,34 @@
+require 'sucker_punch'
+require 'faraday'
+require 'pact_broker/logging'
+
+module PactBroker
+  class VerificationJob
+    include SuckerPunch::Job
+    include PactBroker::Logging
+
+    def perform data
+      pact_url = data.fetch(:pactUrl)
+      pact = Faraday.get(pact_url, nil, { 'Accept' => 'application/hal+json'}).body
+      pact_hash = JSON.parse(pact)
+
+      headers = {
+        'Content-Type' => 'application/json',
+        'Accept' => 'application/hal+json'
+      }
+
+      provider_version = "1.2.#{(rand * 1000).to_i}"
+      provider_url = pact_hash['_links']['pb:provider']['href']
+      Faraday.put("#{provider_url}/versions/#{provider_version}/tags/dev", nil, headers)
+
+      verification_url = pact_hash['_links']['pb:publish-verification-results']['href']
+      body = {
+        success: true,
+        providerApplicationVersion: provider_version
+      }
+
+      Faraday.post(verification_url, body.to_json, headers)
+      Faraday.put("#{provider_url}/versions/#{provider_version}/tags/prod", nil, headers)
+    end
+  end
+end

data/spec/support/webhook_endpoint_middleware.rb

@@ -0,0 +1,22 @@
+module PactBroker
+  class WebhookEndpointMiddleware
+    def initialize app
+      @app = app
+    end
+
+    def call(env)
+      if env['PATH_INFO'] == '/pact-changed-webhook'
+        body = env['rack.input'].read
+        puts body
+        PactBroker::VerificationJob.perform_in(2, JSON.parse(body, symbolize_names: true))
+        [200, {}, ["Pact changed webhook executed"]]
+      elsif env['PATH_INFO'] == '/verification-published-webhook'
+        body = env['rack.input'].read
+        puts body
+        [200, {}, ["Verification webhook executed"]]
+      else
+        @app.call(env)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.31.0
+  version: 2.32.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -689,6 +689,12 @@ files:
 - db/migrations/20180730_create_latest_verifications_for_provider_versions.rb
 - db/migrations/20180731_update_head_matrix.rb
 - db/migrations/20180828_create_latest_versions.rb
+- db/migrations/20190509_create_version_sequence.rb
+- db/migrations/20190510_set_version_sequence.rb
+- db/migrations/20190511_create_integrations_view.rb
+- db/migrations/20190523_add_enabled_column_to_webhooks.rb
+- db/migrations/20190524_set_webhooks_enabled.rb
+- db/migrations/20190525_add_description_column_to_webhooks.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -760,6 +766,8 @@ files:
 - lib/pact_broker/api/decorators/embedded_tag_decorator.rb
 - lib/pact_broker/api/decorators/embedded_version_decorator.rb
 - lib/pact_broker/api/decorators/format_date_time.rb
+- lib/pact_broker/api/decorators/integration_decorator.rb
+- lib/pact_broker/api/decorators/integrations_decorator.rb
 - lib/pact_broker/api/decorators/label_decorator.rb
 - lib/pact_broker/api/decorators/latest_pact_decorator.rb
 - lib/pact_broker/api/decorators/matrix_decorator.rb
@@ -782,6 +790,8 @@ files:
 - lib/pact_broker/api/decorators/timestamps.rb
 - lib/pact_broker/api/decorators/triggered_webhook_decorator.rb
 - lib/pact_broker/api/decorators/triggered_webhooks_decorator.rb
+- lib/pact_broker/api/decorators/verifiable_pact_decorator.rb
+- lib/pact_broker/api/decorators/verifiable_pacts_decorator.rb
 - lib/pact_broker/api/decorators/verification_decorator.rb
 - lib/pact_broker/api/decorators/verification_summary_decorator.rb
 - lib/pact_broker/api/decorators/version_decorator.rb
@@ -856,8 +866,11 @@ files:
 - lib/pact_broker/date_helper.rb
 - lib/pact_broker/db.rb
 - lib/pact_broker/db/clean.rb
+- lib/pact_broker/db/data_migrations/helpers.rb
 - lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications.rb
+- lib/pact_broker/db/data_migrations/set_latest_version_sequence_value.rb
 - lib/pact_broker/db/data_migrations/set_pacticipant_ids_for_verifications.rb
+- lib/pact_broker/db/data_migrations/set_webhooks_enabled.rb
 - lib/pact_broker/db/log_quietener.rb
 - lib/pact_broker/db/migrate.rb
 - lib/pact_broker/db/migrate_data.rb
@@ -919,6 +932,7 @@ files:
 - lib/pact_broker/feature_toggle.rb
 - lib/pact_broker/groups/service.rb
 - lib/pact_broker/index/service.rb
+- lib/pact_broker/integrations/integration.rb
 - lib/pact_broker/integrations/service.rb
 - lib/pact_broker/json.rb
 - lib/pact_broker/labels/repository.rb
@@ -1015,6 +1029,7 @@ files:
 - lib/pact_broker/versions/latest_version.rb
 - lib/pact_broker/versions/parse_semantic_version.rb
 - lib/pact_broker/versions/repository.rb
+- lib/pact_broker/versions/sequence.rb
 - lib/pact_broker/versions/service.rb
 - lib/pact_broker/webhooks/check_host_whitelist.rb
 - lib/pact_broker/webhooks/execution.rb
@@ -1136,6 +1151,7 @@ files:
 - spec/features/get_dashboard_spec.rb
 - spec/features/get_diff_spec.rb
 - spec/features/get_integrations_dot_file_spec.rb
+- spec/features/get_integrations_spec.rb
 - spec/features/get_label_spec.rb
 - spec/features/get_latest_pact_badge_spec.rb
 - spec/features/get_latest_tagged_pact_badge_spec.rb
@@ -1167,6 +1183,7 @@ files:
 - spec/features/tag_version_spec.rb
 - spec/features/update_matrix_spec.rb
 - spec/features/update_pacticipant_spec.rb
+- spec/features/update_webhook_spec.rb
 - spec/fixtures/a_consumer-a_provider-2.json
 - spec/fixtures/a_consumer-a_provider-3.json
 - spec/fixtures/a_consumer-a_provider-conflict.json
@@ -1203,6 +1220,8 @@ files:
 - spec/lib/pact_broker/api/decorators/embedded_label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_tag_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_version_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/integration_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/integrations_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/latest_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/matrix_decorator_spec.rb
@@ -1220,6 +1239,8 @@ files:
 - spec/lib/pact_broker/api/decorators/tagged_pact_versions_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/triggered_webhook_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/triggered_webhooks_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/verifiable_pact_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/verifiable_pacts_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_summary_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/version_decorator_spec.rb
@@ -1267,6 +1288,7 @@ files:
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications_spec.rb
+- spec/lib/pact_broker/db/data_migrations/set_latest_version_sequence_value_spec.rb
 - spec/lib/pact_broker/db/log_quietener_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
 - spec/lib/pact_broker/diagnostic/resources/dependencies_spec.rb
@@ -1375,6 +1397,7 @@ files:
 - spec/support/markdown_pact.json
 - spec/support/markdown_pact_with_html.json
 - spec/support/markdown_pact_with_markdown_chars_in_names.json
+- spec/support/metadata_test_server.rb
 - spec/support/migration_helpers.rb
 - spec/support/rspec_match_hash.rb
 - spec/support/rspec_matchers.rb
@@ -1383,7 +1406,9 @@ files:
 - spec/support/simplecov.rb
 - spec/support/ssl_webhook_server.rb
 - spec/support/test_data_builder.rb
+- spec/support/verification_job.rb
 - spec/support/warning_silencer.rb
+- spec/support/webhook_endpoint_middleware.rb
 - tasks/audit.rake
 - tasks/database.rb
 - tasks/database/annotate.rb
@@ -1472,6 +1497,7 @@ test_files:
 - spec/features/get_dashboard_spec.rb
 - spec/features/get_diff_spec.rb
 - spec/features/get_integrations_dot_file_spec.rb
+- spec/features/get_integrations_spec.rb
 - spec/features/get_label_spec.rb
 - spec/features/get_latest_pact_badge_spec.rb
 - spec/features/get_latest_tagged_pact_badge_spec.rb
@@ -1503,6 +1529,7 @@ test_files:
 - spec/features/tag_version_spec.rb
 - spec/features/update_matrix_spec.rb
 - spec/features/update_pacticipant_spec.rb
+- spec/features/update_webhook_spec.rb
 - spec/fixtures/a_consumer-a_provider-2.json
 - spec/fixtures/a_consumer-a_provider-3.json
 - spec/fixtures/a_consumer-a_provider-conflict.json
@@ -1539,6 +1566,8 @@ test_files:
 - spec/lib/pact_broker/api/decorators/embedded_label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_tag_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/embedded_version_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/integration_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/integrations_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/label_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/latest_pact_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/matrix_decorator_spec.rb
@@ -1556,6 +1585,8 @@ test_files:
 - spec/lib/pact_broker/api/decorators/tagged_pact_versions_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/triggered_webhook_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/triggered_webhooks_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/verifiable_pact_decorator_spec.rb
+- spec/lib/pact_broker/api/decorators/verifiable_pacts_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/verification_summary_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/version_decorator_spec.rb
@@ -1603,6 +1634,7 @@ test_files:
 - spec/lib/pact_broker/configuration_spec.rb
 - spec/lib/pact_broker/db/clean_spec.rb
 - spec/lib/pact_broker/db/data_migrations/set_consumer_ids_for_pact_publications_spec.rb
+- spec/lib/pact_broker/db/data_migrations/set_latest_version_sequence_value_spec.rb
 - spec/lib/pact_broker/db/log_quietener_spec.rb
 - spec/lib/pact_broker/db/validate_encoding_spec.rb
 - spec/lib/pact_broker/diagnostic/resources/dependencies_spec.rb
@@ -1711,6 +1743,7 @@ test_files:
 - spec/support/markdown_pact.json
 - spec/support/markdown_pact_with_html.json
 - spec/support/markdown_pact_with_markdown_chars_in_names.json
+- spec/support/metadata_test_server.rb
 - spec/support/migration_helpers.rb
 - spec/support/rspec_match_hash.rb
 - spec/support/rspec_matchers.rb
@@ -1719,4 +1752,6 @@ test_files:
 - spec/support/simplecov.rb
 - spec/support/ssl_webhook_server.rb
 - spec/support/test_data_builder.rb
+- spec/support/verification_job.rb
 - spec/support/warning_silencer.rb
+- spec/support/webhook_endpoint_middleware.rb