From b7e732bc2a7dadf2c35ac3eb2dae547989aac55a Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <tvd@magiclabs.de>
Date: Tue, 24 Apr 2012 23:05:05 +0200
Subject: [PATCH] Fixes rails version dependence and removes fuubar rspec
 format

---
 .rspec              | 1 -
 lib/alchemy_cms.rb  | 4 ++--
 spec/spec_helper.rb | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.rspec b/.rspec
index 886c19f210..5052887a0f 100644
--- a/.rspec
+++ b/.rspec
@@ -1,2 +1 @@
---format Fuubar
 --color
\ No newline at end of file
diff --git a/lib/alchemy_cms.rb b/lib/alchemy_cms.rb
index 51ee361683..8504c0552b 100644
--- a/lib/alchemy_cms.rb
+++ b/lib/alchemy_cms.rb
@@ -1,4 +1,4 @@
-if defined?(Rails) && Rails::VERSION::MAJOR == 3
+if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   require 'acts_as_list'
   require 'attachment_magic'
   require 'authlogic'
@@ -23,7 +23,7 @@
   end
   require File.join(File.dirname(__FILE__), "alchemy", "seeder")
 else
-  raise "Alchemy 2.1 needs Rails 3.1 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
+  raise "Alchemy 2.2 needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
 end
 
 module Alchemy
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c8a48a296b..6417084b5f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,10 +28,10 @@ def configure
 
   # Configure capybara for integration testing
   require "capybara/rails"
-  require 'capybara-webkit'
+  require 'capybara-webkit' unless ENV['CI']
   Capybara.default_driver = :rack_test
   Capybara.default_selector = :css
-  Capybara.javascript_driver = :webkit
+  Capybara.javascript_driver = :webkit unless ENV['CI']
 
   # Load support files
   Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }