Don't force a dependency on refinerycms-authentication.

Also protect from where Devise isn't defined.
refinery · Jun 16, 2012 · ec33ef4 · ec33ef4
1 parent 4213d7f
commit ec33ef4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/lib/refinery/all.rb b/lib/refinery/all.rb
@@ -1,3 +1,3 @@
-%w(core authentication dashboard images resources pages).each do |extension|
+%w(core dashboard images resources pages).each do |extension|
   require "refinerycms-#{extension}"
 end
diff --git a/refinerycms.gemspec b/refinerycms.gemspec
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files -- lib/* templates/*`.split("\n")
 
   s.add_dependency    'bundler',                    '~> 1.0'
-  s.add_dependency    'refinerycms-authentication', version
   s.add_dependency    'refinerycms-core',           version
   s.add_dependency    'refinerycms-dashboard',      version
   s.add_dependency    'refinerycms-images',         version

diff --git a/testing/lib/refinery/testing/controller_macros/authentication.rb b/testing/lib/refinery/testing/controller_macros/authentication.rb
@@ -3,13 +3,13 @@ module Testing
     module ControllerMacros
       module Authentication
         def self.extended(base)
-          base.send(:include, Devise::TestHelpers)
+          base.send(:include, Devise::TestHelpers) if defined?(Devise::TestHelpers)
         end
 
         def refinery_login_with(factory)
           let(:logged_in_user) { FactoryGirl.create factory }
           before(:each) do
-            @request.env["devise.mapping"] = Devise.mappings[:admin]
+            @request.env["devise.mapping"] = Devise.mappings[:admin] if defined?(Devise)
             sign_in logged_in_user
           end
         end