From 6ed00515e8614233160d74b1c32b75fab27ac722 Mon Sep 17 00:00:00 2001 From: Daniel Pittman Date: Fri, 8 Apr 2011 16:06:57 -0700 Subject: maint: just require 'spec_helper', thanks rspec2 rspec2 automatically sets a bunch of load-path stuff we were by hand, so we can just stop. As a side-effect we can now avoid a whole pile of stupid things to try and include the spec_helper.rb file... ...and then we can stop protecting spec_helper from evaluating twice, since we now require it with a consistent name. Yay. Reviewed-By: Pieter van de Bruggen --- spec/unit/parser/functions/include_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/unit/parser/functions/include_spec.rb') diff --git a/spec/unit/parser/functions/include_spec.rb b/spec/unit/parser/functions/include_spec.rb index cfaadfbb6..b477f1439 100755 --- a/spec/unit/parser/functions/include_spec.rb +++ b/spec/unit/parser/functions/include_spec.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper') +require 'spec_helper' describe "the 'include' function" do before :all do -- cgit From db11770718c61f9ee3d5fcd703c5c0c7c05227ca Mon Sep 17 00:00:00 2001 From: Daniel Pittman Date: Wed, 13 Apr 2011 00:35:11 -0700 Subject: maint: clean up the spec test headers in bulk. We now use a shebang of: #!/usr/bin/env rspec This enables the direct execution of spec tests again, which was lost earlier during the transition to more directly using the rspec2 runtime environment. --- spec/unit/parser/functions/include_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'spec/unit/parser/functions/include_spec.rb') diff --git a/spec/unit/parser/functions/include_spec.rb b/spec/unit/parser/functions/include_spec.rb index b477f1439..15206cd7c 100755 --- a/spec/unit/parser/functions/include_spec.rb +++ b/spec/unit/parser/functions/include_spec.rb @@ -1,5 +1,4 @@ -#!/usr/bin/env ruby - +#!/usr/bin/env rspec require 'spec_helper' describe "the 'include' function" do -- cgit