diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-08 16:41:54 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-08 16:41:54 +0300 |
commit | 4135d8935c2fc7f920549a481834e8f1b5198be4 (patch) | |
tree | 11c4c58f21e3bac56cf712f5cf876acfd8953418 | |
parent | 7444d7e4b3a5bf217f4e0041e4a80c63da1a645e (diff) | |
parent | 650d4f37fb4e2a193cd0ca3d31c2404df016f1d1 (diff) |
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
-rw-r--r-- | app/models/clusters/concerns/application_status.rb | 5 | ||||
-rw-r--r-- | spec/support/shared_examples/models/cluster_application_status_shared_examples.rb | 30 |
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' } |