Merge pull request #59 from andyl/master

Jasminerice MultiSuite
bradphelan · Oct 15, 2012 · f9c9036 · f9c9036
2 parents f896b03 + c8e7b31
commit f9c9036
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/jasminerice/spec_controller.rb b/app/controllers/jasminerice/spec_controller.rb
@@ -8,6 +8,7 @@ class SpecController <  Jasminerice::ApplicationController
     layout false
 
     def index
+      @specenv = params[:environment].try(:concat, "_spec") || "spec"
     end
 
     def fixtures

diff --git a/app/views/jasminerice/spec/index.html.haml b/app/views/jasminerice/spec/index.html.haml
@@ -4,6 +4,6 @@
     = stylesheet_link_tag "jasmine"
     = stylesheet_link_tag "spec"
     = javascript_include_tag "jasminerice"
-    = javascript_include_tag "spec"
+    = javascript_include_tag @specenv
     = csrf_meta_tags
   %body