nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify env.rb for great justicethe jquery hack was messing up cukes, killed that

Browse source
This commit is contained in:
Dennis Collinson 2012-03-29 11:50:44 -07:00
parent 53f82a3ae7
commit 34bdc09763
3 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
features/support/always_use_local_jquery.rb
View file

@ -1,5 +0,0 @@
module ApplicationHelper
def jquery_include_tag
javascript_include_tag :jquery
end
end

7
features/support/env.rb
View file

@ -16,9 +16,6 @@ require 'cucumber/api_steps'
# Ensure we know the appservers port # Ensure we know the appservers port
Capybara.server_port = 9887 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 # 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 # 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 # prefer to use XPath just remove this line and adjust any selectors in your
@ -80,11 +77,7 @@ silence_warnings do
end end
require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "fake_resque") 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__), '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 Before('@localserver') do

5
features/support/never_ajax_stream.rb
View file

@ -1,5 +0,0 @@
class Stream::Aspect
def ajax_stream?
false
end
end