FactoryGirl => FactoryBot (opf/openproject#6304)

opf · May 7, 2018 · f3b8db6 · f3b8db6
1 parent 7962aa8
commit f3b8db6
Show file tree

Hide file tree

Showing 26 changed files with 77 additions and 77 deletions.
diff --git a/spec/controllers/two_factor_authentication/authentication_controller_spec.rb b/spec/controllers/two_factor_authentication/authentication_controller_spec.rb
@@ -5,7 +5,7 @@
   let(:valid_credentials) do
     { username: 'foobar', password: 'AAA1111!!!!' }
   end
-  let(:user) { FactoryGirl.create(:user, login: 'foobar', password: 'AAA1111!!!!', password_confirmation: 'AAA1111!!!!') }
+  let(:user) { FactoryBot.create(:user, login: 'foobar', password: 'AAA1111!!!!', password_confirmation: 'AAA1111!!!!') }
 
   before do
     # Assume the user has any memberships
@@ -59,7 +59,7 @@
     end
 
     context 'with a non-default device' do
-      let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, default: false, channel: :sms }
+      let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, default: false, channel: :sms }
 
       before do
         session[:authenticated_user_id] = user.id
@@ -71,24 +71,24 @@
     end
 
     context 'with an invalid device' do
-      let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, channel: :totp }
+      let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, channel: :totp }
       it_behaves_like '2FA login request failure', I18n.t('two_factor_authentication.error_no_matching_strategy')
     end
 
     context 'with an active device' do
-      let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, channel: :sms }
+      let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, channel: :sms }
       it_behaves_like '2FA SMS request success'
     end
   end
 
   describe 'with two active strategy', with_config: { '2fa' => { active_strategies: [:developer, :totp] } } do
     context 'with a totp device' do
-      let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, channel: :totp }
+      let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, channel: :totp }
       it_behaves_like '2FA TOTP request success'
     end
 
     context 'with an sms device' do
-      let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, channel: :sms }
+      let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, channel: :sms }
       it_behaves_like '2FA SMS request success'
     end
   end

diff --git a/...llers/two_factor_authentication/forced_registration/two_factor_devices_controller_spec.rb b/...llers/two_factor_authentication/forced_registration/two_factor_devices_controller_spec.rb
@@ -2,7 +2,7 @@
 require_relative './../authentication_controller_shared_examples'
 
 describe ::TwoFactorAuthentication::ForcedRegistration::TwoFactorDevicesController, with_2fa_ee: true do
-  let(:user) { FactoryGirl.create(:user, login: 'foobar') }
+  let(:user) { FactoryBot.create(:user, login: 'foobar') }
   let(:logged_in_user) { User.anonymous }
   let(:active_strategies) { [] }
   let(:config) { {} }
@@ -134,7 +134,7 @@
 
         describe 'and registered totp device' do
           let(:active_strategies) { [:totp] }
-          let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, active: false, default: false}
+          let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, active: false, default: false}
 
           it 'renders the confirmation page' do
             get :confirm, params: { device_id: device.id }
@@ -145,7 +145,7 @@
         end
 
         describe 'with registered device' do
-          let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, active: false, default: false}
+          let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, active: false, default: false}
 
           it 'renders the confirmation page' do
             get :confirm, params: { device_id: device.id }
@@ -173,7 +173,7 @@
 
         describe 'and registered totp device' do
           let(:active_strategies) { [:totp] }
-          let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, active: false, default: false}
+          let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, active: false, default: false}
 
           it 'renders a 400 on missing token' do
             post :confirm, params: { device_id: device.id }

diff --git a/spec/controllers/two_factor_authentication/my/remember_cookie_controller.rb b/spec/controllers/two_factor_authentication/my/remember_cookie_controller.rb
@@ -2,7 +2,7 @@
 require_relative './../authentication_controller_shared_examples'
 
 describe ::TwoFactorAuthentication::My::RememberCookieController do
-  let(:user) { FactoryGirl.create(:user, login: 'foobar') }
+  let(:user) { FactoryBot.create(:user, login: 'foobar') }
   let(:logged_in_user) { user }
 
   before do

diff --git a/spec/controllers/two_factor_authentication/my/two_factor_devices_controller_spec.rb b/spec/controllers/two_factor_authentication/my/two_factor_devices_controller_spec.rb
@@ -2,8 +2,8 @@
 require_relative './../authentication_controller_shared_examples'
 
 describe ::TwoFactorAuthentication::My::TwoFactorDevicesController, with_2fa_ee: true do
-  let(:user) { FactoryGirl.create(:user, login: 'foobar') }
-  let(:other_user) { FactoryGirl.create(:user) }
+  let(:user) { FactoryBot.create(:user, login: 'foobar') }
+  let(:other_user) { FactoryBot.create(:user) }
   let(:logged_in_user) { user }
   let(:active_strategies) { [] }
   let(:config) { {} }
@@ -115,7 +115,7 @@
 
         describe 'and registered totp device' do
           let(:active_strategies) { [:totp] }
-          let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, active: false, default: false}
+          let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, active: false, default: false}
 
           it 'renders the confirmation page' do
             get :confirm, params: { device_id: device.id }
@@ -126,7 +126,7 @@
         end
 
         describe 'with registered device' do
-          let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, active: false, default: false}
+          let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, active: false, default: false}
 
           it 'renders the confirmation page' do
             get :confirm, params: { device_id: device.id }
@@ -154,7 +154,7 @@
 
         describe 'and registered totp device' do
           let(:active_strategies) { [:totp] }
-          let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, active: false, default: false}
+          let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, active: false, default: false}
 
           it 'renders a 400 on missing token' do
             post :confirm, params: { device_id: device.id }
@@ -187,7 +187,7 @@
           end
 
           context 'with another default device present' do
-            let!(:default_device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, default: true}
+            let!(:default_device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, default: true}
 
             it 'activates the device when entered correctly' do
               allow_any_instance_of(::TwoFactorAuthentication::TokenService)
@@ -220,7 +220,7 @@
         end
 
         context 'with existing non-default device' do
-          let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, default: false}
+          let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, default: false}
 
           it 'deletes it' do
             delete :destroy, params: { device_id: device.id }
@@ -230,7 +230,7 @@
         end
 
         context 'with existing default device' do
-          let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, default: true}
+          let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, default: true}
 
           it 'deletes it' do
             delete :destroy, params: { device_id: device.id }
@@ -240,7 +240,7 @@
         end
 
         context 'with existing default device AND enforced' do
-          let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, default: true}
+          let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, default: true}
           let(:config) { { enforced: true } }
 
           it 'cannot be deleted' do

diff --git a/spec/controllers/two_factor_authentication/users/two_factor_devices_controller_spec.rb b/spec/controllers/two_factor_authentication/users/two_factor_devices_controller_spec.rb
@@ -2,9 +2,9 @@
 require_relative './../authentication_controller_shared_examples'
 
 describe ::TwoFactorAuthentication::Users::TwoFactorDevicesController, with_2fa_ee: true do
-  let(:admin) { FactoryGirl.create :admin }
-  let(:user) { FactoryGirl.create(:user, login: 'foobar') }
-  let(:other_user) { FactoryGirl.create(:user) }
+  let(:admin) { FactoryBot.create :admin }
+  let(:user) { FactoryBot.create(:user, login: 'foobar') }
+  let(:other_user) { FactoryBot.create(:user) }
   let(:logged_in_user) { admin }
   let(:active_strategies) { [:developer] }
   let(:config) { {} }
@@ -123,7 +123,7 @@
       end
 
       context 'with existing non-default device' do
-        let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, default: false}
+        let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, default: false}
 
         it 'deletes it' do
           delete :destroy, params: { id: user.id, device_id: device.id }
@@ -133,7 +133,7 @@
       end
 
       context 'with existing default device' do
-        let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, default: true}
+        let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, default: true}
 
         it 'deletes it' do
           delete :destroy, params: { id: user.id, device_id: device.id }
@@ -143,7 +143,7 @@
       end
 
       context 'with existing default device AND enforced' do
-        let!(:device) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, default: true}
+        let!(:device) { FactoryBot.create :two_factor_authentication_device_totp, user: user, default: true}
         let(:config) { { enforced: true } }
 
         it 'cannot be deleted' do

diff --git a/spec/factories/two_factor_authentication_device_factory.rb b/spec/factories/two_factor_authentication_device_factory.rb
@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :two_factor_authentication_device_sms, class: ::TwoFactorAuthentication::Device::Sms do
     user
     channel :sms
@@ -17,7 +17,7 @@
   end
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :two_factor_authentication_device_totp, class: ::TwoFactorAuthentication::Device::Totp do
     user
     channel :totp

diff --git a/spec/features/account_activation_spec.rb b/spec/features/account_activation_spec.rb
@@ -7,7 +7,7 @@
          js: true,
          with_config: {:'2fa' => {active_strategies: [:developer]}} do
   let(:user) {
-    user = FactoryGirl.build :user, first_login: true
+    user = FactoryBot.build :user, first_login: true
     UserInvitation.invite_user! user
 
     user
@@ -38,7 +38,7 @@ def activate!
   end
 
   context 'when not enforced, but device present' do
-    let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, default: true}
+    let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, default: true}
 
     it 'requests a OTP' do
       sms_token = nil

diff --git a/spec/features/admin_edit_two_factor_devices_spec.rb b/spec/features/admin_edit_two_factor_devices_spec.rb
@@ -5,9 +5,9 @@
          js: true do
   let(:dialog) { ::Components::PasswordConfirmationDialog.new }
   let(:user_password) {'admin!' * 4}
-  let(:other_user) { FactoryGirl.create :user, login: 'bob' }
+  let(:other_user) { FactoryBot.create :user, login: 'bob' }
   let(:admin) do
-    FactoryGirl.create(:admin,
+    FactoryBot.create(:admin,
                        password: user_password,
                        password_confirmation: user_password,
     )
@@ -62,8 +62,8 @@
   end
 
   context 'with multiple devices registered' do
-    let!(:device1) { FactoryGirl.create :two_factor_authentication_device_sms, user: other_user }
-    let!(:device2) { FactoryGirl.create :two_factor_authentication_device_totp, user: other_user, default: false }
+    let!(:device1) { FactoryBot.create :two_factor_authentication_device_sms, user: other_user }
+    let!(:device2) { FactoryBot.create :two_factor_authentication_device_totp, user: other_user, default: false }
 
     it 'allows to delete all' do
       visit edit_user_path(other_user, tab: :two_factor_authentication)

diff --git a/spec/features/backup_codes/generate_backup_codes.rb b/spec/features/backup_codes/generate_backup_codes.rb
@@ -6,7 +6,7 @@
          js: true do
   let(:user_password) {'bob!' * 4}
   let(:user) do
-    FactoryGirl.create(:user,
+    FactoryBot.create(:user,
                        login: 'bob',
                        password: user_password,
                        password_confirmation: user_password,

diff --git a/spec/features/backup_codes/login_with_backup_code_spec.rb b/spec/features/backup_codes/login_with_backup_code_spec.rb
@@ -6,13 +6,13 @@
          js: true do
   let(:user_password) {'bob!' * 4}
   let(:user) do
-    FactoryGirl.create(:user,
+    FactoryBot.create(:user,
                        login: 'bob',
                        password: user_password,
                        password_confirmation: user_password,
     )
   end
-  let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, active: true, default: true}
+  let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, active: true, default: true}
 
   context 'user has no backup code' do
     it 'does not show the backup code link' do

diff --git a/spec/features/login/login_enforced_2fa_spec.rb b/spec/features/login/login_enforced_2fa_spec.rb
@@ -6,15 +6,15 @@
          js: true do
   let(:user_password) {'bob!' * 4}
   let(:user) do
-    FactoryGirl.create(:user,
+    FactoryBot.create(:user,
                        login: 'bob',
                        password: user_password,
                        password_confirmation: user_password,
     )
   end
 
   context 'with a default device' do
-    let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, active: true, default: true}
+    let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, active: true, default: true}
 
     it 'requests a 2FA' do
       sms_token = nil

diff --git a/spec/features/login/login_with_2fa_spec.rb b/spec/features/login/login_with_2fa_spec.rb
@@ -6,15 +6,15 @@
          js: true do
   let(:user_password) {'bob!' * 4}
   let(:user) do
-    FactoryGirl.create(:user,
+    FactoryBot.create(:user,
                        login: 'bob',
                        password: user_password,
                        password_confirmation: user_password,
     )
   end
 
   context 'with a default device' do
-    let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, active: true, default: true}
+    let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, active: true, default: true}
 
     it 'requests a 2FA' do
       sms_token = nil

diff --git a/spec/features/login/login_without_2fa_spec.rb b/spec/features/login/login_without_2fa_spec.rb
@@ -6,15 +6,15 @@
          js: true do
   let(:user_password) {'bob!' * 4}
   let(:user) do
-    FactoryGirl.create(:user,
+    FactoryBot.create(:user,
                        login: 'bob',
                        password: user_password,
                        password_confirmation: user_password,
     )
   end
 
   context 'non-default device' do
-    let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, active: true, default: false}
+    let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, active: true, default: false}
 
     it_behaves_like 'login without 2FA'
   end

diff --git a/spec/features/login/switch_available_devices_spec.rb b/spec/features/login/switch_available_devices_spec.rb
@@ -6,16 +6,16 @@
          js: true do
   let(:user_password) {'bob!' * 4}
   let(:user) do
-    FactoryGirl.create(:user,
+    FactoryBot.create(:user,
                        login: 'bob',
                        password: user_password,
                        password_confirmation: user_password,
     )
   end
 
   context 'with two default device' do
-    let!(:device) { FactoryGirl.create :two_factor_authentication_device_sms, user: user, active: true, default: true}
-    let!(:device2) { FactoryGirl.create :two_factor_authentication_device_totp, user: user, active: true, default: false}
+    let!(:device) { FactoryBot.create :two_factor_authentication_device_sms, user: user, active: true, default: true}
+    let!(:device2) { FactoryBot.create :two_factor_authentication_device_totp, user: user, active: true, default: false}
 
     it 'requests a 2FA and allows switching' do
       first_login_step

diff --git a/spec/features/my_two_factor_devices_spec.rb b/spec/features/my_two_factor_devices_spec.rb
@@ -6,7 +6,7 @@
   let(:dialog) { ::Components::PasswordConfirmationDialog.new }
   let(:user_password) {'bob!' * 4}
   let(:user) do
-    FactoryGirl.create(:user,
+    FactoryBot.create(:user,
                        login: 'bob',
                        password: user_password,
                        password_confirmation: user_password,