commit 2284439f5d3eb960da449c7bd4f20ccb11c5d7ed
author Dominic Kim <style9595@gmail.com> Wed Jun 28 09:22:18 2017 +0900
committer rodric rabbah <rodric@gmail.com> Tue Jun 27 20:22:18 2017 -0400
tree ecf253dc05366fffa09e58dffdf28f83bd491c80
parent 9ee985792768436fe93f690ab0c35f6c5a9955ca

Make OW run with docker for mac (#1790)


* Add documentation for docker for mac (#1431)
* Replace akka-http client to play-ws client (temporarily)
* Introduce docker-machine environment

.gitignore

diff --git a/.gitignore b/.gitignore
index 76fd0f8..437ce4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,7 +43,7 @@
 .idea
 
 # Ansible
-ansible/environments/mac/hosts
+ansible/environments/docker-machine/hosts
 ansible/db_local.ini*
 ansible/tmp/*
 ansible/roles/nginx/files/*.csr

tests/build.gradle

diff --git a/tests/build.gradle b/tests/build.gradle
index f80e47e..3a07e70 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -7,6 +7,8 @@
 }
 
 tasks.withType(Test) {
+    systemProperties(System.getProperties())
+
     testLogging {
         events "passed", "skipped", "failed"
         showStandardStreams = true
@@ -50,6 +52,7 @@
     compile 'com.typesafe.akka:akka-testkit_2.11:2.4.16'
     compile 'com.google.code.gson:gson:2.3.1'
     compile 'org.scalamock:scalamock-scalatest-support_2.11:3.4.2'
+    compile 'com.typesafe.play:play-ws_2.11:2.5.11'
 
     compile project(':common:scala')
     compile project(':core:controller')

tests/src/test/scala/actionContainers/ActionContainer.scala

diff --git a/tests/src/test/scala/actionContainers/ActionContainer.scala b/tests/src/test/scala/actionContainers/ActionContainer.scala
index f74f3c4..978114d 100644
--- a/tests/src/test/scala/actionContainers/ActionContainer.scala
+++ b/tests/src/test/scala/actionContainers/ActionContainer.scala
@@ -161,12 +161,10 @@
 
     private def syncPost(host: String, port: Int, endPoint: String, content: JsValue)(
         implicit actorSystem: ActorSystem): (Int, Option[JsObject]) = {
-        import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-        import akka.http.scaladsl.marshalling._
         import akka.http.scaladsl.model._
         import akka.http.scaladsl.unmarshalling._
         import akka.stream.ActorMaterializer
-        import whisk.core.container.AkkaHttpUtils
+        import common.AkkaHttpUtils
 
         implicit val materializer = ActorMaterializer()
 
@@ -176,10 +174,8 @@
             path = Uri.Path(endPoint))
 
         val f = for (
-            entity <- Marshal(content).to[MessageEntity];
-            request = HttpRequest(method = HttpMethods.POST, uri = uri, entity = entity);
-            response <- AkkaHttpUtils.singleRequest(request, 90.seconds, retryOnTCPErrors = true);
-            responseBody <- Unmarshal(response.entity).to[String]
+            response <- AkkaHttpUtils.singleRequest(uri.toString(), content, 90.seconds, retryOnTCPErrors = true);
+            responseBody <- Unmarshal(response.body).to[String]
         ) yield (response.status.intValue, Try(responseBody.parseJson.asJsObject).toOption)
 
         Await.result(f, 90.seconds)