a bit lighter

dchelimsky · Mar 18, 2009 · c9abdcc · c9abdcc
1 parent 5c6d1c7
commit c9abdcc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 49 deletions.
diff --git a/generators/rspec/templates/rspec.rake b/generators/rspec/templates/rspec.rake
@@ -1,19 +1,4 @@
 gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
-rspec_gem_dir = nil
-Dir["#{RAILS_ROOT}/vendor/gems/*"].each do |subdir|
-  rspec_gem_dir = subdir if subdir.gsub("#{RAILS_ROOT}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")
-end
-rspec_plugin_dir = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec')
-
-if rspec_gem_dir && (test ?d, rspec_plugin_dir)
-  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
-end
-
-if rspec_gem_dir
-  $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") 
-elsif File.exist?(rspec_plugin_dir)
-  $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
-end
 
 # Don't load rspec if running "rake gems:*"
 unless ARGV.any? {|a| a =~ /^gems/}

diff --git a/generators/rspec/templates/script/spec b/generators/rspec/templates/script/spec
@@ -1,23 +1,8 @@
 #!/usr/bin/env ruby
 gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
-rails_root = File.expand_path(File.dirname(__FILE__) + "/..")
-rspec_gem_dir = nil
-Dir["#{rails_root}/vendor/gems/*"].each do |subdir|
-  rspec_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")
-end
-rspec_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec")
 
-if rspec_gem_dir && (test ?d, rspec_plugin_dir)
-  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
-end
-
-if rspec_gem_dir
-  $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") 
-elsif File.exist?(rspec_plugin_dir)
-  $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
-else
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-end
+ENV['RAILS_ENV'] ||= 'test'
+require File.join(File.dirname(__FILE__), "/../config/environment")
 
 require 'spec/autorun'
 exit ::Spec::Runner::CommandLine.run
diff --git a/generators/rspec/templates/script/spec_server b/generators/rspec/templates/script/spec_server
@@ -1,23 +1,8 @@
 #!/usr/bin/env ruby
 gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
-rails_root = File.expand_path(File.dirname(__FILE__) + "/..")
-rspec_rails_gem_dir = nil
-Dir["#{rails_root}/vendor/gems/*"].each do |subdir|
-  rspec_rails_gem_dir = subdir if subdir.gsub("#{rails_root}/vendor/gems/","") =~ /^(\w+-)?rspec-rails-(\d+)/
-end
-rspec_rails_plugin_dir = File.expand_path("#{rails_root}/vendor/plugins/rspec-rails")
-
-if rspec_rails_gem_dir && (test ?d, rspec_rails_plugin_dir)
-  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
-end
 
-if rspec_rails_gem_dir
-  $LOAD_PATH.unshift("#{rspec_rails_gem_dir}/lib") 
-elsif File.exist?(rspec_rails_plugin_dir)
-  $LOAD_PATH.unshift("#{rspec_rails_plugin_dir}/lib")
-else
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-end
+ENV['RAILS_ENV'] ||= 'test'
+require File.join(File.dirname(__FILE__), "/../config/environment")
 
 require 'optparse'
 require 'spec/rails/spec_server'