From ec33ef46ef92d0d178f40b5bbc01cd13615b65f5 Mon Sep 17 00:00:00 2001
From: Philip Arndt <parndt@gmail.com>
Date: Tue, 5 Jun 2012 19:44:13 +1200
Subject: [PATCH] Don't force a dependency on refinerycms-authentication.

Also protect from where Devise isn't defined.
---
 lib/refinery/all.rb                                           | 2 +-
 refinerycms.gemspec                                           | 1 -
 .../lib/refinery/testing/controller_macros/authentication.rb  | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/refinery/all.rb b/lib/refinery/all.rb
index ee4c7f32ae..303fdcb6da 100644
--- 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
index d693bf076b..3e4f1f3262 100644
--- 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
index 11d25205be..14a1ed3df9 100644
--- 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