Merge branch '208897-add-user-type-consistency-tests' into 'master'

Add user_type and bot_type consistency tests

See merge request gitlab-org/gitlab!26578

app/models/user_bot_type_enums.rb

@@ -2,9 +2,6 @@
 
 module UserBotTypeEnums
   def self.bots
-    # When adding a new key, please ensure you are not conflicting
-    # with EE-only keys in app/models/user_type_enums.rb
-    # or app/models/user_bot_type_enums.rb
     {
       alert_bot: 2
     }

app/models/user_type_enums.rb

@@ -2,9 +2,6 @@
 
 module UserTypeEnums
   def self.types
-    # When adding a new key, please ensure you are not conflicting
-    # with EE-only keys in app/models/user_type_enums.rb
-    # or app/models/user_bot_type_enums.rb
     bots
   end
 

ee/app/models/ee/user_bot_type_enums.rb

@@ -9,9 +9,6 @@ module EE
 
       override :bots
       def bots
-        # When adding a new key, please ensure you are not conflicting
-        # with EE-only keys in app/models/user_type_enums.rb
-        # or app/models/user_bot_type_enums.rb
         super.merge(
           support_bot: 1,
           visual_review_bot: 3

ee/app/models/ee/user_type_enums.rb

@@ -9,9 +9,6 @@ module EE
 
       override :types
       def types
-        # When adding a new key, please ensure you are not conflicting
-        # with EE-only keys in app/models/user_type_enums.rb
-        # or app/models/user_bot_type_enums.rb
         super.merge(ServiceUser: 4)
       end
 

ee/spec/models/ee/user_bot_type_enums_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe UserBotTypeEnums do
+  it 'has no type conflicts between CE and EE', :aggregate_failures do
+    described_class.public_methods(false).each do |method_name|
+      method = described_class.method(method_name)
+
+      ee_result = method.call
+      ce_result = method.super_method.call
+
+      failure_message = "expected #{method} to have no value conflicts, but it has.\n
+      Please make sure you are not overriding values.\n
+      Actual values: EE #{ee_result}, CE #{ce_result}"
+
+      expect(ee_result).to include(ce_result), failure_message
+      expect(ee_result.values).to match_array(ee_result.values.uniq)
+    end
+  end
+end

ee/spec/models/ee/user_type_enums_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe UserTypeEnums do
+  it 'has no type conflicts between CE and EE', :aggregate_failures do
+    described_class.public_methods(false).each do |method_name|
+      method = described_class.method(method_name)
+
+      ee_result = method.call
+      ce_result = method.super_method.call
+
+      failure_message = "expected #{method} to have no value conflicts, but it has.\n
+      Please make sure you are not overriding values.\n
+      Actual values: EE #{ee_result}, CE #{ce_result}"
+
+      expect(ee_result).to include(ce_result), failure_message
+      expect(ee_result.values).to match_array(ee_result.values.uniq)
+    end
+  end
+end