pact_broker 2.84.0 → 2.85.0

data/spec/lib/pact_broker/pacts/repository_spec.rb

@@ -415,7 +415,6 @@ module PactBroker
       end
 
       describe "#delete_all_pact_publications_between" do
-
         before do
           td.create_consumer(consumer_name)
             .create_consumer_version("1.2.3")
@@ -426,7 +425,7 @@ module PactBroker
             .create_webhook
             .create_triggered_webhook
             .create_webhook_execution
-            .create_consumer_version("2.3.4")
+            .create_consumer_version("2.3.4", branch: "main")
             .create_consumer_version_tag("prod")
             .create_consumer_version_tag("branch")
             .create_pact
@@ -448,6 +447,20 @@ module PactBroker
             expect { subject }.to change { PactPublication.count }.by(-1)
           end
         end
+
+        context "with a branch" do
+          subject { Repository.new.delete_all_pact_publications_between(consumer_name, :and => provider_name, branch_name: "main") }
+
+          it "deletes the pacts between the specified consumer and provider with the given branch" do
+            expect { subject }.to change {
+              PactPublication
+                .for_consumer_name(consumer_name)
+                .for_provider_name(provider_name)
+                .for_branch_name("main")
+                .count
+            }.by(-1)
+          end
+        end
       end
 
       describe "#find_latest_pacts_for_provider" do

data/spec/lib/pact_broker/ui/view_models/index_item_spec.rb

@@ -27,15 +27,18 @@ module PactBroker
         its(:latest_pact_url) { should eq "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/latest" }
         its(:pact_url) { should eq "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/version/1.2.3" }
         its(:pact_matrix_url) { should eq "/matrix/provider/Provider%20Name/consumer/Consumer%20Name" }
-        its(:consumer_group_url) { should eq "/groups/Consumer%20Name" }
-        its(:provider_group_url) { should eq "/groups/Provider%20Name" }
+        its(:consumer_group_url) { should eq "/pacticipants/Consumer%20Name" }
+        its(:provider_group_url) { should eq "/pacticipants/Provider%20Name" }
 
         describe "pseudo_branch_verification_status" do
           let(:domain_relationship) do
             instance_double("PactBroker::Domain::IndexItem",
               pseudo_branch_verification_status: pseudo_branch_verification_status,
               provider_name: "Foo",
-              latest_verification_provider_version_number: "4.5.6")
+              latest_verification_provider_version_number: "4.5.6",
+              tag_names: [],
+              consumer_version_branches: []
+            )
           end
           let(:ever_verified) { true }
           let(:pact_changed) { false }
@@ -137,13 +140,13 @@ module PactBroker
           its(:provider_version_latest_tag_names) { is_expected.to eq ["dev", "prod"] }
         end
 
-        describe "tagged_pacts" do
+        describe "pact_tags" do
           let(:tags) { ["master", "prod"] }
-          its(:tagged_pacts) do
+          its(:pact_tags) do
             is_expected.to eq([
-              { tag: "master", deletionUrl: "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/tag/master" }.to_json,
-              { tag: "prod", deletionUrl: "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/tag/prod" }.to_json
-            ])
+              { name: "master", deletionUrl: "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/tag/master" },
+              { name: "prod", deletionUrl: "/pacts/provider/Provider%20Name/consumer/Consumer%20Name/tag/prod" }
+            ].to_json)
           end
         end
 

data/spec/lib/pact_broker/verifications/pseudo_branch_status_spec.rb

@@ -5,11 +5,12 @@ module PactBroker
     describe PseudoBranchStatus do
       describe "pseudo_branch_verification_status" do
 
-        let(:latest_verification) { instance_double("PactBroker::Domain::Verification", pact_version_sha: latest_verification_pact_version_sha, success: success) }
+        let(:latest_verification) { instance_double("PactBroker::Domain::Verification", failed_and_pact_pending?: failed_and_pact_pending, pact_version_sha: latest_verification_pact_version_sha, success: success) }
         let(:latest_pact) { instance_double("PactBroker::Domain::Pact", pact_version_sha: pact_pact_version_sha) }
         let(:pact_pact_version_sha) { "1234" }
         let(:latest_verification_pact_version_sha) { "1234" }
         let(:success) { true }
+        let(:failed_and_pact_pending) { false }
 
         subject { PseudoBranchStatus.new(latest_pact, latest_verification) }
 
@@ -32,6 +33,13 @@ module PactBroker
           its(:to_sym) { is_expected.to eq :failed }
         end
 
+        context "when the pact has not changed since the last failed verification and the pact was pending" do
+          let(:success) { false }
+          let(:failed_and_pact_pending) { true }
+
+          its(:to_sym) { is_expected.to eq :failed_pending }
+        end
+
         context "when the pact has changed since the last successful verification" do
           let(:pact_pact_version_sha) { "4566" }
           its(:to_sym) { is_expected.to eq :stale }

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

@@ -21,7 +21,8 @@ module PactBroker
 
         let(:event_context) { { some: "data", consumer_version_selectors: [{ foo: "bar" }] } }
         let(:expected_event_context) { { some: "data", provider_version_tags: ["dev"] } }
-        let(:params) { { "success" => success, "providerApplicationVersion" => "4.5.6", "wip" => true, "testResults" => { "some" => "results" }} }
+        let(:params) { { "success" => success, "providerApplicationVersion" => "4.5.6", "wip" => true, "pending" => is_pending, "testResults" => { "some" => "results" }} }
+        let(:is_pending) { true }
         let(:success) { true }
         let(:pact) do
           td.create_pact_with_hierarchy
@@ -33,13 +34,14 @@ module PactBroker
         let(:create_verification) { subject.create 3, params, selected_pacts, event_context }
 
         it "logs the creation" do
-          expect(logger).to receive(:info).with(/.*verification.*3/, payload: {"providerApplicationVersion"=>"4.5.6", "success"=>true, "wip"=>true})
+          expect(logger).to receive(:info).with(/.*verification.*3/, payload: {"providerApplicationVersion"=>"4.5.6", "success"=>true, "wip"=>true, "pending" => is_pending})
           create_verification
         end
 
         it "sets the verification attributes" do
           verification = create_verification
           expect(verification.wip).to be true
+          expect(verification.pact_pending?).to eq is_pending
           expect(verification.success).to be true
           expect(verification.number).to eq 3
           expect(verification.test_results).to eq "some" => "results"

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

@@ -5,7 +5,6 @@ module PactBroker
   module Webhooks
     describe Job do
       before do
-        PactBroker.configuration.webhook_retry_schedule = [10, 60, 120, 300, 600, 1200]
         allow(PactBroker::Webhooks::TriggerService).to receive(:execute_triggered_webhook_now).and_return(result)
         allow(PactBroker::Webhooks::Service).to receive(:update_triggered_webhook_status)
         allow(PactBroker::Webhooks::TriggeredWebhook).to receive(:find).and_return(triggered_webhook)
@@ -17,12 +16,15 @@ module PactBroker
       let(:base_url) { "http://broker" }
       let(:triggered_webhook) { instance_double("PactBroker::Webhooks::TriggeredWebhook", webhook_uuid: "1234", id: 1) }
       let(:result) { instance_double("PactBroker::Domain::WebhookExecutionResult", success?: success) }
-      let(:webhook_execution_configuration) { instance_double(PactBroker::Webhooks::ExecutionConfiguration, to_hash: webhook_execution_configuration_hash) }
+      let(:webhook_execution_configuration) do
+        instance_double(PactBroker::Webhooks::ExecutionConfiguration, retry_schedule: retry_schedule, to_hash: webhook_execution_configuration_hash)
+      end
       let(:webhook_execution_configuration_hash) { { the: "options" } }
       let(:success) { true }
       let(:logger) { double("logger").as_null_object }
       let(:database_connector) { ->(&block) { block.call } }
       let(:webhook_context) { { the: "context" } }
+      let(:retry_schedule) { [10, 60, 120, 300, 600, 1200] }
       let(:job_params) do
         {
           triggered_webhook: triggered_webhook,
@@ -125,8 +127,6 @@ module PactBroker
           job_params[:error_count] = 1
         end
 
-        # subject { Job.new.perform(triggered_webhook: triggered_webhook, error_count: 1, database_connector: database_connector, base_url: base_url) }
-
         it "reschedules the job in 60 seconds" do
           expect(Job).to receive(:perform_in).with(60, hash_including(error_count: 2))
           subject

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

@@ -340,6 +340,9 @@ module PactBroker
         let(:webhook_execution_configuration) do
           PactBroker::Webhooks::ExecutionConfiguration.new
             .with_webhook_context(base_url: "http://example.org")
+            .with_retry_schedule([10, 60, 120, 300, 600, 1200])
+            .with_http_success_codes([200])
+            .with_user_agent("Pact Broker")
             .with_show_response(true)
         end
         let(:event_context) { { some: "data", base_url: "http://example.org" }}
@@ -361,7 +364,7 @@ module PactBroker
             .and_return(:pact)
         end
 
-        let(:triggered_webhooks) { PactBroker::Webhooks::TriggerService.create_triggered_webhooks_for_event(pact, td.verification, PactBroker::Webhooks::WebhookEvent::CONTRACT_CONTENT_CHANGED, event_context) }
+        let!(:triggered_webhooks) { PactBroker::Webhooks::TriggerService.create_triggered_webhooks_for_event(pact, td.verification, PactBroker::Webhooks::WebhookEvent::CONTRACT_CONTENT_CHANGED, event_context) }
 
         subject {  PactBroker::Webhooks::TriggerService.schedule_webhooks(triggered_webhooks, options) }
 
@@ -375,10 +378,6 @@ module PactBroker
           subject
         end
 
-        it "saves the triggered webhook" do
-          expect { subject }.to change { PactBroker::Webhooks::TriggeredWebhook.count }.by(1)
-        end
-
         it "saves the execution" do
           expect { subject }.to change { PactBroker::Webhooks::Execution.count }.by(1)
         end
@@ -387,6 +386,11 @@ module PactBroker
           subject
           expect(TriggeredWebhook.first.status).to eq TriggeredWebhook::STATUS_SUCCESS
         end
+
+        it "does not call the PactBroker.configuration as it will have been reset after the end of the request" do
+          expect(PactBroker).to_not receive(:configuration)
+          subject
+        end
       end
     end
   end

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

@@ -16,7 +16,7 @@ module PactBroker
 
       let(:logger) { double("logger").as_null_object }
       let(:uuid) { "uuid" }
-      let(:options) { { failure_log_message: "oops", show_response: show_response } }
+      let(:options) { { failure_log_message: "oops", show_response: show_response, http_code_success: [200] } }
       let(:show_response) { true }
       let(:username) { nil }
       let(:password) { nil }
@@ -54,8 +54,9 @@ module PactBroker
       let(:webhook_context) { { consumer_version_number: "123", base_url: base_url } }
 
       let(:webhook_request_logger) { WebhookRequestLogger.new(options) }
+      let(:success) { true }
 
-      subject(:logs) { webhook_request_logger.log(uuid, webhook_request, response, error, webhook_context) }
+      subject(:logs) { webhook_request_logger.log(uuid, webhook_request, response, success, error, webhook_context) }
 
       describe "application logs" do
         it "logs the request" do
@@ -129,16 +130,8 @@ module PactBroker
           end
         end
 
-        context "when the response code '100' is not in 'webhook_http_code_success'" do
-          let(:status) { 100 }
-
-          it "not successful, code '100' not in 'webhook_http_code_success'" do
-            expect(logs).to include "oops"
-          end
-        end
-
-        context "when the response code is not successful" do
-          let(:status) { 400 }
+        context "when the status is not successful" do
+          let(:success) { false }
 
           it "logs the failure_log_message" do
             expect(logs).to include "oops"
@@ -174,6 +167,7 @@ module PactBroker
           end
 
           let(:response) { nil }
+          let(:success) { false }
           let(:error) do
             err = WebhookTestError.new("blah")
             allow(err).to receive(:backtrace).and_return([])

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

@@ -23,7 +23,8 @@ module PactBroker
           password: "passwordBUILT",
           uuid: "1234",
           body: built_body,
-          headers: {"headername" => "headervalueBUILT"}
+          headers: {"headername" => "headervalueBUILT"},
+          user_agent: "Pact Broker"
         }
       end
 
@@ -45,7 +46,7 @@ module PactBroker
 
         let(:params_hash) { double("params hash") }
 
-        subject { WebhookRequestTemplate.new(attributes).build(params_hash) }
+        subject { WebhookRequestTemplate.new(attributes).build(params_hash, "Pact Broker") }
 
         it "renders the url template" do
           expect(PactBroker::Webhooks::Render).to receive(:call).with(url, params_hash) do | content, pact, verification, &block |

data/spec/support/generated_markdown.md

@@ -1,12 +1,12 @@
-### A pact between Some Consumer and Some Provider
+# A pact between Some Consumer and Some Provider
 
-#### Requests from Some Consumer to Some Provider
+### Requests from Some Consumer to Some Provider
 
 * [A request for alligators in Brüssel](#a_request_for_alligators_in_Brüssel_given_alligators_exist) given alligators exist
 
 * [A request for polar bears](#a_request_for_polar_bears)
 
-#### Interactions
+### Interactions
 
 <a name="a_request_for_alligators_in_Brüssel_given_alligators_exist"></a>
 Given **alligators exist**, upon receiving **a request for alligators in Brüssel** from Some Consumer, with

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker
 version: !ruby/object:Gem::Version
-  version: 2.84.0
+  version: 2.85.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -82,6 +82,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.5
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -376,6 +390,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: A server that stores and returns pact files generated by the pact gem.
   It enables head/prod cross testing of the consumer and provider projects.
 email:
@@ -582,6 +610,7 @@ files:
 - db/migrations/20210818_add_consumer_version_selectors_to_verification.rb
 - db/migrations/20210831_add_index_to_pact_publications.rb
 - db/migrations/20210908_add_auto_created.rb
+- db/migrations/20210913_add_pending_to_verifications.rb
 - db/migrations/migration_helper.rb
 - db/test/backwards_compatibility/.rspec
 - db/test/backwards_compatibility/Appraisals
@@ -719,6 +748,7 @@ files:
 - lib/pact_broker/api/decorators/webhook_request_template_decorator.rb
 - lib/pact_broker/api/decorators/webhooks_decorator.rb
 - lib/pact_broker/api/middleware/basic_auth.rb
+- lib/pact_broker/api/middleware/configuration.rb
 - lib/pact_broker/api/pact_broker_urls.rb
 - lib/pact_broker/api/paths.rb
 - lib/pact_broker/api/renderers/html_pact_renderer.rb
@@ -768,6 +798,7 @@ files:
 - lib/pact_broker/api/resources/pact_triggered_webhooks.rb
 - lib/pact_broker/api/resources/pact_version.rb
 - lib/pact_broker/api/resources/pact_versions.rb
+- lib/pact_broker/api/resources/pact_versions_for_branch.rb
 - lib/pact_broker/api/resources/pact_webhooks.rb
 - lib/pact_broker/api/resources/pact_webhooks_status.rb
 - lib/pact_broker/api/resources/pacticipant.rb
@@ -1025,6 +1056,7 @@ files:
 - lib/pact_broker/ui/controllers/base_controller.rb
 - lib/pact_broker/ui/controllers/can_i_deploy.rb
 - lib/pact_broker/ui/controllers/clusters.rb
+- lib/pact_broker/ui/controllers/dashboard.rb
 - lib/pact_broker/ui/controllers/error_test.rb
 - lib/pact_broker/ui/controllers/groups.rb
 - lib/pact_broker/ui/controllers/index.rb
@@ -1042,8 +1074,10 @@ files:
 - lib/pact_broker/ui/view_models/matrix_released_version.rb
 - lib/pact_broker/ui/view_models/matrix_tag.rb
 - lib/pact_broker/ui/views/clusters/show.haml
+- lib/pact_broker/ui/views/dashboard/show.haml
 - lib/pact_broker/ui/views/groups/show.html.erb
 - lib/pact_broker/ui/views/index/_css_and_js.haml
+- lib/pact_broker/ui/views/index/_dashboard_navbar.haml
 - lib/pact_broker/ui/views/index/_getting-started.haml
 - lib/pact_broker/ui/views/index/_navbar.haml
 - lib/pact_broker/ui/views/index/_pagination.haml
@@ -1212,6 +1246,9 @@ files:
 - script/data/environments.rb
 - script/data/expand-currently-deployed.rb
 - script/data/issue-494.rb
+- script/data/pending.rb
+- script/data/tags.rb
+- script/data/webhook.rb
 - script/db-spec.sh
 - script/demonstrate-version-branches.rb
 - script/dev/rubocop-modified-files.sh
@@ -1277,6 +1314,7 @@ files:
 - spec/features/delete_integration_spec.rb
 - spec/features/delete_label_spec.rb
 - spec/features/delete_pact_spec.rb
+- spec/features/delete_pact_versions_for_branch_spec.rb
 - spec/features/delete_pact_versions_spec.rb
 - spec/features/delete_tagged_pact_versions_spec.rb
 - spec/features/delete_verification_spec.rb
@@ -1433,6 +1471,7 @@ files:
 - spec/lib/pact_broker/api/decorators/webhook_request_template_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/webhooks_decorator_spec.rb
 - spec/lib/pact_broker/api/middleware/basic_auth_spec.rb
+- spec/lib/pact_broker/api/middleware/configuration_spec.rb
 - spec/lib/pact_broker/api/pact_broker_urls_spec.rb
 - spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb
 - spec/lib/pact_broker/api/renderers/integrations_dot_renderer_spec.rb
@@ -1465,7 +1504,6 @@ files:
 - spec/lib/pact_broker/api/resources/verification_spec.rb
 - spec/lib/pact_broker/api/resources/verification_triggered_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/verifications_spec.rb
-- spec/lib/pact_broker/api/resources/webhook_execution_result_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/app_basic_auth_spec.rb
@@ -1517,6 +1555,7 @@ files:
 - spec/lib/pact_broker/groups/service_spec.rb
 - spec/lib/pact_broker/hash_refinements_spec.rb
 - spec/lib/pact_broker/index/service_spec.rb
+- spec/lib/pact_broker/index/service_view_spec.rb
 - spec/lib/pact_broker/integrations/integration_spec.rb
 - spec/lib/pact_broker/integrations/service_spec.rb
 - spec/lib/pact_broker/labels/repository_spec.rb
@@ -1554,6 +1593,7 @@ files:
 - spec/lib/pact_broker/pacts/metadata_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_dataset_module_spec.rb
+- spec/lib/pact_broker/pacts/pact_publication_latest_verification_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_selector_dataset_module_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_spec.rb
 - spec/lib/pact_broker/pacts/pact_version_spec.rb
@@ -1752,6 +1792,7 @@ test_files:
 - spec/features/delete_integration_spec.rb
 - spec/features/delete_label_spec.rb
 - spec/features/delete_pact_spec.rb
+- spec/features/delete_pact_versions_for_branch_spec.rb
 - spec/features/delete_pact_versions_spec.rb
 - spec/features/delete_tagged_pact_versions_spec.rb
 - spec/features/delete_verification_spec.rb
@@ -1908,6 +1949,7 @@ test_files:
 - spec/lib/pact_broker/api/decorators/webhook_request_template_decorator_spec.rb
 - spec/lib/pact_broker/api/decorators/webhooks_decorator_spec.rb
 - spec/lib/pact_broker/api/middleware/basic_auth_spec.rb
+- spec/lib/pact_broker/api/middleware/configuration_spec.rb
 - spec/lib/pact_broker/api/pact_broker_urls_spec.rb
 - spec/lib/pact_broker/api/renderers/html_pact_renderer_spec.rb
 - spec/lib/pact_broker/api/renderers/integrations_dot_renderer_spec.rb
@@ -1940,7 +1982,6 @@ test_files:
 - spec/lib/pact_broker/api/resources/verification_spec.rb
 - spec/lib/pact_broker/api/resources/verification_triggered_webhooks_spec.rb
 - spec/lib/pact_broker/api/resources/verifications_spec.rb
-- spec/lib/pact_broker/api/resources/webhook_execution_result_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/app_basic_auth_spec.rb
@@ -1992,6 +2033,7 @@ test_files:
 - spec/lib/pact_broker/groups/service_spec.rb
 - spec/lib/pact_broker/hash_refinements_spec.rb
 - spec/lib/pact_broker/index/service_spec.rb
+- spec/lib/pact_broker/index/service_view_spec.rb
 - spec/lib/pact_broker/integrations/integration_spec.rb
 - spec/lib/pact_broker/integrations/service_spec.rb
 - spec/lib/pact_broker/labels/repository_spec.rb
@@ -2029,6 +2071,7 @@ test_files:
 - spec/lib/pact_broker/pacts/metadata_spec.rb
 - spec/lib/pact_broker/pacts/pact_params_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_dataset_module_spec.rb
+- spec/lib/pact_broker/pacts/pact_publication_latest_verification_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_selector_dataset_module_spec.rb
 - spec/lib/pact_broker/pacts/pact_publication_spec.rb
 - spec/lib/pact_broker/pacts/pact_version_spec.rb