diff options
author | Azul <azul@leap.se> | 2013-07-14 19:52:54 +0200 |
---|---|---|
committer | Azul <azul@leap.se> | 2013-07-14 19:52:54 +0200 |
commit | 8b79988c4c6cedd77664e14f16b149a669965eff (patch) | |
tree | bea408e33b4f2a973b8f268a5ad41399fe527072 /users/test/integration | |
parent | 740813d8350290c176c1b0d0cfe3ac80aee1b420 (diff) |
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.
Diffstat (limited to 'users/test/integration')
-rw-r--r-- | users/test/integration/api/rack_test.rb | 3 | ||||
-rw-r--r-- | users/test/integration/browser/account_test.rb | 2 |
2 files changed, 1 insertions, 4 deletions
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 |