reverting some test env munging

max isn't a princess
learn2git
learn2bash
lulz

Gemfile

@@ -25,7 +25,7 @@ gem 'omniauth-tumblr'
 gem 'omniauth-twitter'
 
 gem 'twitter', '2.0.2'
-gem 'rails_admin', :require => false
+gem 'rails_admin'
 
 # mail
 
@@ -139,6 +139,8 @@ gem 'jasmine', :git => 'git://github.com/pivotal/jasmine-gem.git'
 ### GROUPS ####
 
 group :test do
+
+
   gem 'capybara', '~> 1.1.2'
   gem 'cucumber-rails', '1.3.0', :require => false
   gem 'database_cleaner', '0.7.1'
@@ -160,7 +162,7 @@ group :test do
   gem 'sqlite3'
   gem 'mock_redis'
 
-  gem 'spork', '~> 1.0rc3'
+  gem 'spork', '~> 1.0rc2'
   gem 'guard-rspec'
   gem 'guard-spork'
   gem 'guard-cucumber'

Gemfile.lock

@@ -584,7 +584,7 @@ DEPENDENCIES
   sass-rails (= 3.1.4)
   selenium-webdriver
   settingslogic!
-  spork (~> 1.0rc3)
+  spork (~> 1.0rc2)
   sqlite3
   thin (~> 1.3.1)
   timecop

config/environments/test.rb

@@ -9,7 +9,7 @@ Diaspora::Application.configure do
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = false
+  config.cache_classes = true
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true

config/initializers/rails_admin.rb

@@ -1,9 +1,7 @@
 # RailsAdmin config file. Generated on March 24, 2012 15:34
 # See github.com/sferik/rails_admin for more informations
-unless Rails.env == 'test'  #rails admin preloads all models making spork useless
-  require 'rails_admin'
 
-  RailsAdmin.config do |config|
+RailsAdmin.config do |config|
    config.authorize_with do 
     redirect_to main_app.root_path unless current_user.try(:admin?)
   end
@@ -1129,8 +1127,8 @@ unless Rails.env == 'test'  #rails admin preloads all models making spork useles
   #   create do; end
   #   update do; end
   # end
-  end
-  if defined?(WillPaginate)
+end
+if defined?(WillPaginate)
   module WillPaginate
     module ActiveRecord
       module RelationMethods
@@ -1142,5 +1140,4 @@ unless Rails.env == 'test'  #rails admin preloads all models making spork useles
       alias_method :num_pages, :total_pages
     end
   end
-  end
 end

config/routes.rb

@@ -3,10 +3,7 @@
 #   the COPYRIGHT file.
 
 Diaspora::Application.routes.draw do
-  begin
   mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin'
-  rescue
-  end
 
   get 'oembed' => 'posts#oembed', :as => 'oembed'
   # Posting and Reading