Use free boolean methods, restore some janky adapter loading stuff.

intridea · Mar 21, 2024 · f1995ad · f1995ad
1 parent e965f54
commit f1995ad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/spec/multi_json_spec.rb b/spec/multi_json_spec.rb
@@ -68,7 +68,11 @@
   end
 
   context "automatic adapter loading" do
-    before{ MultiJson::OptionsCache.reset }
+    before do
+      if described_class.instance_variable_defined?(:@adapter)
+        described_class.send(:remove_instance_variable, :@adapter)
+      end
+    end
 
     it "defaults to the best available gem" do
       if RUBY_PLATFORM == 'java' && jrjackson?

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -6,6 +6,7 @@
     c.syntax = :expect
   end
 
+  # You must run 'bundle exec rake' for this to work properly
   loaded_specs = Gem.loaded_specs
 
   config.add_setting :java, :default => RUBY_PLATFORM == 'java'
@@ -17,12 +18,12 @@
   config.add_setting :oj, :default => loaded_specs.has_key?('oj')
   config.add_setting :yajl, :default => loaded_specs.has_key?('yajl')
 
-  config.filter_run_excluding(:gson) unless config.gson
-  config.filter_run_excluding(:json) unless config.json
-  config.filter_run_excluding(:json_pure) unless config.json_pure
-  config.filter_run_excluding(:ok_json) unless config.ok_json
-  config.filter_run_excluding(:oj) unless config.oj
-  config.filter_run_excluding(:yajl) unless config.yajl
+  config.filter_run_excluding(:gson) unless config.gson?
+  config.filter_run_excluding(:json) unless config.json?
+  config.filter_run_excluding(:json_pure) unless config.json_pure?
+  config.filter_run_excluding(:ok_json) unless config.ok_json?
+  config.filter_run_excluding(:oj) unless config.oj?
+  config.filter_run_excluding(:yajl) unless config.yajl?
 
   unless config.java
     config.filter_run_excluding(:java)