chore(rack3): Get remaing specs passing

pact-foundation · Jan 23, 2025 · 42a3d8a · 42a3d8a
1 parent 07e99db
commit 42a3d8a
Show file tree

Hide file tree

Showing 43 changed files with 59 additions and 45 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,7 +9,6 @@ gem "conventional-changelog", "~>1.3"
 gem "bump", "~> 0.5"
 gem "padrino-core", ">= 0.16.0.pre3", require: false
 gem 'rackup', '~> 2.2'
-# gem "sinatra", "~> 3.0", require: false
 
 group :development do
   gem "pry-byebug"
@@ -36,6 +35,7 @@ group :test do
   gem "tzinfo", "~>2.0"
   gem "faraday-retry", "~>2.0"
   gem "openapi_first", "~>2.2"
+  gem "webrick"
 end
 
 group :pg, optional: true do

diff --git a/pact_broker.gemspec b/pact_broker.gemspec
@@ -56,7 +56,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "reform", "~> 2.6"
   gem.add_runtime_dependency "sequel", "~> 5.28"
   gem.add_runtime_dependency "webmachine", ">= 2.0.0.beta", "< 3.0"
-  # gem.add_runtime_dependency "webrick", "~> 1.8" # webmachine requires webrick, but doesn't declare it as a dependency :shrug:
   gem.add_runtime_dependency "semver2", "~> 3.4.2"
   gem.add_runtime_dependency "rack", "~> 3.1"
   gem.add_runtime_dependency "redcarpet", ">= 3.5.1", "~>3.5"

diff --git a/spec/features/create_webhook_spec.rb b/spec/features/create_webhook_spec.rb
@@ -21,7 +21,7 @@
         method: "POST",
         url: "https://example.org",
         headers: {
-          :"Content-Type" => "application/json"
+          :"content-type" => "application/json"
         },
         body: {
           a: "body"

diff --git a/spec/features/get_provider_pacts_for_verification_spec.rb b/spec/features/get_provider_pacts_for_verification_spec.rb
@@ -7,6 +7,14 @@
     }
   end
 
+  before do
+    Approvals.configure do |config|
+      config.excluded_json_keys = {
+        :date => /date/
+      }
+    end
+  end
+
   subject { get(path, query) }
 
   context "when the provider exists" do

diff --git a/spec/features/publish_pact_all_in_one_approval_spec.rb b/spec/features/publish_pact_all_in_one_approval_spec.rb
@@ -1,4 +1,12 @@
 RSpec.describe "publishing a pact using the all in one endpoint" do
+  before do
+    Approvals.configure do |config|
+      config.excluded_json_keys = {
+        :date => /date/
+      }
+    end
+  end
+
   # TODO merge branches
   let(:request_body_hash) do
     {

diff --git a/spec/fixtures/approvals/docs_pacticipants_pacticipant_get.approved.json b/spec/fixtures/approvals/docs_pacticipants_pacticipant_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "2071",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_pacticipants_pacticipant_options.approved.json b/spec/fixtures/approvals/docs_pacticipants_pacticipant_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "GET, PUT, PATCH, DELETE, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_pacticipants_pacticipant_patch.approved.json b/spec/fixtures/approvals/docs_pacticipants_pacticipant_patch.approved.json
@@ -24,7 +24,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "2133",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_pacticipants_pacticipant_put.approved.json b/spec/fixtures/approvals/docs_pacticipants_pacticipant_put.approved.json
@@ -24,7 +24,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "2133",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_executing_a_saved_webhook_options.approved.json b/spec/fixtures/approvals/docs_webhooks_executing_a_saved_webhook_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "POST, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_webhooks_executing_a_saved_webhook_post.approved.json b/spec/fixtures/approvals/docs_webhooks_executing_a_saved_webhook_post.approved.json
@@ -16,7 +16,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "1217",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_executing_an_unsaved_webhook_options.approved.json b/spec/fixtures/approvals/docs_webhooks_executing_an_unsaved_webhook_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "POST, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_webhooks_executing_an_unsaved_webhook_post.approved.json b/spec/fixtures/approvals/docs_webhooks_executing_an_unsaved_webhook_post.approved.json
@@ -36,7 +36,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "1109",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_logs_of_triggered_webhook_get.approved.json b/spec/fixtures/approvals/docs_webhooks_logs_of_triggered_webhook_get.approved.json
@@ -16,7 +16,7 @@
       "content-type": "text/plain;charset=utf-8",
       "vary": "Accept",
       "content-length": "4",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": "logs"

diff --git a/spec/fixtures/approvals/docs_webhooks_logs_of_triggered_webhook_options.approved.json b/spec/fixtures/approvals/docs_webhooks_logs_of_triggered_webhook_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "GET, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_webhooks_pact_webhooks_get.approved.json b/spec/fixtures/approvals/docs_webhooks_pact_webhooks_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "496",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_pact_webhooks_options.approved.json b/spec/fixtures/approvals/docs_webhooks_pact_webhooks_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "POST, GET, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/...ixtures/approvals/docs_webhooks_triggered_webhooks_for_pact_publication_get.approved.json b/...ixtures/approvals/docs_webhooks_triggered_webhooks_for_pact_publication_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "913",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/...res/approvals/docs_webhooks_triggered_webhooks_for_pact_publication_options.approved.json b/...res/approvals/docs_webhooks_triggered_webhooks_for_pact_publication_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "GET, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/...approvals/docs_webhooks_triggered_webhooks_for_verification_publication_get.approved.json b/...approvals/docs_webhooks_triggered_webhooks_for_verification_publication_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "287",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/...ovals/docs_webhooks_triggered_webhooks_for_verification_publication_options.approved.json b/...ovals/docs_webhooks_triggered_webhooks_for_verification_publication_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "GET, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_webhooks_webhook_get.approved.json b/spec/fixtures/approvals/docs_webhooks_webhook_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "1146",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {
@@ -32,7 +32,7 @@
         "method": "POST",
         "url": "https://example.org/webhook",
         "headers": {
-          "Content-Type": "application/json"
+          "content-type": "application/json"
         },
         "body": {
           "pactUrl": "${pactbroker.pactUrl}"

diff --git a/spec/fixtures/approvals/docs_webhooks_webhook_options.approved.json b/spec/fixtures/approvals/docs_webhooks_webhook_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "GET, PUT, DELETE, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_webhooks_webhook_put.approved.json b/spec/fixtures/approvals/docs_webhooks_webhook_put.approved.json
@@ -36,7 +36,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "804",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_for_a_provider_get.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_for_a_provider_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "296",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_for_a_provider_options.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_for_a_provider_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "POST, GET, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_for_consumer_and_provider_get.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_for_consumer_and_provider_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "479",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/...fixtures/approvals/docs_webhooks_webhooks_for_consumer_and_provider_options.approved.json b/...fixtures/approvals/docs_webhooks_webhooks_for_consumer_and_provider_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "POST, GET, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_for_consumer_get.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_for_consumer_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "296",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_for_consumer_options.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_for_consumer_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "POST, GET, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_get.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "427",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_options.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "GET, POST, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_post.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_post.approved.json
@@ -37,7 +37,7 @@
       "content-type": "application/hal+json;charset=utf-8",
       "location": "https://pact-broker/webhooks/dCGCl-Ba3PqEFJ_iE9mJkQ",
       "content-length": "762",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_status_get.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_status_get.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "1385",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/docs_webhooks_webhooks_status_options.approved.json b/spec/fixtures/approvals/docs_webhooks_webhooks_status_options.approved.json
@@ -15,7 +15,7 @@
     "headers": {
       "access-control-allow-methods": "GET, OPTIONS",
       "content-length": "0",
-      "date": "Wed, 01 Sep 2021 00:07:21 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": ""

diff --git a/spec/fixtures/approvals/get_provider_pacts_for_verification.approved.json b/spec/fixtures/approvals/get_provider_pacts_for_verification.approved.json
@@ -23,7 +23,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "840",
-      "date": "Thu, 23 Jan 2025 01:18:37 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/publish_contract_no_branch.approved.json b/spec/fixtures/approvals/publish_contract_no_branch.approved.json
@@ -31,7 +31,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "3192",
-      "date": "Thu, 23 Jan 2025 01:18:39 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/publish_contract_nothing_exists.approved.json b/spec/fixtures/approvals/publish_contract_nothing_exists.approved.json
@@ -31,7 +31,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "2941",
-      "date": "Thu, 23 Jan 2025 01:18:39 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/publish_contract_nothing_exists_with_webhook.approved.json b/spec/fixtures/approvals/publish_contract_nothing_exists_with_webhook.approved.json
@@ -31,7 +31,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "2921",
-      "date": "Thu, 23 Jan 2025 01:18:39 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/publish_contract_verification_already_exists.approved.json b/spec/fixtures/approvals/publish_contract_verification_already_exists.approved.json
@@ -31,7 +31,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "2880",
-      "date": "Thu, 23 Jan 2025 01:18:39 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {

diff --git a/spec/fixtures/approvals/publish_contract_with_validation_error.approved.json b/spec/fixtures/approvals/publish_contract_with_validation_error.approved.json
@@ -30,7 +30,7 @@
     "headers": {
       "content-type": "application/hal+json;charset=utf-8",
       "content-length": "54",
-      "date": "Thu, 23 Jan 2025 01:18:39 GMT",
+      "date": "<date>",
       "server": "Webmachine-Ruby/2.0.1 Rack/3.1.8"
     },
     "body": {