diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-14 21:08:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-14 21:08:53 +0300 |
commit | 5b62f8e3ee531f63ce3c49cae03e2a618ba51615 (patch) | |
tree | 2d2553232fe0663957ee4d1054211cc71cb07679 /spec/serializers | |
parent | cdb41961fd2bc233d36c5b30f89d087c2efa9818 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb | 1 | ||||
-rw-r--r-- | spec/serializers/deploy_keys/deploy_key_entity_spec.rb | 1 | ||||
-rw-r--r-- | spec/serializers/group_deploy_key_entity_spec.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb b/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb index 7ea72351594..7df6413f416 100644 --- a/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb +++ b/spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb @@ -29,6 +29,7 @@ RSpec.describe DeployKeys::BasicDeployKeyEntity do destroyed_when_orphaned: true, almost_orphaned: false, created_at: deploy_key.created_at, + expires_at: deploy_key.expires_at, updated_at: deploy_key.updated_at, can_edit: false } diff --git a/spec/serializers/deploy_keys/deploy_key_entity_spec.rb b/spec/serializers/deploy_keys/deploy_key_entity_spec.rb index 4302ed3a097..837e30e1343 100644 --- a/spec/serializers/deploy_keys/deploy_key_entity_spec.rb +++ b/spec/serializers/deploy_keys/deploy_key_entity_spec.rb @@ -29,6 +29,7 @@ RSpec.describe DeployKeys::DeployKeyEntity do destroyed_when_orphaned: true, almost_orphaned: false, created_at: deploy_key.created_at, + expires_at: deploy_key.expires_at, updated_at: deploy_key.updated_at, can_edit: false, deploy_keys_projects: [ diff --git a/spec/serializers/group_deploy_key_entity_spec.rb b/spec/serializers/group_deploy_key_entity_spec.rb index e6cef2f10b3..c502923db6a 100644 --- a/spec/serializers/group_deploy_key_entity_spec.rb +++ b/spec/serializers/group_deploy_key_entity_spec.rb @@ -25,6 +25,7 @@ RSpec.describe GroupDeployKeyEntity do fingerprint: group_deploy_key.fingerprint, fingerprint_sha256: group_deploy_key.fingerprint_sha256, created_at: group_deploy_key.created_at, + expires_at: group_deploy_key.expires_at, updated_at: group_deploy_key.updated_at, can_edit: false, group_deploy_keys_groups: [ |