Merge branch 'remove_make_updated_cluster_applications' into 'master'
Remove #make_updated! as have #make_installed! now Closes #57374 See merge request gitlab-org/gitlab-ce!24988
This commit is contained in:
commit
4135d8935c
|
@ -41,11 +41,6 @@ module Clusters
|
||||||
transition [:installed, :updated, :update_errored, :scheduled] => :updating
|
transition [:installed, :updated, :update_errored, :scheduled] => :updating
|
||||||
end
|
end
|
||||||
|
|
||||||
# Deprecated
|
|
||||||
event :make_updated do
|
|
||||||
transition [:updating] => :updated
|
|
||||||
end
|
|
||||||
|
|
||||||
event :make_update_errored do
|
event :make_update_errored do
|
||||||
transition any => :update_errored
|
transition any => :update_errored
|
||||||
end
|
end
|
||||||
|
|
|
@ -80,36 +80,6 @@ shared_examples 'cluster application status specs' do |application_name|
|
||||||
end
|
end
|
||||||
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
|
describe '#make_errored' do
|
||||||
subject { create(application_name, :installing) }
|
subject { create(application_name, :installing) }
|
||||||
let(:reason) { 'some errors' }
|
let(:reason) { 'some errors' }
|
||||||
|
|
Loading…
Reference in New Issue