summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/api/pgp_key_test.rb2
-rw-r--r--test/integration/browser/account_livecycle_test.rb2
-rw-r--r--test/integration/browser/admin_test.rb2
-rw-r--r--test/integration/browser/security_test.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/api/pgp_key_test.rb b/test/integration/api/pgp_key_test.rb
index f2744e1..1ffbe54 100644
--- a/test/integration/api/pgp_key_test.rb
+++ b/test/integration/api/pgp_key_test.rb
@@ -30,7 +30,7 @@ class PgpKeyTest < SrpTest
protected
def key
- @key ||= FactoryGirl.build :pgp_key
+ @key ||= FactoryBot.build :pgp_key
end
def assert_invalid_key_response
diff --git a/test/integration/browser/account_livecycle_test.rb b/test/integration/browser/account_livecycle_test.rb
index 68775d3..48be234 100644
--- a/test/integration/browser/account_livecycle_test.rb
+++ b/test/integration/browser/account_livecycle_test.rb
@@ -103,7 +103,7 @@ class AccountLivecycleTest < BrowserIntegrationTest
test "change pgp key" do
with_config user_actions: ['change_pgp_key'] do
- pgp_key = FactoryGirl.build :pgp_key
+ pgp_key = FactoryBot.build :pgp_key
username, _password = submit_signup
click_on "Account Settings"
within('#update_pgp_key') do
diff --git a/test/integration/browser/admin_test.rb b/test/integration/browser/admin_test.rb
index 0b43c29..ff36416 100644
--- a/test/integration/browser/admin_test.rb
+++ b/test/integration/browser/admin_test.rb
@@ -21,7 +21,7 @@ class AdminTest < BrowserIntegrationTest
end
test "clear blocked handle" do
- id = FactoryGirl.create :identity
+ id = FactoryBot.create :identity
submit_signup(id.login)
assert page.has_content?('has already been taken')
login
diff --git a/test/integration/browser/security_test.rb b/test/integration/browser/security_test.rb
index 825d50b..7073b76 100644
--- a/test/integration/browser/security_test.rb
+++ b/test/integration/browser/security_test.rb
@@ -10,7 +10,7 @@ class SecurityTest < BrowserIntegrationTest
test "detects attempt to circumvent SRP" do
InviteCodeValidator.any_instance.stubs(:validate)
- user = FactoryGirl.create :user
+ user = FactoryBot.create :user
visit '/login'
fill_in 'Username', with: user.login
fill_in 'Password', with: "password"