summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-04-20 14:11:42 +0000
committerazul <azul@riseup.net>2017-04-20 14:11:42 +0000
commita5ba112d8c6bc068de9c499600452b77d40d7a8b (patch)
tree59512c3e0f45b680c164f2f097e2d34d5dde23fb /test
parent92e41fa177c924aee2146987be40c1f3d8af4872 (diff)
parent653f92e6ac5c0b61e8113665735d929426deb714 (diff)
Merge branch 'bugfix/8784-import-pgp-key' into 'master'
fix: set token in forms correctly Closes #8784 See merge request !37
Diffstat (limited to 'test')
-rw-r--r--test/integration/browser/account_livecycle_test.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/integration/browser/account_livecycle_test.rb b/test/integration/browser/account_livecycle_test.rb
index 3d23363..694ff9c 100644
--- a/test/integration/browser/account_livecycle_test.rb
+++ b/test/integration/browser/account_livecycle_test.rb
@@ -92,7 +92,7 @@ class AccountLivecycleTest < BrowserIntegrationTest
test "change pgp key" do
with_config user_actions: ['change_pgp_key'] do
pgp_key = FactoryGirl.build :pgp_key
- login
+ username, _password = submit_signup
click_on "Account Settings"
within('#update_pgp_key') do
fill_in 'Public key', with: pgp_key
@@ -102,8 +102,7 @@ class AccountLivecycleTest < BrowserIntegrationTest
# at some point we're done:
page.assert_no_selector 'input[value="Saving..."]'
assert page.has_field? 'Public key', with: pgp_key.to_s
- @user.reload
- assert_equal pgp_key, @user.public_key
+ assert_equal pgp_key, User.find_by_login(username).public_key
end
end