Give removing status priority on cluster status_name

2 files changed, 9 insertions, 9 deletions

diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index b1d10d6e402..43462e4bf4d 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -120,7 +120,7 @@ module Clusters
     end
 
     def status_name
-      provider&.status_name || connection_status.presence || removing_status || :created
+      removing_status || provider&.status_name || connection_status.presence || :created
     end
 
     def connection_status
diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb
index 2875a55f749..ec1cfe4c1c5 100644
--- a/spec/models/clusters/cluster_spec.rb
+++ b/spec/models/clusters/cluster_spec.rb
@@ -660,6 +660,14 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
       end
 
       it { is_expected.to eq :errored }
+
+      context 'when cluster is removing' do
+        it "returns removing since this info has priority" do
+          cluster.removing!
+
+          is_expected.to eq :removing
+        end
+      end
     end
 
     context 'there is a cached connection status' do
@@ -680,14 +688,6 @@ describe Clusters::Cluster, :use_clean_rails_memory_store_caching do
       end
 
       it { is_expected.to eq :created }
-
-      context 'when cluster is removing' do
-        it 'returns removing' do
-          cluster.removing!
-
-          is_expected.to eq :removing
-        end
-      end
     end
   end