Refactor .show_gke_cluster_integration_callout?

2 files changed, 12 insertions, 20 deletions

diff --git a/app/helpers/user_callouts_helper.rb b/app/helpers/user_callouts_helper.rb
index a292f676331..6368e248c6e 100644
--- a/app/helpers/user_callouts_helper.rb
+++ b/app/helpers/user_callouts_helper.rb
@@ -2,8 +2,8 @@ module UserCalloutsHelper
   GKE_CLUSTER_INTEGRATION = 'gke_cluster_integration'.freeze
 
   def show_gke_cluster_integration_callout?(project)
-    current_user && !user_dismissed?(GKE_CLUSTER_INTEGRATION) &&
-      can?(current_user, :create_cluster, project)
+    can?(current_user, :create_cluster, project) &&
+      !user_dismissed?(GKE_CLUSTER_INTEGRATION)
   end
 
   private
diff --git a/spec/helpers/user_callouts_helper_spec.rb b/spec/helpers/user_callouts_helper_spec.rb
index 42c2e7827b2..27455705d23 100644
--- a/spec/helpers/user_callouts_helper_spec.rb
+++ b/spec/helpers/user_callouts_helper_spec.rb
@@ -12,44 +12,36 @@ describe UserCalloutsHelper do
 
     subject { helper.show_gke_cluster_integration_callout?(project) }
 
-    context 'when user has not dismissed' do
+    context 'when user can create a cluster' do
       before do
-        allow(helper).to receive(:user_dismissed?).and_return(false)
+        allow(helper).to receive(:can?).with(anything, :create_cluster, anything)
+          .and_return(true)
       end
 
-      context 'when user can create a cluster' do
+      context 'when user has not dismissed' do
         before do
-          allow(helper).to receive(:can?).with(anything, :create_cluster, anything)
-            .and_return(true)
+          allow(helper).to receive(:user_dismissed?).and_return(false)
         end
 
         it { is_expected.to be true }
       end
 
-      context 'when user can not create a cluster' do
+      context 'when user dismissed' do
         before do
-          allow(helper).to receive(:can?).with(anything, :create_cluster, anything)
-            .and_return(false)
+          allow(helper).to receive(:user_dismissed?).and_return(true)
         end
 
         it { is_expected.to be false }
       end
     end
 
-    context 'when user dismissed' do
+    context 'when user can not create a cluster' do
       before do
-        allow(helper).to receive(:user_dismissed?).and_return(true)
+        allow(helper).to receive(:can?).with(anything, :create_cluster, anything)
+          .and_return(false)
       end
 
       it { is_expected.to be false }
     end
-
-    context 'when the user is not logged in' do
-      before do
-        allow(helper).to receive(:current_user).and_return(nil)
-      end
-
-      it { is_expected.to be_falsey }
-    end
   end
 end