Commit 7569a4bd authored by Shinya Maeda's avatar Shinya Maeda

Fix EE specific tests

parent 18fa8041
...@@ -53,7 +53,7 @@ describe OperationsController do ...@@ -53,7 +53,7 @@ describe OperationsController do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:commit) { project.commit } let(:commit) { project.commit }
let!(:environment) { create(:environment, name: 'production', project: project) } let!(:environment) { create(:environment, name: 'production', project: project) }
let!(:deployment) { create(:deployment, environment: environment, sha: commit.id, created_at: now) } let!(:deployment) { create(:deployment, :success, environment: environment, sha: commit.id, created_at: now) }
it_behaves_like 'unlicensed', :get, :list it_behaves_like 'unlicensed', :get, :list
......
...@@ -82,7 +82,7 @@ describe Projects::EnvironmentsController do ...@@ -82,7 +82,7 @@ describe Projects::EnvironmentsController do
create(:cluster, :provided_by_gcp, create(:cluster, :provided_by_gcp,
environment_scope: '*', projects: [project]) environment_scope: '*', projects: [project])
create(:deployment, environment: environment) create(:deployment, :success, environment: environment)
allow_any_instance_of(EE::KubernetesService).to receive(:read_pod_logs).with(pod_name).and_return(kube_logs_body) allow_any_instance_of(EE::KubernetesService).to receive(:read_pod_logs).with(pod_name).and_return(kube_logs_body)
allow_any_instance_of(Gitlab::Kubernetes::RolloutStatus).to receive(:instances).and_return([{ pod_name: pod_name }]) allow_any_instance_of(Gitlab::Kubernetes::RolloutStatus).to receive(:instances).and_return([{ pod_name: pod_name }])
......
...@@ -28,6 +28,7 @@ describe 'Environments page', :js do ...@@ -28,6 +28,7 @@ describe 'Environments page', :js do
let!(:deployment) do let!(:deployment) do
create(:deployment, create(:deployment,
:success,
environment: environment, deployable: build, environment: environment, deployable: build,
sha: project.commit.id) sha: project.commit.id)
end end
...@@ -80,6 +81,7 @@ describe 'Environments page', :js do ...@@ -80,6 +81,7 @@ describe 'Environments page', :js do
let!(:deployment) do let!(:deployment) do
create(:deployment, create(:deployment,
:success,
environment: environment, deployable: build, environment: environment, deployable: build,
sha: project.commit.id) sha: project.commit.id)
end end
...@@ -110,6 +112,7 @@ describe 'Environments page', :js do ...@@ -110,6 +112,7 @@ describe 'Environments page', :js do
let!(:deployment) do let!(:deployment) do
create(:deployment, create(:deployment,
:success,
environment: environment, deployable: build, environment: environment, deployable: build,
sha: project.commit.id) sha: project.commit.id)
end end
...@@ -162,6 +165,7 @@ describe 'Environments page', :js do ...@@ -162,6 +165,7 @@ describe 'Environments page', :js do
let!(:deployment) do let!(:deployment) do
create(:deployment, create(:deployment,
:success,
environment: environment, deployable: build, environment: environment, deployable: build,
sha: project.commit.id) sha: project.commit.id)
end end
......
...@@ -14,7 +14,7 @@ describe 'Environment > Pod Logs', :js do ...@@ -14,7 +14,7 @@ describe 'Environment > Pod Logs', :js do
stub_licensed_features(pod_logs: true) stub_licensed_features(pod_logs: true)
create(:cluster, :provided_by_gcp, environment_scope: '*', projects: [project]) create(:cluster, :provided_by_gcp, environment_scope: '*', projects: [project])
create(:deployment, environment: environment) create(:deployment, :success, environment: environment)
allow_any_instance_of(EE::KubernetesService).to receive(:read_pod_logs).with(pod_name).and_return(kube_logs_body) allow_any_instance_of(EE::KubernetesService).to receive(:read_pod_logs).with(pod_name).and_return(kube_logs_body)
allow_any_instance_of(EE::Environment).to receive(:pod_names).and_return(pod_names) allow_any_instance_of(EE::Environment).to receive(:pod_names).and_return(pod_names)
......
...@@ -15,7 +15,7 @@ describe Environment do ...@@ -15,7 +15,7 @@ describe Environment do
it 'returns the pod_names' do it 'returns the pod_names' do
pod_name = "pod_1" pod_name = "pod_1"
create(:cluster, :provided_by_gcp, environment_scope: '*', projects: [project]) create(:cluster, :provided_by_gcp, environment_scope: '*', projects: [project])
create(:deployment, environment: environment) create(:deployment, :success, environment: environment)
allow_any_instance_of(Gitlab::Kubernetes::RolloutStatus).to receive(:instances) allow_any_instance_of(Gitlab::Kubernetes::RolloutStatus).to receive(:instances)
.and_return([{ pod_name: pod_name }]) .and_return([{ pod_name: pod_name }])
......
...@@ -43,10 +43,10 @@ describe Dashboard::Operations::ListService do ...@@ -43,10 +43,10 @@ describe Dashboard::Operations::ListService do
let(:staging) { create(:environment, project: project, name: 'staging') } let(:staging) { create(:environment, project: project, name: 'staging') }
let(:production_deployment) do let(:production_deployment) do
create(:deployment, project: project, environment: production, ref: 'master') create(:deployment, :success, project: project, environment: production, ref: 'master')
end end
let(:staging_deployment) do let(:staging_deployment) do
create(:deployment, project: project, environment: staging, ref: 'wip') create(:deployment, :success, project: project, environment: staging, ref: 'wip')
end end
before do before do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment