From 3891b8afe4800c015398b8aef768e90acd810170 Mon Sep 17 00:00:00 2001 From: ragaskar Date: Wed, 25 Nov 2009 18:47:22 -0800 Subject: [PATCH] Load JasmineHelper overrides in jasmine_meta_spec --- lib/jasmine-ruby/jasmine_meta_spec.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/jasmine-ruby/jasmine_meta_spec.rb b/lib/jasmine-ruby/jasmine_meta_spec.rb index b2932d5..34154a2 100644 --- a/lib/jasmine-ruby/jasmine_meta_spec.rb +++ b/lib/jasmine-ruby/jasmine_meta_spec.rb @@ -1,6 +1,10 @@ require 'rubygems' require "selenium_rc" require File.expand_path(File.join(File.dirname(__FILE__), "jasmine_helper.rb")) +helper_overrides = File.expand_path(File.join(Dir.pwd, "spec", "helpers", "jasmine_helper.rb")) +if File.exist?(helper_overrides) + require helper_overrides +end require File.expand_path(File.join(File.dirname(__FILE__), "jasmine_runner.rb")) require File.expand_path(File.join(File.dirname(__FILE__), "jasmine_spec_builder")) @@ -8,8 +12,8 @@ jasmine_runner = Jasmine::Runner.new(SeleniumRC::Server.new.jar_path, Dir.pwd, JasmineHelper.specs, { :spec_helpers => JasmineHelper.files + JasmineHelper.spec_helpers, - :stylesheets => JasmineHelper.stylesheets - }) + :stylesheets => JasmineHelper.stylesheets + }) spec_builder = Jasmine::SpecBuilder.new(JasmineHelper.spec_files, jasmine_runner)