diff --git a/monitor/spec/production_spec.rb b/monitor/spec/production_spec.rb index 3db23d9fd..d7bf8205d 100755 --- a/monitor/spec/production_spec.rb +++ b/monitor/spec/production_spec.rb @@ -17,7 +17,6 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe Capybara.current_driver = Capybara.javascript_driver Capybara.app_host = www Capybara.run_server = false - Capybara.default_wait_time = 10 end TestUser = Class.new do diff --git a/monitor/spec/spec_helper.rb b/monitor/spec/spec_helper.rb index 5df32957d..5b3882d80 100755 --- a/monitor/spec/spec_helper.rb +++ b/monitor/spec/spec_helper.rb @@ -28,8 +28,15 @@ RSpec.configure do |config| config.order = 'random' config.include Capybara::DSL + + config.before(:each) do + page.driver.headers = { 'User-Agent' => 'monitor' } + end end +#Capybara.register_driver :poltergeist do |app| +# Capybara::Poltergeist::Driver.new(app, { phantomjs_logger: File.open('console.log', 'w') }) +#end Capybara.javascript_driver = :poltergeist Capybara.default_driver = :poltergeist Capybara.run_server = false # since we're testing an app outside this project diff --git a/web/app/views/shared/_ga.html.erb b/web/app/views/shared/_ga.html.erb index e3957a4d5..5c1a9c07f 100644 --- a/web/app/views/shared/_ga.html.erb +++ b/web/app/views/shared/_ga.html.erb @@ -1,4 +1,4 @@ -<% if current_user.nil? || !Rails.application.config.ga_suppress_admin || !current_user.admin? # remove admin users from GA %> +<% if current_user.nil? || !Rails.application.config.ga_suppress_admin || !current_user.admin? || request.user_agent != 'monitor' %>