Standardize on "require 'spec_helper'".

jasmine · Apr 14, 2012 · ece0652 · ece0652
1 parent 2e60e6e
commit ece0652
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 10 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,6 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
 require "bundler"
-Bundler.setup
 Bundler::GemHelper.install_tasks
 
 require "jasmine"

diff --git a/spec/config_spec.rb b/spec/config_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 require 'selenium-webdriver'
 
 describe Jasmine::Config do

diff --git a/spec/jasmine_command_line_tool_rakeless_spec.rb b/spec/jasmine_command_line_tool_rakeless_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 describe "Jasmine command line tool" do
   context "when rake has not been required yet" do

diff --git a/spec/jasmine_command_line_tool_spec.rb b/spec/jasmine_command_line_tool_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 describe "Jasmine command line tool" do
   before :each do
@@ -26,4 +26,4 @@
     output = capture_stdout { Jasmine::CommandLineTool.new.process ["license"] }
     output.should =~ /Copyright/
   end
-end
+end
diff --git a/spec/jasmine_pojs_spec.rb b/spec/jasmine_pojs_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 describe "POJS jasmine install" do
 

diff --git a/spec/jasmine_rails2_spec.rb b/spec/jasmine_rails2_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 if Jasmine::Dependencies.rails2? && !Jasmine::Dependencies.legacy_rails?
 

diff --git a/spec/jasmine_rails3_spec.rb b/spec/jasmine_rails3_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 
 if Jasmine::Dependencies.rails3?
 

diff --git a/spec/jasmine_self_test_spec.rb b/spec/jasmine_self_test_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 require 'jasmine_self_test_config'
 
 jasmine_config = JasmineSelfTestConfig.new

diff --git a/spec/server_spec.rb b/spec/server_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+require 'spec_helper'
 require 'rack/test'
 
 describe "Jasmine.app" do