raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=htt #19388 Fixing broken test in akka-docs from RemoteAddress changes

Browse source 
Also dealing with merge conflicts from my fork's head

Conflicts:
	akka-http-core/src/test/scala/akka/http/impl/engine/parsing/HttpHeaderParserSpec.scala
	akka-http-core/src/test/scala/akka/http/impl/model/parser/HttpHeaderSpec.scala
This commit is contained in:
Chris Baxter 2016-02-10 12:17:57 -05:00
commit fbd12c7c83
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/MiscDirectivesExamplesSpec.scala
View file

@ -8,6 +8,7 @@ import akka.http.scaladsl.model._
import akka.http.scaladsl.server._
import headers._
import docs.http.scaladsl.server.RoutingSpec
import java.net.InetAddress
class MiscDirectivesExamplesSpec extends RoutingSpec {
@ -17,7 +18,7 @@ class MiscDirectivesExamplesSpec extends RoutingSpec {
}
// tests:
Get("/").withHeaders(`Remote-Address`(RemoteAddress("192.168.3.12"))) ~> route ~> check {
Get("/").withHeaders(`Remote-Address`(RemoteAddress(InetAddress.getByName("192.168.3.12")))) ~> route ~> check {
responseAs[String] shouldEqual "Client's ip is 192.168.3.12"
}
}

1
akka-http-core/src/test/scala/akka/http/impl/engine/parsing/HttpHeaderParserSpec.scala
View file

@ -135,7 +135,6 @@ class HttpHeaderParserSpec extends WordSpec with Matchers with BeforeAndAfterAll
"parse and cache an X-Real-Ip with a hostname as it's value as a RawHeader" in new TestSetup() {
parseAndCache("X-Real-Ip: akka.io\r\nx")() shouldEqual RawHeader("x-real-ip", "akka.io")
}
"parse and cache a raw header" in new TestSetup(primed = false) {
insert("hello: bob", 'Hello)
val (ixA, headerA) = parseLine("Fancy-Pants: foo\r\nx")