Fixes rails version dependence and removes fuubar rspec format

wuservices · Apr 24, 2012 · b7e732b · b7e732b
1 parent f2a23aa
commit b7e732b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.rspec b/.rspec
@@ -1,2 +1 @@
---format Fuubar
 --color
diff --git 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
@@ -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 }