diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 21:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 21:09:34 +0300 |
| commit | 141902c04943d5fb43c014b8cf42af60a3bc0cdf (patch) | |
| tree | 7e5a31fe9b0434fa0071cb5d09273669c3a8acab /spec/support | |
| parent | 209bd8cf1f542f6ba2a069b368a9187faa871e96 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/helpers/usage_data_helpers.rb | 3 | ||||
| -rw-r--r-- | spec/support/shared_examples/models/concerns/blob_replicator_strategy_shared_examples.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/support/helpers/usage_data_helpers.rb b/spec/support/helpers/usage_data_helpers.rb index 4d63cf12575..eff252ddda0 100644 --- a/spec/support/helpers/usage_data_helpers.rb +++ b/spec/support/helpers/usage_data_helpers.rb @@ -43,9 +43,11 @@ module UsageDataHelpers clusters_enabled project_clusters_enabled group_clusters_enabled + instance_clusters_enabled clusters_disabled project_clusters_disabled group_clusters_disabled + instance_clusters_disabled clusters_platforms_eks clusters_platforms_gke clusters_platforms_user @@ -58,6 +60,7 @@ module UsageDataHelpers clusters_applications_knative clusters_applications_elastic_stack clusters_applications_jupyter + clusters_management_project in_review_folder grafana_integrated_projects groups diff --git a/spec/support/shared_examples/models/concerns/blob_replicator_strategy_shared_examples.rb b/spec/support/shared_examples/models/concerns/blob_replicator_strategy_shared_examples.rb index 62b1b5791dc..8372ee9ac4a 100644 --- a/spec/support/shared_examples/models/concerns/blob_replicator_strategy_shared_examples.rb +++ b/spec/support/shared_examples/models/concerns/blob_replicator_strategy_shared_examples.rb @@ -52,6 +52,7 @@ RSpec.shared_examples 'a blob replicator' do replicator.calculate_checksum! expect(model_record.reload.verification_checksum).not_to be_nil + expect(model_record.reload.verified_at).not_to be_nil end it 'saves the error message and increments retry counter' do |