Merge pull request skinny-framework#251 from tsukaby/feature/fix_env_…

…handling Fix env handling.
pc3b3r · Apr 4, 2015 · 99635ba · 99635ba
2 parents a8178d2 + 4575ab4
commit 99635ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/framework/src/main/scala/skinny/controller/feature/EnvFeature.scala b/framework/src/main/scala/skinny/controller/feature/EnvFeature.scala
@@ -13,8 +13,10 @@ trait EnvFeature extends ScalatraBase {
    *
    * @return env string such as "production"
    */
-  def skinnyEnv: Option[String] = SkinnyEnv.get().orElse(Option(environment))
-
+  def skinnyEnv: Option[String] = SkinnyEnv.get().orElse {
+    // convert upper cased "org.scalatra.environment" (e.g. DEVELOPMENT) to skinny's style here
+    Option(environment).map(_.toLowerCase(java.util.Locale.ENGLISH))
+  }
   /**
    * Predicates current env is "development" or "dev".
    *

diff --git a/framework/src/test/scala/skinny/controller/feature/EnvFeatureSpec.scala b/framework/src/test/scala/skinny/controller/feature/EnvFeatureSpec.scala
@@ -16,4 +16,10 @@ class EnvFeatureSpec extends FlatSpec with Matchers {
     }
   }
 
+  it should "convert the default value of Scalatra's environment to lower cased one" in {
+    class Controller extends SkinnyApiController {
+      skinnyEnv should equal(Some("development"))
+    }
+  }
+
 }