 |
actually use bundler - reportable - Fork of reportable required by WarVox, from… |
 |
Log |
|
Files |
|
Refs |
|
README |
|
--- |
|
commit a74be968aec5e03c92624882e4bb0374116f2701 |
|
parent 3118fd1728239f14c4930bb54bf3283e3a29f8bc |
 |
Author: Marco Otte-Witte <[email protected]> |
|
Date: Wed, 28 Apr 2010 10:56:46 +0200 |
|
|
|
actually use bundler |
|
|
|
Diffstat: |
|
M Gemfile | 3 +-- |
|
M spec/boot.rb | 6 ------ |
|
M spec/spec_helper.rb | 8 ++------ |
|
|
|
3 files changed, 3 insertions(+), 14 deletions(-) |
|
--- |
|
diff --git a/Gemfile b/Gemfile |
|
@@ -1,5 +1,4 @@ |
|
-source :gemcutter |
|
- |
|
+gem 'rails', '>= 2.2.0' |
|
gem 'activerecord', '>= 2.2.0', :require => 'active_record' |
|
gem 'activesupport', '>= 2.2.0', :require => 'active_support' |
|
gem 'actionpack', '>= 2.2.0', :require => 'action_pack' |
|
diff --git a/spec/boot.rb b/spec/boot.rb |
|
@@ -1,11 +1,5 @@ |
|
plugin_root = File.join(File.dirname(__FILE__), '..') |
|
|
|
-gem 'rails' |
|
-require 'active_record' |
|
-require 'active_support' |
|
-require 'action_controller' |
|
-require 'action_view' |
|
- |
|
$:.unshift "#{plugin_root}/lib" |
|
|
|
RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') |
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb |
|
@@ -1,12 +1,8 @@ |
|
-$:.reject! { |e| e.include? 'TextMate' } |
|
- |
|
ENV['RAILS_ENV'] = 'test' |
|
|
|
require 'rubygems' |
|
-require 'spec' |
|
-require 'test/unit' |
|
-require 'active_support' |
|
-require 'initializer' |
|
+require 'bundler' |
|
+Bundler.setup |
|
|
|
require File.join(File.dirname(__FILE__), 'boot') unless defined?(ActiveRecord) |
|
