No class vars at toplevel

jruby · May 23, 2024 · e31c0f0 · e31c0f0
1 parent a598f80
commit e31c0f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/spec/ruby/jruby/rack/app_layout_spec.rb b/src/spec/ruby/jruby/rack/app_layout_spec.rb
@@ -89,15 +89,15 @@
 
 shared_examples "FileSystemLayout" do
 
-  @@__work_dir__ = Dir.pwd
+  __work_dir__ = Dir.pwd
 
   before do
     require 'tmpdir'
     Dir.chdir Dir.mktmpdir
   end
 
   after do
-    Dir.chdir @@__work_dir__
+    Dir.chdir __work_dir__
   end
 
   it "sets app and public uri defaults based on a typical (Rails/Rack) app" do

diff --git a/src/spec/ruby/jruby/rack/booter_spec.rb b/src/spec/ruby/jruby/rack/booter_spec.rb
@@ -16,14 +16,14 @@
 
   after(:all) { JRuby::Rack.context = nil }
 
-  @@rack_env = ENV['RACK_ENV']
-  @@gem_path = Gem.path.dup
-  @@env_gem_path = ENV['GEM_PATH']
+  rack_env = ENV['RACK_ENV']
+  gem_path = Gem.path.dup
+  env_gem_path = ENV['GEM_PATH']
 
   after do
-    @@rack_env.nil? ? ENV.delete('RACK_ENV') : ENV['RACK_ENV'] = @@rack_env
-    Gem.path.replace(@@gem_path)
-    @@env_gem_path.nil? ? ENV.delete('GEM_PATH') : ENV['GEM_PATH'] = @@env_gem_path
+    rack_env.nil? ? ENV.delete('RACK_ENV') : ENV['RACK_ENV'] = rack_env
+    Gem.path.replace(gem_path)
+    env_gem_path.nil? ? ENV.delete('GEM_PATH') : ENV['GEM_PATH'] = env_gem_path
   end
 
   it "should determine the public html root from the 'public.root' init parameter" do