summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-07-16 13:06:48 +0200
committerAzul <azul@leap.se>2013-07-16 13:06:48 +0200
commitf40c09a8b750d5d317a22af7186bde5c940b6924 (patch)
tree0d406819e6180b0e68a97923a669c1f3ad6c1bf5
parentadfae07c5d682d9aaf09d1f33507e5f9c2b80976 (diff)
ensure the page has been reloaded before testing current_path
This test would fail sometimes on assert_equal '/', current_path I believe it was a timing issue. page.has_content? will wait for the content to show up. So afterwards the current_path should always be correct.
-rw-r--r--test/test_helper.rb1
-rw-r--r--users/test/integration/browser/account_test.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index a409b58..26b99f4 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -31,6 +31,7 @@ Capybara.run_server = true
Capybara.app_host = 'http://lvh.me:3003'
Capybara.server_port = 3003
Capybara.javascript_driver = :poltergeist
+Capybara.default_wait_time = 5
class BrowserIntegrationTest < ActionDispatch::IntegrationTest
# Make the Capybara DSL available
diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb
index 9f6d067..ce63baf 100644
--- a/users/test/integration/browser/account_test.rb
+++ b/users/test/integration/browser/account_test.rb
@@ -16,6 +16,7 @@ class AccountTest < BrowserIntegrationTest
click_on 'Sign Up'
assert page.has_content?("Welcome #{username}")
click_on 'Logout'
+ assert page.has_content?("Sign Up")
assert_equal '/', current_path
end