PR feedback: variable naming

broadinstitute · May 22, 2017 · f503601 · f503601
1 parent 0021bf7
commit f503601
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...in/scala/org/broadinstitute/dsde/agora/server/webservice/routes/MockAgoraDirectives.scala b/...in/scala/org/broadinstitute/dsde/agora/server/webservice/routes/MockAgoraDirectives.scala
@@ -9,20 +9,18 @@ import scala.concurrent.ExecutionContext
 
 trait MockAgoraDirectives extends AgoraDirectives {
   def commonNameFromRequest(magnet: ImplicitMagnet[ExecutionContext]): Directive1[String] = {
-
-
     provide(AgoraConfig.mockAuthenticatedUserEmail)
   }
 
   // allow unit tests to specify the user making the request; if they don't, use the default
   def usernameFromRequest(magnet: ImplicitMagnet[ExecutionContext]): Directive1[String] = {
-    optionalHeaderValueByName(MockAgoraDirectives.mockUserHeader) map {
-      case Some(mockuser) => mockuser
+    optionalHeaderValueByName(MockAgoraDirectives.mockAuthenticatedUserEmailHeader) map {
+      case Some(mockAuthenticatedUserEmail) => mockAuthenticatedUserEmail
       case None => AgoraConfig.mockAuthenticatedUserEmail
     }
   }
 }
 
 object MockAgoraDirectives extends MockAgoraDirectives {
-  val mockUserHeader = "X-UnitTest-ImpersonateUser"
+  val mockAuthenticatedUserEmailHeader = "X-UnitTest-MockAuthenticatedUserEmail"
 }
diff --git a/.../scala/org/broadinstitute/dsde/agora/server/webservice/EntityCreationPermissionSpec.scala b/.../scala/org/broadinstitute/dsde/agora/server/webservice/EntityCreationPermissionSpec.scala
@@ -151,7 +151,7 @@ class EntityCreationPermissionSpec extends ApiServiceSpec {
     val randomEntity = createRandomMethod(namespace, name)
 
     Post(ApiUtil.Methods.withLeadingVersion, randomEntity) ~>
-      addHeader(MockAgoraDirectives.mockUserHeader, asUser) ~>
+      addHeader(MockAgoraDirectives.mockAuthenticatedUserEmailHeader, asUser) ~>
       methodsService.postRoute ~> check {
         assert(status == expectedStatus, response.message)
         if (expectedStatus == Created) {