diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-21 06:07:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-21 06:07:37 +0300 |
commit | bc3e57199e52e45799cb4d47ee2630af40d1edc3 (patch) | |
tree | ecf9aab2b81f91f857d4d116fbf4448675c7a2d8 /spec/finders | |
parent | bb348db4c22bf58ac685fcd66445ac172491b302 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/finders')
-rw-r--r-- | spec/finders/clusters/knative_services_finder_spec.rb | 4 | ||||
-rw-r--r-- | spec/finders/deployments_finder_spec.rb | 4 | ||||
-rw-r--r-- | spec/finders/projects/serverless/functions_finder_spec.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/finders/clusters/knative_services_finder_spec.rb b/spec/finders/clusters/knative_services_finder_spec.rb index 7ad64cc3bca..57dbead7921 100644 --- a/spec/finders/clusters/knative_services_finder_spec.rb +++ b/spec/finders/clusters/knative_services_finder_spec.rb @@ -6,9 +6,9 @@ describe Clusters::KnativeServicesFinder do include KubernetesHelpers include ReactiveCachingHelpers - let(:cluster) { create(:cluster, :project, :provided_by_gcp) } + let(:project) { create(:project, :repository) } + let(:cluster) { create(:cluster, :project, :provided_by_gcp, projects: [project]) } let(:service) { environment.deployment_platform } - let(:project) { cluster.cluster_project.project } let(:environment) { create(:environment, project: project) } let!(:deployment) { create(:deployment, :success, environment: environment, cluster: cluster) } let(:namespace) do diff --git a/spec/finders/deployments_finder_spec.rb b/spec/finders/deployments_finder_spec.rb index be35a705b0d..2dcbd5ba8ea 100644 --- a/spec/finders/deployments_finder_spec.rb +++ b/spec/finders/deployments_finder_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' describe DeploymentsFinder do subject { described_class.new(project, params).execute } - let(:project) { create(:project, :public, :repository) } + let(:project) { create(:project, :public, :test_repo) } let(:params) { {} } describe "#execute" do @@ -34,7 +34,7 @@ describe DeploymentsFinder do let!(:deployment_1) { create(:deployment, :success, project: project, iid: 11, ref: 'master', created_at: 2.days.ago, updated_at: Time.now) } let!(:deployment_2) { create(:deployment, :success, project: project, iid: 12, ref: 'feature', created_at: 1.day.ago, updated_at: 2.hours.ago) } - let!(:deployment_3) { create(:deployment, :success, project: project, iid: 8, ref: 'patch', created_at: Time.now, updated_at: 1.hour.ago) } + let!(:deployment_3) { create(:deployment, :success, project: project, iid: 8, ref: 'video', created_at: Time.now, updated_at: 1.hour.ago) } where(:order_by, :sort, :ordered_deployments) do 'created_at' | 'asc' | [:deployment_1, :deployment_2, :deployment_3] diff --git a/spec/finders/projects/serverless/functions_finder_spec.rb b/spec/finders/projects/serverless/functions_finder_spec.rb index 589e4000d46..dcf1b2045ab 100644 --- a/spec/finders/projects/serverless/functions_finder_spec.rb +++ b/spec/finders/projects/serverless/functions_finder_spec.rb @@ -8,9 +8,9 @@ describe Projects::Serverless::FunctionsFinder do include ReactiveCachingHelpers let(:user) { create(:user) } - let(:cluster) { create(:cluster, :project, :provided_by_gcp) } + let(:project) { create(:project, :repository) } + let(:cluster) { create(:cluster, :project, :provided_by_gcp, projects: [project]) } let(:service) { cluster.platform_kubernetes } - let(:project) { cluster.project } let(:environment) { create(:environment, project: project) } let!(:deployment) { create(:deployment, :success, environment: environment, cluster: cluster) } let(:knative_services_finder) { environment.knative_services_finder } |