summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2017-04-20 15:59:18 +0200
committerAzul <azul@riseup.net>2017-04-20 15:59:18 +0200
commit653f92e6ac5c0b61e8113665735d929426deb714 (patch)
treebd79d0b810377cc25b668aded2fd5cdd053c4d11 /test/integration
parentdaa9b1ed04417c8ead2558a1c616d0321c085790 (diff)
fix: set token in forms correctly
We now use the hash of the token for comparison and as the id. In order to use it you need the original token though. So forms and thus the session should have token.to_s rather than token.id.
Diffstat (limited to 'test/integration')
-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