diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 00:09:04 +0000 |
| commit | 27a18afc7dba4e09a5ec78e5c251c31216d7792a (patch) | |
| tree | 5dcc015be79e00de4133a66defe10bf1463ff827 /spec/support | |
| parent | 71c9d577ad563572050335dc261ba7673e3e566f (diff) | |
| download | gitlab-ce-27a18afc7dba4e09a5ec78e5c251c31216d7792a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/helpers/kubernetes_helpers.rb | 9 | ||||
| -rw-r--r-- | spec/support/shared_contexts/sentry_error_tracking_shared_context.rb | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/spec/support/helpers/kubernetes_helpers.rb b/spec/support/helpers/kubernetes_helpers.rb index 8e5042e2ad3..0d312575e91 100644 --- a/spec/support/helpers/kubernetes_helpers.rb +++ b/spec/support/helpers/kubernetes_helpers.rb @@ -494,7 +494,7 @@ module KubernetesHelpers "metadata" => { "name" => name, "namespace" => namespace, - "generate_name" => "generated-name-with-suffix", + "generateName" => "generated-name-with-suffix", "creationTimestamp" => "2016-11-25T19:55:19Z", "annotations" => { "app.gitlab.com/env" => environment_slug, @@ -520,7 +520,7 @@ module KubernetesHelpers "metadata" => { "name" => name, "namespace" => namespace, - "generate_name" => "generated-name-with-suffix", + "generateName" => "generated-name-with-suffix", "creationTimestamp" => "2016-11-25T19:55:19Z", "labels" => { "serving.knative.dev/service" => name @@ -551,10 +551,7 @@ module KubernetesHelpers }, "spec" => { "replicas" => 3 }, "status" => { - "observedGeneration" => 4, - "replicas" => 3, - "updatedReplicas" => 3, - "availableReplicas" => 3 + "observedGeneration" => 4 } } end diff --git a/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb b/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb index ba729f21e58..ee678580fb9 100644 --- a/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb +++ b/spec/support/shared_contexts/sentry_error_tracking_shared_context.rb @@ -6,9 +6,10 @@ shared_context 'sentry error tracking context' do let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0/projects/sentry-org/sentry-project' } let(:token) { 'test-token' } + let(:params) { {} } let(:result) { subject.execute } - subject { described_class.new(project, user) } + subject { described_class.new(project, user, params) } let(:error_tracking_setting) do create(:project_error_tracking_setting, api_url: sentry_url, token: token, project: project) |