feat: enable use of the new 'all in one' contracts publishing endpoin…

…t without a feature toggle
pact-foundation · Sep 21, 2021 · 6850ace · 6850ace
1 parent 4f311ea
commit 6850ace
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        feature: ["", "publish_contracts"]
+        feature: [""]
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

diff --git a/lib/pact_broker/client/publish_pacts.rb b/lib/pact_broker/client/publish_pacts.rb
@@ -28,7 +28,7 @@ def initialize pact_broker_base_url, pact_file_paths, consumer_version_params, o
 
       def call
         validate
-        if ENV.fetch("PACT_BROKER_FEATURES", "").include?("publish_contracts") && index_resource.can?("pb:publish-contracts")
+        if index_resource.can?("pb:publish-contracts")
           publish_pacts
           PactBroker::Client::CommandResult.new(success?, message)
         else

diff --git a/script/publish-pact.sh b/script/publish-pact.sh
@@ -28,7 +28,7 @@ bundle exec bin/pact-broker create-or-update-webhook http://localhost:9393 \
 #   --contract-published
 
 
-PACT_BROKER_FEATURES=publish_contracts bundle exec bin/pact-broker publish spec/pacts/pact_broker_client-pact_broker.json \
+bundle exec bin/pact-broker publish spec/pacts/pact_broker_client-pact_broker.json \
   --consumer-app-version 1.2.26 \
   --broker-base-url http://localhost:9292 \
    --broker-token localhost \

diff --git a/spec/service_providers/publish_pacts_spec.rb b/spec/service_providers/publish_pacts_spec.rb
@@ -1,9 +1,7 @@
 require 'pact_broker/client/publish_pacts'
 require 'service_providers/pact_helper'
 
-publish_contracts_feature_on = ENV.fetch('PACT_BROKER_FEATURES', '').include?("publish_contracts")
-
-RSpec.describe "publishing contracts", pact: true, skip: !publish_contracts_feature_on do
+RSpec.describe "publishing contracts", pact: true do
   before do
     allow_any_instance_of(PactBroker::Client::Hal::HttpClient).to receive(:sleep)
     allow_any_instance_of(PactBroker::Client::Hal::HttpClient).to receive(:default_max_tries).and_return(1)