remove spork dependency and remove require relatives from tests

citrus · Dec 13, 2011 · 90608bf · 90608bf
1 parent 6f198fe
commit 90608bf
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 27 deletions.
diff --git a/lib/spree_essential_press.rb b/lib/spree_essential_press.rb
@@ -5,7 +5,7 @@
 module SpreeEssentialPress
 
   def self.tab
-    [:press, { :route => :admin_press_index }]
+    { :label => 'Press', :route => :admin_press_index }
   end
 
   def self.sub_tab

diff --git a/spree_essential_press.gemspec b/spree_essential_press.gemspec
@@ -28,7 +28,5 @@ Gem::Specification.new do |s|
 	s.add_development_dependency('capybara',           '>= 1.1.2')
 	s.add_development_dependency('selenium-webdriver', '>= 2.15.0')
   s.add_development_dependency('sqlite3',            '>= 1.3.3')
-  s.add_development_dependency('spork',              '>= 0.9.0.rc9')
-  s.add_development_dependency('spork-testunit',     '>= 0.0.7')
 
 end
diff --git a/test/support/helper_methods.rb b/test/support/helper_methods.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,15 +1,7 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
-require 'rubygems'
-require 'spork'
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require 'spree_essentials/test_helper'
 
-Spork.prefork do
-  require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-  require 'spree_essentials/test_helper'
-end
-
-Spork.each_run do
-  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-  include HelperMethods
-end
+require File.expand_path("../support/factories.rb",  __FILE__)
diff --git a/test/unit/press_image_test.rb b/test/unit/press_image_test.rb
@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require 'test_helper'
 
 class PressImageTest < Test::Unit::TestCase
 

diff --git a/test/unit/press_test.rb b/test/unit/press_test.rb
@@ -1,4 +1,4 @@
-require_relative '../test_helper'
+require 'test_helper'
 
 class PressTest < Test::Unit::TestCase