Merge pull request #160 from hibobio/master

support controller tests without application in context
t2v · Mar 8, 2016 · c54b59d · c54b59d
2 parents 62dd02c + 7655e26
commit c54b59d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/module/src/main/scala/jp/t2v/lab/play2/auth/AsyncAuth.scala b/module/src/main/scala/jp/t2v/lab/play2/auth/AsyncAuth.scala
@@ -36,7 +36,7 @@ trait AsyncAuth {
  }
 
  private[auth] def extractToken(request: RequestHeader): Option[AuthenticityToken] = {
- if (play.api.Play.isTest(play.api.Play.current)) {
+ if (play.api.Play.maybeApplication.forall(app => play.api.Play.isTest(app))) {
  request.headers.get("PLAY2_AUTH_TEST_TOKEN") orElse tokenAccessor.extract(request)
  } else {
  tokenAccessor.extract(request)

diff --git a/module/src/main/scala/jp/t2v/lab/play2/auth/AuthConfig.scala b/module/src/main/scala/jp/t2v/lab/play2/auth/AuthConfig.scala
@@ -50,7 +50,7 @@ trait AuthConfig {
 
  lazy val tokenAccessor: TokenAccessor = new CookieTokenAccessor(
  cookieName = "PLAY2AUTH_SESS_ID",
- cookieSecureOption = play.api.Play.isProd(play.api.Play.current),
+ cookieSecureOption = play.api.Play.maybeApplication.exists(app => play.api.Play.isProd(app)),
  cookieHttpOnlyOption = true,
  cookieDomainOption = None,
  cookiePathOption = "/",