Commit 8cc5f862 authored by Dennis Collinson's avatar Dennis Collinson

reverting some test env munging

max isn't a princess
learn2git
learn2bash
lulz
parent cbca19b3
......@@ -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'
......
......@@ -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
......
......@@ -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
......
This diff is collapsed.
......@@ -3,10 +3,7 @@
# the COPYRIGHT file.
Diaspora::Application.routes.draw do
begin
mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin'
rescue
end
mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin'
get 'oembed' => 'posts#oembed', :as => 'oembed'
# Posting and Reading
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment