diff options
author | jessib <jessib@riseup.net> | 2013-12-02 11:56:04 -0800 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2013-12-02 11:56:04 -0800 |
commit | 2a2ffd46bf4e6009f2957fb4e4abdedbfa7e3245 (patch) | |
tree | 41dd790266aaa951dfa35889527f78015f8c4451 /users/test/integration/browser/account_test.rb | |
parent | 8e9b65b01bbd9d44d4077d94f2dc4ac375cf8e85 (diff) | |
parent | 8de6f143e53af5287b41913dcf3c7969f452fbc9 (diff) |
Merge branch 'develop' into feature/service_level
Diffstat (limited to 'users/test/integration/browser/account_test.rb')
-rw-r--r-- | users/test/integration/browser/account_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb index b349489..3d281ae 100644 --- a/users/test/integration/browser/account_test.rb +++ b/users/test/integration/browser/account_test.rb @@ -66,7 +66,7 @@ class AccountTest < BrowserIntegrationTest end test "change pgp key" do - pgp_key = "My PGP Key Stub" + pgp_key = FactoryGirl.build :pgp_key username, password = submit_signup click_on "Account Settings" within('#update_pgp_key') do @@ -76,7 +76,7 @@ class AccountTest < BrowserIntegrationTest page.assert_selector 'input[value="Saving..."]' # at some point we're done: page.assert_no_selector 'input[value="Saving..."]' - assert page.has_field? 'Public key', with: pgp_key + assert page.has_field? 'Public key', with: pgp_key.to_s user = User.find_by_login(username) assert_equal pgp_key, user.public_key user.account.destroy |