Merge branch '32736-fix-broken-foss-master' into 'master'

Fix spec failure when run in gitlab-foss

Closes #32736

See merge request gitlab-org/gitlab!17663

spec/controllers/application_controller_spec.rb

@@ -98,8 +98,11 @@ describe ApplicationController do
         # remove line below once `privacy_policy_update_callout`
         # feature flag is removed and `gon` reverts back to
         # to not setting any variables.
-        it_behaves_like 'setting gon variables'
-        # it_behaves_like 'not setting gon variables'
+        if Gitlab.ee?
+          it_behaves_like 'setting gon variables'
+        else
+          it_behaves_like 'not setting gon variables'
+        end
       end
     end
 
@@ -110,8 +113,11 @@ describe ApplicationController do
       # remove line below once `privacy_policy_update_callout`
       # feature flag is removed and `gon` reverts back to
       # to not setting any variables.
-      it_behaves_like 'setting gon variables'
-      # it_behaves_like 'not setting gon variables'
+      if Gitlab.ee?
+        it_behaves_like 'setting gon variables'
+      else
+        it_behaves_like 'not setting gon variables'
+      end
     end
   end