summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-02-07 15:00:01 +1300
committerThong Kuah <tkuah@gitlab.com>2019-02-08 11:56:35 +1300
commit650d4f37fb4e2a193cd0ca3d31c2404df016f1d1 (patch)
tree0d444381c3ac0ad53e7a1f510c96cc06009d69fa
parent045dcdc2f61372f95d9fd71072f5d31b88e1a12b (diff)
downloadgitlab-ce-remove_make_updated_cluster_applications.tar.gz
Remove #make_updated! as have #make_installed! nowremove_make_updated_cluster_applications
We can have multiple and conditional transistions in a event, so make use of that.
-rw-r--r--app/models/clusters/concerns/application_status.rb5
-rw-r--r--spec/support/shared_examples/models/cluster_application_status_shared_examples.rb30
2 files changed, 0 insertions, 35 deletions
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index 6fe7b4a6bd7..5c0164831bc 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -41,11 +41,6 @@ module Clusters
transition [:installed, :updated, :update_errored, :scheduled] => :updating
end
- # Deprecated
- event :make_updated do
- transition [:updating] => :updated
- end
-
event :make_update_errored do
transition any => :update_errored
end
diff --git a/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb b/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb
index 0b19b50fdfc..c96a65cb56a 100644
--- a/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb
+++ b/spec/support/shared_examples/models/cluster_application_status_shared_examples.rb
@@ -80,36 +80,6 @@ shared_examples 'cluster application status specs' do |application_name|
end
end
- describe '#make_updated' do
- subject { create(application_name, :updating) }
-
- it 'is updated' do
- subject.make_updated!
-
- expect(subject).to be_updated
- end
-
- it 'updates helm version' do
- subject.cluster.application_helm.update!(version: '1.2.3')
-
- subject.make_updated!
-
- subject.cluster.application_helm.reload
-
- expect(subject.cluster.application_helm.version).to eq(Gitlab::Kubernetes::Helm::HELM_VERSION)
- end
-
- it 'updates the version for the application' do
- subject.update!(version: '0.0.0')
-
- subject.make_updated!
-
- subject.reload
-
- expect(subject.version).to eq(subject.class.const_get(:VERSION))
- end
- end
-
describe '#make_errored' do
subject { create(application_name, :installing) }
let(:reason) { 'some errors' }