Skip to content
Snippets Groups Projects
Commit 7277b3b3 authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Fix feature spec

parent b4c4e1bd
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -903,7 +903,6 @@ class Project < ActiveRecord::Base
end
 
# TODO: This will be extended for multiple enviroment clusters
# TODO: Add super nice tests to check this interchangeability
def deployment_platform
@deployment_platform ||= clusters.find_by(enabled: true)&.platform_kubernetes
@deployment_platform ||= services.where(category: :deployment).reorder(nil).find_by(active: true)
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@ describe 'Auto deploy' do
shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
context 'when no deployment service is active' do
before do
project.kubernetes_service.update!(active: false)
trun_off
end
 
it 'does not show a button to set up auto deploy' do
Loading
Loading
@@ -18,7 +18,7 @@ describe 'Auto deploy' do
 
context 'when a deployment service is active' do
before do
project.kubernetes_service.update!(active: true)
trun_on
visit project_path(project)
end
 
Loading
Loading
@@ -56,6 +56,9 @@ describe 'Auto deploy' do
sign_in user
end
 
let(:trun_on) { project.deployment_platform.update!(active: true) }
let(:trun_off) { project.deployment_platform.update!(active: false) }
it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
end
 
Loading
Loading
@@ -66,6 +69,9 @@ describe 'Auto deploy' do
sign_in user
end
 
let(:trun_on) { project.deployment_platform.cluster.update!(enabled: true) }
let(:trun_off) { project.deployment_platform.cluster.update!(enabled: false) }
it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
end
end
Loading
Loading
@@ -233,7 +233,7 @@ feature 'Environments page', :js do
end
 
context 'when user configured kubernetes from CI/CD > Clusters' do
let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
let(:cluster) { create(:cluster, :provided_by_gcp, projects: [create(:project, :repository)]) }
let(:project) { cluster.project }
 
it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment