Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump factory_bot_rails from 6.2.0 to 6.4.0 #2533

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Bump factory_bot_rails from 6.2.0 to 6.4.0 #2533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
661de4d
Bump factory_bot_rails from 6.2.0 to 6.4.0
dependabot[bot] Nov 22, 2023
ee01a1b
Move with_expired_confirmation_token trait into user factory
chrisroos Nov 22, 2023
f39dfd2
Move in_organisation trait into user factory
chrisroos Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ GEM
railties (>= 5)
erubi (1.12.0)
execjs (2.9.1)
factory_bot (6.2.1)
factory_bot (6.4.1)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
factory_bot_rails (6.4.0)
factory_bot (~> 6.4)
railties (>= 5.0.0)
ffi (1.16.3)
ffi-compiler (1.0.1)
Expand Down
18 changes: 9 additions & 9 deletions test/factories/users.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@
user.grant_application_signin_permission(app)
end
end

trait :with_expired_confirmation_token do
confirmation_token { "expired-token" }
confirmation_sent_at { Devise.confirm_within.ago - 1.day }
end

trait :in_organisation do
association :organisation, factory: :organisation
end
end

factory :two_step_enabled_user, parent: :user do
Expand Down Expand Up @@ -65,11 +74,6 @@
confirmation_sent_at { Time.zone.now }
end

trait :with_expired_confirmation_token do
confirmation_token { "expired-token" }
confirmation_sent_at { Devise.confirm_within.ago - 1.day }
end

factory :superadmin_user, parent: :user do
sequence(:email) { |n| "superadmin#{n}@example.com" }
role { Roles::Superadmin.role_name }
Expand Down Expand Up @@ -106,10 +110,6 @@
locked_at { Time.zone.now }
end

trait :in_organisation do
association :organisation, factory: :organisation
end

factory :user_in_organisation, parent: :user, traits: [:in_organisation]

factory :api_user do
Expand Down