[tests] Experiment with fixing test race condition on servlet_context

Author: chadlwilson

src/spec/ruby/jruby/rack/rails_booter_spec.rb

@@ -122,10 +122,6 @@
       end
     end
 
-    after :all do
-      $servlet_context = nil
-    end
-
     let(:railtie_class) { Class.new(Rails::Railtie) }
 
     it "should have loaded the railtie" do

src/spec/ruby/rack/application_spec.rb

@@ -104,6 +104,8 @@ def it_should_rewind_body
 
   before :each do
     @app_factory = DefaultRackApplicationFactory.new
+    reset_booter
+    reset_servlet_context_global
   end
 
   it "should receive a rackup script via the 'rackup' parameter" do
@@ -161,11 +163,6 @@ def it_should_rewind_body
     expect(input_stream.getMaximumBufferSize).to eq 420
   end
 
-  before do
-    reset_booter
-    JRuby::Rack.context = $servlet_context = nil
-  end
-
   it "should init and create application object without a rackup script" do
     $servlet_context = @servlet_context
     # NOTE: a workaround to be able to mock it :
@@ -340,7 +337,7 @@ def newRuntime()
 
       it "initializes the $servlet_context global variable" do
         @runtime = app_factory.new_runtime
-        should_not_eval_as_nil "defined?($servlet_context)"
+        expect(@runtime.evalScriptlet("defined?($servlet_context)")).to be_truthy
       end
 
       it "clears environment variables if the configuration ignores the environment" do

src/spec/ruby/spec_helper.rb

@@ -51,6 +51,11 @@ def servlet_context
     mock_servlet_context
   end
 
+  def reset_servlet_context_global
+    $servlet_context = nil if defined? $servlet_context
+    JRuby::Rack.context = nil if defined?(JRuby::Rack) and JRuby::Rack.respond_to?(:context=)
+  end
+
   def silence_warnings(&block)
     JRuby::Rack::Helpers.silence_warnings(&block)
   end
@@ -125,7 +130,7 @@ def should_not_eval_as_nil(code, runtime = @runtime)
 
 STUB_DIR = File.expand_path('../stub', File.dirname(__FILE__))
 
-WD_START = Dir.getwd
+ORIGINAL_WORKING_DIR = Dir.getwd
 
 begin
   # NOTE: only if running with a `bundle exec` to better isolate
@@ -154,8 +159,8 @@ def should_not_eval_as_nil(code, runtime = @runtime)
   config.after(:each) do
     (ENV.keys - @env_save.keys).each { |k| ENV.delete k }
     @env_save.each { |k, v| ENV[k] = v }
-    Dir.chdir(WD_START) unless Dir.getwd == WD_START
-    $servlet_context = nil if defined? $servlet_context
+    Dir.chdir(ORIGINAL_WORKING_DIR) unless Dir.getwd == ORIGINAL_WORKING_DIR
+    reset_servlet_context_global
   end
 
   # NOTE: only works when no other example filtering is in place: e.g. `rspec ... --example=logger` won't filter here