From 34bdc09763e9fff044d755e9daa21f0ccd3a6cad Mon Sep 17 00:00:00 2001
From: Dennis Collinson <dennis.collective@gmail.com>
Date: Thu, 29 Mar 2012 11:50:44 -0700
Subject: [PATCH] simplify env.rb for great justicethe jquery hack was messing
 up cukes, killed that

---
 features/support/always_use_local_jquery.rb | 5 -----
 features/support/env.rb                     | 7 -------
 features/support/never_ajax_stream.rb       | 5 -----
 3 files changed, 17 deletions(-)
 delete mode 100644 features/support/always_use_local_jquery.rb
 delete mode 100644 features/support/never_ajax_stream.rb

diff --git a/features/support/always_use_local_jquery.rb b/features/support/always_use_local_jquery.rb
deleted file mode 100644
index 50f692df1..000000000
--- a/features/support/always_use_local_jquery.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module ApplicationHelper
-  def jquery_include_tag
-    javascript_include_tag :jquery
-  end
-end
\ No newline at end of file
diff --git a/features/support/env.rb b/features/support/env.rb
index 95a9af22b..576161870 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -16,9 +16,6 @@ require 'cucumber/api_steps'
 # Ensure we know the appservers port
 Capybara.server_port = 9887
 
-# Set the asset host for the pipeline
-ActionController::Base.asset_host = Capybara.app_host
-
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your
@@ -80,11 +77,7 @@ silence_warnings do
 end
 
 require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "fake_resque")
-
-
 require File.join(File.dirname(__FILE__), 'run_resque_in_process')
-require File.join(File.dirname(__FILE__), 'always_use_local_jquery')
-require File.join(File.dirname(__FILE__), 'never_ajax_stream')
 
 
 Before('@localserver') do
diff --git a/features/support/never_ajax_stream.rb b/features/support/never_ajax_stream.rb
deleted file mode 100644
index 3630df95f..000000000
--- a/features/support/never_ajax_stream.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Stream::Aspect
-  def ajax_stream?
-    false
-  end
-end