Rework spelling deprecation test

Author: ellnix

lib/meilisearch.rb

@@ -20,29 +20,23 @@ class << self
     # Softly deprecate the old spelling of the top level module
     # from MeiliSearch to Meilisearch
     def const_missing(const_name)
-      return super if @warned
+      return super if @warned && @constants_defined
 
       _warn_about_deprecation
       _define_constants
 
-      @warned = true
-
       # Now that all the proper constants have been set,
       # we can tell ruby to search for the const in MeiliSearch again.
       # If it's still not found, then it does not exist in
       # Meilisearch and the call to `super` will throw a normal error
       const_get(const_name)
     end
 
-    def method_missing(method_name)
-      unless @warned
-        _warn_about_deprecation
-        _define_constants
-      end
-
-      @warned = true
+    def method_missing(method_name, *args, **kwargs)
+      _warn_about_deprecation
+      _define_constants
 
-      Meilisearch.send(method_name)
+      Meilisearch.send(method_name, *args, **kwargs)
     end
 
     def respond_to_missing?(method_name, *)
@@ -52,16 +46,24 @@ def respond_to_missing?(method_name, *)
     private
 
     def _warn_about_deprecation
+      return if @warned
+
       Meilisearch::Utils.logger.warn <<~RENAMED_MODULE_WARNING
         [meilisearch-ruby] The top-level module of Meilisearch has been renamed.
         [meilisearch-ruby] Please update "MeiliSearch" to "Meilisearch".
       RENAMED_MODULE_WARNING
+
+      @warned = true
     end
 
     def _define_constants
+      return if @constants_defined
+
       Meilisearch.constants.each do |constant|
         const_set(constant, Meilisearch.const_get(constant))
       end
+
+      @constants_defined = true
     end
   end
 end

spec/meilisearch_spec.rb

@@ -38,9 +38,10 @@
 end
 
 RSpec.describe MeiliSearch do
-  it 'relays constants & messages, warns about deprecation only once' do
+  it 'using a constant warns about deprecation, returns correct constant' do
     logger = instance_double(Logger, warn: nil)
     Meilisearch::Utils.logger = logger
+    MeiliSearch.instance_variable_set('@warned', false)
 
     expect(MeiliSearch::Index).to equal(Meilisearch::Index)
     expect(MeiliSearch::Task).to equal(Meilisearch::Task)
@@ -52,4 +53,20 @@
 
     Meilisearch::Utils.logger = nil
   end
+
+  it 'calling a method warns about deprecation, calls the right method' do
+    logger = instance_double(Logger, warn: nil)
+    Meilisearch::Utils.logger = logger
+    MeiliSearch.instance_variable_set('@warned', false)
+
+    expect(MeiliSearch.qualified_version).to eq(Meilisearch.qualified_version)
+    expect(MeiliSearch::Index).to equal(Meilisearch::Index)
+    expect(MeiliSearch::Task).to equal(Meilisearch::Task)
+
+    expect(logger).to have_received(:warn)
+      .with(a_string_including('The top-level module of Meilisearch has been renamed.'))
+      .once
+
+    Meilisearch::Utils.logger = nil
+  end
 end