update broker integration tests to check for tag publishing (#209)

* update broker integration tests to check for tag publishing

Author: jbwheatley

pending-pact-tests/consumer/build.sbt renamed to broker-integration-tests/consumer/build.sbt

@@ -9,8 +9,8 @@ import scala.io.{BufferedSource, Source}
 
 class ProviderClientSpec extends PactForgerSuite with FunSpecLike with Matchers {
 
-  val CONSUMER = "scala-pact-pending-test-consumer"
-  val PROVIDER = "scala-pact-pending-test-provider"
+  val CONSUMER = "scala-pact-integration-test-consumer"
+  val PROVIDER = "scala-pact-integration-test-provider"
 
   describe("Connecting to the Provider service") {
 

pending-pact-tests/consumer/master-expected.json renamed to broker-integration-tests/consumer/master-expected.json

@@ -17,6 +17,7 @@ libraryDependencies ++= {
     "org.slf4j"     % "slf4j-simple"               % "1.6.4",
     "org.scalatest" %% "scalatest"                 % "3.0.8" % "test",
     "com.itv"       %% "scalapact-scalatest-suite" % pactVersion % "test",
+    "org.scalaj"    %% "scalaj-http"               % "2.4.2" % "test",
     "io.circe"      %% "circe-parser"              % "0.13.0"
   )
 }

pending-pact-tests/consumer/pact.sbt renamed to broker-integration-tests/consumer/pact.sbt

@@ -6,5 +6,5 @@ pactBrokerAddress := "https://test.pact.dius.com.au"
 pactBrokerCredentials := ("dXfltyFMgNOFZAxr8io9wJ37iUpY42M", "O5AIZWxelWbLvqMd8PkAVycBJh2Psyg1")
 consumerVersionSelectors := Seq(ConsumerVersionSelector("test", latest = true))
 providerVersionTags := List("master")
-providerName := "scala-pact-pending-test-provider"
+providerName := "scala-pact-integration-test-provider"
 pactBrokerClientTimeout := 5.seconds

pending-pact-tests/consumer/project/build.properties renamed to broker-integration-tests/consumer/project/build.properties

@@ -2,15 +2,28 @@ package provider
 
 import org.scalatest.{BeforeAndAfterAll, FunSpec, Matchers}
 import com.itv.scalapact.PactVerifySuite
-import com.itv.scalapact.shared.{ConsumerVersionSelector, PactBrokerAuthorization, PendingPactSettings}
+import com.itv.scalapact.shared.{BrokerPublishData, ConsumerVersionSelector, PactBrokerAuthorization, PendingPactSettings}
+import scalaj.http._
 
 import scala.concurrent.duration._
 
 class VerifyContractsSpec extends FunSpec with Matchers with BeforeAndAfterAll with PactVerifySuite {
   val serverAllocated =
     AlternateStartupApproach.serverResource.allocated.unsafeRunSync()
 
+  val providerVersion = "0.0.1"
+  val providerTag = "provider-tag"
+  val providerName = "scala-pact-integration-test-provider"
+  val brokerAuth = PactBrokerAuthorization(pactBrokerCredentials = ("dXfltyFMgNOFZAxr8io9wJ37iUpY42M", "O5AIZWxelWbLvqMd8PkAVycBJh2Psyg1"), "")
+
+  val tagRequest = {
+    val authHeader = brokerAuth.map(_.asHeader).get
+    Http(
+      s"https://test.pact.dius.com.au/pacticipants/$providerName/versions/$providerVersion/tags/$providerTag"
+    ).header(authHeader._1, authHeader._2)
+  }
   override def beforeAll(): Unit = {
+    val _ = tagRequest.method("DELETE").asString
     ()
   }
 
@@ -29,18 +42,23 @@ class VerifyContractsSpec extends FunSpec with Matchers with BeforeAndAfterAll w
         .withPactSource(
           pactBrokerWithVersionSelectors(
             "https://test.pact.dius.com.au",
-            "scala-pact-pending-test-provider",
+            providerName,
             consumers,
-            List("master"),
+            List(providerTag),
             pendingPactSettings = PendingPactSettings.PendingEnabled,
-            None,
+            Some(BrokerPublishData(providerVersion, None)),
             //again, these are publicly known creds for a test pact-broker
-            PactBrokerAuthorization(pactBrokerCredentials = ("dXfltyFMgNOFZAxr8io9wJ37iUpY42M", "O5AIZWxelWbLvqMd8PkAVycBJh2Psyg1"), ""),
+            brokerAuth,
             Some(5.seconds)
           )
         )
         .noSetupRequired
         .runVerificationAgainst("localhost", 8080, 10.seconds)
+
+      val fetchTag = tagRequest.asString
+
+      //check tag exists in broker
+      fetchTag.code shouldBe 200
     }
   }
 

pending-pact-tests/consumer/project/plugins.sbt renamed to broker-integration-tests/consumer/project/plugins.sbt

@@ -272,7 +272,7 @@ class PactBrokerClient(implicit
           SimpleRequest(
             baseUrl = providerUrl + "/versions/" + providerVersion + "/tags/" + URLEncoder.encode(tag, "UTF-8"),
             endPoint = "",
-            method = HttpMethod.POST,
+            method = HttpMethod.PUT,
             headers = Map("Content-Type" -> "application/json; charset=UTF-8") ++ pactBrokerAuthorization
               .map(_.asHeader)
               .toList,

pending-pact-tests/consumer/src/test/scala/consumer/ProviderClientSpec.scala renamed to broker-integration-tests/consumer/src/test/scala/consumer/ProviderClientSpec.scala

@@ -131,7 +131,7 @@ class PactBrokerClientSpec extends FunSpec with Matchers with BeforeAndAfter {
       val successfulTagRequest = SimpleRequest(
         baseUrl = getProviderUrl(brokerPublishData.providerVersion, providerVersionTags.head),
         endPoint = "",
-        method = HttpMethod.POST,
+        method = HttpMethod.PUT,
         headers = Map("Content-Type" -> "application/json; charset=UTF-8"),
         body = None,
         sslContextName = None

pending-pact-tests/consumer/tag.txt renamed to broker-integration-tests/consumer/tag.txt

@@ -4,18 +4,18 @@ set -e
 
 source scripts/test-header.sh
 
-echo "Checking pending pacts tests"
+echo "Checking broker integration tests"
 echo "***********************"
 
-cd pending-pact-tests/consumer
+cd broker-integration-tests/consumer
 sbt clean update
 sbt "pactPublish --clientTimeout 5"
 cd ..
 
 cd provider
 sbt clean update test
 
-echo "Testing using the CLI with --includeWipPactsSince"
+echo "Testing pending pacts using the CLI with --includeWipPactsSince"
 sbt run &
 echo "warming things up..."
 simple_countdown 10

pending-pact-tests/consumer/test-expected.json renamed to broker-integration-tests/consumer/test-expected.json

@@ -38,7 +38,7 @@ bash scripts/test-verifier.sh
 echo "Taking a breather... (3)"
 simple_countdown 5
 
-bash scripts/test-pending-pacts.sh
+bash scripts/broker-integration-tests.sh
 
 echo "Taking a breather... (4)"
 simple_countdown 5