Merge pull request #26 from screenconcept/features/fix_test_suite

add workaround for missing controller
brandleadership · Apr 23, 2015 · 3de53b1 · 3de53b1
2 parents 3901ba0 + 19908ad
commit 3de53b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/partystreusel/styleguide_controller.rb b/app/controllers/partystreusel/styleguide_controller.rb
@@ -1,5 +1,9 @@
 module Partystreusel
+  class ApplicationController < ActionController::Base
+
+  end
   class StyleguideController < ApplicationController
+    layout 'partystreusel'
     def show
       template = File.join(params[:controller].gsub('partystreusel/',''), params[:page])
       render template

diff --git a/styleguide/source/layouts/application.html.haml b/styleguide/source/layouts/application.html.haml
@@ -33,7 +33,7 @@
 
     = csrf_meta_tags
 
-  %body.js-offcanvas{ class: body_class }
+  %body.js-offcanvas
     .offcanvas__outer
       .offcanvas__inner
         %header.page__header{role: "banner"}
@@ -50,7 +50,6 @@
     = render 'layouts/typekit'
 
     -# Application JavaScripts
-    != google_analytics_code
     = javascript_include_tag 'application'#, async: !ScreenConcept.config.assets.debug
 
     <!--[if lte IE 8]>

diff --git a/styleguide/source/layouts/partystreusel.html.haml b/styleguide/source/layouts/partystreusel.html.haml
@@ -0,0 +1 @@
+application.html.haml