Fix Authlogic activation.

marnen · Sep 2, 2011 · 6516e66 · 6516e66
1 parent 4d03c22
commit 6516e66
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -23,7 +23,7 @@ gem 'rails', '3.0.10'
 
 gem 'haml'
 gem 'sass'
-gem 'postgres'
+gem 'pg'
 gem 'fast_gettext'
 gem 'prawn'
 gem 'GeoRuby'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -83,8 +83,8 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     nokogiri (1.5.0)
+    pg (0.11.0)
     polyglot (0.3.2)
-    postgres (0.7.9.2008.01.28)
     prawn (0.4.0)
       prawn-layout
     prawn-layout (0.1.0)
@@ -160,7 +160,7 @@ DEPENDENCIES
   gettext (>= 1.9.3)
   haml
   machinist (>= 1.0.3)
-  postgres
+  pg
   prawn
   rails (= 3.0.10)
   rdiscount (>= 1.2.11)

diff --git a/spec/support/authlogic.rb b/spec/support/authlogic.rb
@@ -1,8 +1,9 @@
 require 'authlogic/test_case'
 include Authlogic::TestCase
 
-RSpec.configure do |config|
-  config.before(:each) do
+# See https://github.com/rspec/rspec-rails/issues/391 .
+shared_context 'authlogic', :type => 'controller' do
+  before(:each) do
     activate_authlogic
   end
 end