From 8b79988c4c6cedd77664e14f16b149a669965eff Mon Sep 17 00:00:00 2001 From: Azul Date: Sun, 14 Jul 2013 19:52:54 +0200 Subject: make sure capybara runs the whole rack app We use port 3003 for the integration test server. This test takes a few seconds (~8) now. Most of this is startup time of the server. A second run still takes 2 seconds like before. --- users/test/integration/api/rack_test.rb | 3 --- users/test/integration/browser/account_test.rb | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'users') diff --git a/users/test/integration/api/rack_test.rb b/users/test/integration/api/rack_test.rb index da960f2..9a69f52 100644 --- a/users/test/integration/api/rack_test.rb +++ b/users/test/integration/api/rack_test.rb @@ -1,6 +1,3 @@ -CONFIG_RU = (Rails.root + 'config.ru').to_s -OUTER_APP = Rack::Builder.parse_file(CONFIG_RU).first - class RackTest < ActiveSupport::TestCase include Rack::Test::Methods include Warden::Test::Helpers diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb index 4fff637..5483c89 100644 --- a/users/test/integration/browser/account_test.rb +++ b/users/test/integration/browser/account_test.rb @@ -1,7 +1,7 @@ class AccountTest < BrowserIntegrationTest setup do - Capybara.current_driver = Capybara.javascript_driver # :selenium by default + Capybara.current_driver = Capybara.javascript_driver end test "normal account workflow" do -- cgit v1.2.3