Add latest changes from gitlab-org/gitlab@15-5-stable-ee

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/support/database/multiple_databases.rb b/spec/support/database/multiple_databases.rb
index 25c3b6e74ce..b863767b5df 100644
--- a/spec/support/database/multiple_databases.rb
+++ b/spec/support/database/multiple_databases.rb
@@ -134,9 +134,7 @@ RSpec.configure do |config|
   end
 
   config.append_after(:context, :migration) do
-    break if recreate_databases_and_seed_if_needed
-
-    ensure_schema_and_empty_tables
+    recreate_databases_and_seed_if_needed || ensure_schema_and_empty_tables
   end
 
   config.around(:each, :migration) do |example|
diff --git a/spec/support/helpers/migrations_helpers.rb b/spec/support/helpers/migrations_helpers.rb
index 60097e301c4..e1d28a807e3 100644
--- a/spec/support/helpers/migrations_helpers.rb
+++ b/spec/support/helpers/migrations_helpers.rb
@@ -87,6 +87,8 @@ module MigrationsHelpers
     [ApplicationSetting, SystemHook].each do |model|
       model.define_attribute_methods
     end
+
+    Gitlab.ee { License.define_attribute_methods }
   end
 
   def reset_column_information(klass)