diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-11-28 03:06:38 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-28 20:47:59 +0900 |
commit | 7277b3b32c2afd26a033ecf81b93319efb65861d (patch) | |
tree | 1529b1681fd8fc35254ce4a13baf56200067ec69 | |
parent | b4c4e1bd6ea3c8c12540d50f0bf11e04d72d114b (diff) | |
download | gitlab-ce-7277b3b32c2afd26a033ecf81b93319efb65861d.tar.gz |
Fix feature spec38668-revert-copied-kubernetesservice-logic
-rw-r--r-- | app/models/project.rb | 1 | ||||
-rw-r--r-- | spec/features/auto_deploy_spec.rb | 10 | ||||
-rw-r--r-- | spec/features/projects/environments/environments_spec.rb | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 95aabc4ad45..027c437d7da 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -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) diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb index 453b31e0d77..7a395f62511 100644 --- a/spec/features/auto_deploy_spec.rb +++ b/spec/features/auto_deploy_spec.rb @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb index 911486e534a..4a05313c14a 100644 --- a/spec/features/projects/environments/environments_spec.rb +++ b/spec/features/projects/environments/environments_spec.rb @@ -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' |