Permalink
Browse files

RSpec now only runs once when you run it. Refactored where the extra …

…load logic went to get it into vendor.
  • Loading branch information...
1 parent b4de31e commit 5bb5739e070f5180a90ef047c08880c8199b202a @parndt parndt committed Jul 23, 2010
View
@@ -15,4 +15,4 @@ require 'rake/testtask'
require 'rake/rdoctask'
require 'tasks/rails'
-require 'refinery/tasks/refinery'
+require 'tasks/refinery'
View
@@ -110,9 +110,6 @@ Gem::Specification.new do |s|
'features/support/negative_expectations_helper.rb',
'features/support/paths.rb',
'lib/gemspec.rb',
- 'lib/refinery',
- 'lib/refinery/tasks',
- 'lib/refinery/tasks/refinery.rb',
'lib/refinery_initializer.rb',
'lib/tasks',
'lib/tasks/cucumber.rake',
@@ -1169,6 +1166,7 @@ Gem::Specification.new do |s|
'vendor/plugins/refinery/lib/tasks',
'vendor/plugins/refinery/lib/tasks/doc.rake',
'vendor/plugins/refinery/lib/tasks/refinery.rake',
+ 'vendor/plugins/refinery/lib/tasks/refinery.rb',
'vendor/plugins/refinery/lib/tasks/yard.rake',
'vendor/plugins/refinery/plugins.md',
'vendor/plugins/refinery/rails',
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path('../../../spec_helper', __FILE__)
describe Page do
before(:each) do
@@ -14,7 +14,5 @@
extra_rake_tasks << paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort}
end
-extra_rake_tasks << Dir[Rails.root.join("lib", "refinery", "tasks", "*.rake").to_s]
-
# Load in any extra tasks that we've found.
-extra_rake_tasks.flatten.compact.uniq.each {|rake| load rake }
+extra_rake_tasks.flatten.reject{|t| t.nil? or t =~ /rspec/ }.uniq.each {|rake| load rake }

0 comments on commit 5bb5739

Please sign in to comment.