[chore] Drop deprecated JRuby::Rack::RailsFileSystemLayout alias for JRuby::Rack::FileSystemLayout

Author: chadlwilson

History.md

@@ -9,6 +9,7 @@
 - Drop `jruby.rack.jruby.version` and `jruby.rack.rack.release` keys from rack `env` Hash
 - Drop deprecated `Rack::Handler::Servlet::Env` and `Rack::Handler::Servlet::LazyEnv` types (replaced by `DefaultEnv`)
 - Drop undocumented and deprecated jruby-rack 1.0 backwards compat properties `jruby.runtime.timeout.sec`, `jruby.runtime.initializer.threads`, `jruby.init.serial`, `jruby.rack.request.size.threshold.bytes`
+- Drop deprecated `JRuby::Rack::RailsFileSystemLayout` alias for `JRuby::Rack::FileSystemLayout`
 - Change context listener to throw, in case of an exception during initialization, by default
 - Change rails context listener to assume a thread-safe application by default
 - update (bundled) rack to 2.2.17

src/main/ruby/jruby/rack/app_layout.rb

@@ -181,10 +181,5 @@ def expand_path(path)
       end
 
     end
-
-    RailsFileSystemLayout = FileSystemLayout
-    # @private backwards compatibility
-    RailsFilesystemLayout = FileSystemLayout
-
   end
 end

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

@@ -87,7 +87,12 @@
 
 end
 
-shared_examples "FileSystemLayout" do
+describe JRuby::Rack::FileSystemLayout do
+
+  let(:layout) do
+    allow(@rack_context).to receive(:getRealPath) { |path| path }
+    JRuby::Rack::FileSystemLayout.new(@rack_context)
+  end
 
   before do
     @original_work_dir = Dir.pwd
@@ -99,6 +104,20 @@
     Dir.chdir @original_work_dir
   end
 
+  it "sets app uri from an app.root context param" do
+    FileUtils.mkdir_p 'app/current'
+    expect(@rack_context).to receive(:getInitParameter).with("app.root").and_return "#{Dir.pwd}/app/current"
+    expect(layout.app_uri).to eq File.expand_path('app/current')
+    expect(layout.app_path).to eq "#{Dir.pwd}/app/current"
+  end
+
+  it "sets app uri from a rails.root context param" do
+    base = File.join File.dirname(__FILE__), '../../rails'
+    expect(@rack_context).to receive(:getInitParameter).with("rails.root").and_return base
+    expect(layout.app_uri).to eq base
+    expect(layout.app_path).to eq File.expand_path(base)
+  end
+
   it "sets app and public uri defaults based on a typical (Rails/Rack) app" do
     FileUtils.mkdir('./public')
     expect(layout.app_uri).to eq '.'
@@ -181,47 +200,3 @@
   end
 
 end
-
-describe JRuby::Rack::FileSystemLayout do
-
-  let(:layout) do
-    allow(@rack_context).to receive(:getRealPath) { |path| path }
-    JRuby::Rack::FileSystemLayout.new(@rack_context)
-  end
-
-  it_behaves_like "FileSystemLayout"
-
-  it "sets app uri from an app.root context param" do
-    FileUtils.mkdir_p 'app/current'
-    expect(@rack_context).to receive(:getInitParameter).with("app.root").and_return "#{Dir.pwd}/app/current"
-    expect(layout.app_uri).to eq File.expand_path('app/current')
-    expect(layout.app_path).to eq "#{Dir.pwd}/app/current"
-  end
-
-  describe "deprecated-constant" do
-
-    it "still works" do
-      expect(JRuby::Rack::RailsFilesystemLayout).to be JRuby::Rack::FileSystemLayout
-    end
-
-  end
-
-end
-
-describe JRuby::Rack::RailsFileSystemLayout do
-
-  let(:layout) do
-    allow(@rack_context).to receive(:getRealPath) { |path| path }
-    JRuby::Rack::RailsFileSystemLayout.new(@rack_context)
-  end
-
-  it_behaves_like "FileSystemLayout"
-
-  it "sets app uri from a rails.root context param" do
-    base = File.join File.dirname(__FILE__), '../../rails'
-    expect(@rack_context).to receive(:getInitParameter).with("rails.root").and_return base
-    expect(layout.app_uri).to eq base
-    expect(layout.app_path).to eq File.expand_path(base)
-  end
-
-end if defined? JRuby::Rack::RailsFileSystemLayout