Fix name collisions with multiple spec_helpers

outstand · Aug 29, 2012 · 97931b7 · 97931b7
1 parent 2a7a0e7
commit 97931b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/spec/remote/spec_helper.rb → spec/remote/remote_helper.rb b/spec/remote/spec_helper.rb → spec/remote/remote_helper.rb
@@ -1,21 +1,13 @@
-require 'rubygems'
-require 'rspec'
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+require 'spec_helper'
 
-require 'chargify_api_ares'
+FakeWeb.allow_net_connect = true
 
 unless File.exists?(File.join(File.dirname(__FILE__), 'remote.yml'))
   STDERR.puts "\nERROR: Make sure a remote.yml file exists at ./spec/remote/remote.yml\n\n"
   abort
 end
 
 RSpec.configure do |config|
-  config.filter_run :focused => true
-  config.run_all_when_everything_filtered = true
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.alias_example_to :fit, :focused => true
-  config.color_enabled = true
   config.before(:all) do
     Chargify.configure do |c|
       c.api_key = remote_configuration['api_key']

diff --git a/spec/remote/remote_spec.rb b/spec/remote/remote_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'remote/remote_helper'
 
 describe "Remote" do