diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-20 18:10:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-20 18:10:40 +0300 |
commit | dd1e2632dff0318aae7bc9f12cdcb4b976b92d22 (patch) | |
tree | 16373b6b9f7fec56f8a4f71038d9a44693d09e3e /spec/factories | |
parent | cc541e8b2ef8331e3dcfaed8f0108ee6d08f56b9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/deploy_tokens.rb | 2 | ||||
-rw-r--r-- | spec/factories/integrations.rb | 6 | ||||
-rw-r--r-- | spec/factories/keys.rb | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/spec/factories/deploy_tokens.rb b/spec/factories/deploy_tokens.rb index 45e92869e22..379178f1a41 100644 --- a/spec/factories/deploy_tokens.rb +++ b/spec/factories/deploy_tokens.rb @@ -22,7 +22,7 @@ FactoryBot.define do end trait :expired do - expires_at { Date.today - 1.month } + expires_at { Date.current - 1.month } end trait :group do diff --git a/spec/factories/integrations.rb b/spec/factories/integrations.rb index 68751e68f05..74dfea585f2 100644 --- a/spec/factories/integrations.rb +++ b/spec/factories/integrations.rb @@ -168,12 +168,6 @@ FactoryBot.define do end end - factory :shimo_integration, class: 'Integrations::Shimo' do - project - active { true } - external_wiki_url { 'https://shimo.example.com/desktop' } - end - factory :confluence_integration, class: 'Integrations::Confluence' do project active { true } diff --git a/spec/factories/keys.rb b/spec/factories/keys.rb index 4bd41c1faa1..2cfe1372200 100644 --- a/spec/factories/keys.rb +++ b/spec/factories/keys.rb @@ -17,7 +17,7 @@ FactoryBot.define do trait :expired_today do to_create { |key| key.save!(validate: false) } - expires_at { Date.today.beginning_of_day + 3.hours } + expires_at { Date.current.beginning_of_day + 3.hours } end trait :without_md5_fingerprint do |