From 7f684803ed79296c589c28c20c110a8e4bc3c633 Mon Sep 17 00:00:00 2001
From: Kelvin Tan <kelv@discourse.org>
Date: Thu, 14 Mar 2024 11:36:25 +0800
Subject: [PATCH 1/2] DEV: remove deprecations from ember 3/4 now that we have
 upgraded to ember 5

---
 lib/deprecation_collector/list.rb | 82 +------------------------------
 list_ember_deprecations.rb        |  2 +-
 2 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/lib/deprecation_collector/list.rb b/lib/deprecation_collector/list.rb
index 8b12aaa..61c4ea9 100644
--- a/lib/deprecation_collector/list.rb
+++ b/lib/deprecation_collector/list.rb
@@ -3,87 +3,7 @@
 module DeprecationCollector
   List =
     # Ember deprecations (generated by `/list_ember_deprecations.rb`)
-    %w[
-      3-0-browser-support-policy
-      action.mouseenter-leave-move
-      application-controller.router-properties
-      argument-less-helper-paren-less-invocation
-      array.new-array-wrapper
-      array-observers
-      attrs-arg-access
-      autotracking.mutation-after-consumption
-      class-binding-and-class-name-bindings-in-templates
-      component-manager-string-lookup
-      component.mouseenter-leave-move
-      computed-property.override
-      computed-property.property
-      computed-property.volatile
-      deprecate-router-events
-      deprecated-run-loop-and-computed-dot-access
-      editions.classic
-      ember.built-in-components.import
-      ember.built-in-components.legacy-arguments
-      ember.built-in-components.legacy-attribute-arguments
-      ember.built-in-components.reopen
-      ember-component.is-visible
-      ember.component.reopen
-      ember-component.send-action
-      ember-console.deprecate-logger
-      ember-env.old-extend-prototypes
-      ember-glimmer.link-to.positional-arguments
-      ember-glimmer.with-syntax
-      ember-global
-      ember.globals-resolver
-      ember.link-to.disabled-when
-      ember-meta.descriptor-on-object
-      ember-metal.get-with-default
-      ember.partial
-      ember-polyfills.deprecate-merge
-      ember-routing.route-router
-      ember-runtime.deprecate-copy-copyable
-      ember-source-deprecation-without-for
-      ember-source-deprecation-without-since
-      ember-string.htmlsafe-ishtmlsafe
-      ember-string.loc
-      ember-string.prototype-extensions
-      ember-utils.try-invoke
-      events.inherited-function-listeners
-      events.remove-all-listeners
-      function-prototype-extensions.observes
-      function-prototype-extensions.on
-      function-prototype-extensions.property
-      getting-the-each-property
-      has-block-and-has-block-params
-      implicit-injections
-      jquery-apis
-      jquery-event
-      manager-capabilities.components-3-4
-      manager-capabilities.modifiers-3-13
-      meta-destruction-apis
-      object.alias-method
-      object.new-constructor
-      old-deprecate-method-paths
-      optional-feature.application-template-wrapper
-      optional-feature.jquery-integration
-      optional-feature.template-only-glimmer-components
-      remove-handler-infos
-      route-disconnect-outlet
-      route-render-template
-      routing.transition-methods
-      setting-on-hash
-      template-compiler.registerPlugin
-      this-property-fallback
-      transition-state
-      use-notifypropertychange-instead-of-propertywillchange-and-propertydidchange
-      deprecate-auto-location
-      deprecate-ember-error
-      ember-polyfills.deprecate-assign
-      ember-string.add-package
-      ember-string.from-ember-module
-      implicit-injections
-      deprecate-implicit-route-model
-      ember-views.curly-components.jquery-element
-    ] +
+    %w[deprecate-implicit-route-model] +
       # discourse deprecations
       %w[
         discourse.modal-controllers
diff --git a/list_ember_deprecations.rb b/list_ember_deprecations.rb
index 9b192ae..809ae89 100644
--- a/list_ember_deprecations.rb
+++ b/list_ember_deprecations.rb
@@ -8,7 +8,7 @@
 
   deprecation_ids = []
 
-  Dir.glob("deprecation-app/content/ember/{v3,v4,v5}/*.md") do |file|
+  Dir.glob("deprecation-app/content/ember/{v5}/*.md") do |file|
     frontmatter = YAML.load_file(file)
     display_id = frontmatter["displayId"] || File.basename(file, ".md")
     deprecation_ids << display_id if display_id

From c9bc376fab7c7b2088a5db5f9ad0dd2cc89a5df7 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 14 Mar 2024 18:13:59 +0000
Subject: [PATCH 2/2] fix spec when real ember deprecation is silenced

---
 spec/system/deprecation_collector_spec.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/system/deprecation_collector_spec.rb b/spec/system/deprecation_collector_spec.rb
index aa6daf0..d89479e 100644
--- a/spec/system/deprecation_collector_spec.rb
+++ b/spec/system/deprecation_collector_spec.rb
@@ -9,7 +9,8 @@
 
     logged_deprecations = []
 
-    test_deprecation_id = DeprecationCollector::List.first
+    test_deprecation_id = "fake-ember-deprecation"
+    DeprecationCollector::List.push(test_deprecation_id)
 
     stub =
       DeprecationCollector
@@ -32,5 +33,7 @@
     try_until_success do
       expect(logged_deprecations).to include(test_deprecation_id, "_other_discourse")
     end
+  ensure
+    DeprecationCollector::List.push(test_deprecation_id)
   end
 end