Merge branch 'master' into feat/convert-first-tag-to-branch

pact-foundation · Aug 3, 2021 · 563eecd · 563eecd
2 parents ec14d25 + 1d55aeb
commit 563eecd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/db.rb b/lib/db.rb
@@ -28,7 +28,7 @@ module DB
   def self.connect db_credentials
     # Keep this conifiguration in sync with lib/pact_broker/app.rb#configure_database_connection
     Sequel.datetime_class = DateTime
-    if ENV["DEBUG"] == "true"
+    if ENV["DEBUG"] == "true" && ENV["PACT_BROKER_SQL_LOG_LEVEL"] != "none"
       logger = Logger.new($stdout)
     end
     if db_credentials.fetch("adapter") == "sqlite"

diff --git a/spec/features/wip_pacts_spec.rb b/spec/features/wip_pacts_spec.rb
@@ -43,7 +43,7 @@ def publish_pact_with_feature_tag(version = "2", tag = "feat-x", pact_content =
 
   def publish_new_pact_with_master_tag_after_merging_in_feature_branch
     put("/pacts/provider/Bar/consumer/Foo/version/3", pact_content_2, request_headers)
-    put("/pacticipants/Foo/versions/2/tags/master", nil, request_headers)
+    put("/pacticipants/Foo/versions/3/tags/master", nil, request_headers)
   end
 
   def get_pacts_for_verification(request_body = nil)