diff options
author | Azul <azul@riseup.net> | 2016-07-05 08:54:43 +0200 |
---|---|---|
committer | Azul <azul@riseup.net> | 2016-07-05 08:54:43 +0200 |
commit | 798c1240b59403b8d8de9559776718266b2ecba5 (patch) | |
tree | 74b53a8762710a76c4ca5d270b6ef9545dfca221 /test/support | |
parent | fcc8207f84249612eba719b8aa77cd7c51e5ad5a (diff) | |
parent | 30da8e6ffa1eefafb9762645efb85e0beed236c6 (diff) |
Merge remote-tracking branch 'pr/222' into merge-branch
Diffstat (limited to 'test/support')
-rw-r--r-- | test/support/browser_integration_test.rb | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/test/support/browser_integration_test.rb b/test/support/browser_integration_test.rb index 84440a1..1f5e3d2 100644 --- a/test/support/browser_integration_test.rb +++ b/test/support/browser_integration_test.rb @@ -47,32 +47,17 @@ class BrowserIntegrationTest < ActionDispatch::IntegrationTest end def submit_signup(username = nil, password = nil) - - with_config invite_required: true do - - username ||= "test_#{SecureRandom.urlsafe_base64}".downcase - password ||= SecureRandom.base64 - visit '/users/new' - fill_in 'Username', with: username - fill_in 'Password', with: password + username ||= "test_#{SecureRandom.urlsafe_base64}".downcase + password ||= SecureRandom.base64 + visit '/signup' + fill_in 'Username', with: username + fill_in 'Password', with: password + if APP_CONFIG[:invite_required] fill_in 'Invite code', with: @testcode.invite_code - fill_in 'Password confirmation', with: password - click_on 'Sign Up' - return username, password - end - - with_config invite_required: false do - - username ||= "test_#{SecureRandom.urlsafe_base64}".downcase - password ||= SecureRandom.base64 - visit '/users/new' - fill_in 'Username', with: username - fill_in 'Password', with: password - fill_in 'Password confirmation', with: password - click_on 'Sign Up' - return username, password end - + fill_in 'Password confirmation', with: password + click_on 'Sign Up' + return username, password end # currently this only works for tests with poltergeist. |