Merge pull request #1627 from thedarkone/appl-helper

Remove application_helper.rb from refinery/core
refinery · Apr 28, 2012 · b4b5342 · b4b5342
2 parents 8e560b2 + c33cf56
commit b4b5342
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/core/app/controllers/refinery/admin_controller.rb b/core/app/controllers/refinery/admin_controller.rb
@@ -3,6 +3,7 @@
 module Refinery
   class AdminController < ::ActionController::Base
     include ::Refinery::ApplicationController
+    helper ApplicationHelper
     helper Refinery::Core::Engine.helpers
     include Refinery::Admin::BaseController
 

diff --git a/core/app/helpers/application_helper.rb b/core/app/helpers/application_helper.rb
diff --git a/core/spec/lib/refinery/core_spec.rb b/core/spec/lib/refinery/core_spec.rb
@@ -173,4 +173,12 @@
       end
     end
   end
+
+  describe Refinery::Core::Engine do
+    describe "#helpers" do
+      it "should not include ApplicationHelper" do
+        Refinery::Core::Engine.helpers.ancestors.map(&:name).should_not include("ApplicationHelper")
+      end
+    end
+  end
 end