js-routes 2.2.4 → 2.2.6

data/spec/js_routes/module_types/umd_spec.rb

@@ -67,7 +67,7 @@ DOC
 
     before(:each) do
       FileUtils.rm_f(name)
-      JsRoutes.generate!({:file => name})
+      JsRoutes.generate!(file: name)
     end
 
     after(:each) do

data/spec/js_routes/options_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe JsRoutes, "options" do
 
   let(:generated_js) do
-    JsRoutes.generate({
+    JsRoutes.generate(
       module_type: nil,
       namespace: 'Routes',
       **_options
-    })
+    )
   end
 
   before(:each) do

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe JsRoutes, "compatibility with Rails"  do
 
   let(:generated_js) do
-    JsRoutes.generate({module_type: nil, namespace: 'Routes'})
+    JsRoutes.generate(module_type: nil, namespace: 'Routes')
   end
   before(:each) do
     evaljs(generated_js)
@@ -267,7 +267,9 @@ describe JsRoutes, "compatibility with Rails"  do
       end
 
       it "treats false as absent optional part" do
-        pending("https://github.com/rails/rails/issues/42280")
+        if Rails.version < "7.0"
+          pending("https://github.com/rails/rails/issues/42280")
+        end
         expectjs("Routes.things_path(false)").to eq(test_routes.things_path(false))
       end
 

data/spec/js_routes/route_specification_spec.rb

@@ -4,7 +4,7 @@ require "spec_helper"
 describe JsRoutes, "compatibility with Rails"  do
 
   let(:generated_js) do
-    JsRoutes.generate({module_type: nil, namespace: 'Routes'})
+    JsRoutes.generate(module_type: nil, namespace: 'Routes')
   end
   before(:each) do
     evaljs(generated_js)

data/spec/js_routes/zzz_last_post_rails_init_spec.rb

@@ -2,6 +2,8 @@
 # because it cause unrevertable changes to runtime
 # what is why I added "zzz_last" in the beginning
 
+require "sprockets"
+require "sprockets/railtie"
 require 'spec_helper'
 require "fileutils"
 
@@ -12,6 +14,10 @@ describe "after Rails initialization", :slow do
     Sprockets::VERSION.to_i >= 3
   end
 
+  def sprockets_v4?
+    Sprockets::VERSION.to_i >= 4
+  end
+
   def sprockets_context(environment, name, filename)
     if sprockets_v3?
       Sprockets::Context.new(environment: environment, name: name, filename: filename.to_s, metadata: {})
@@ -35,6 +41,7 @@ describe "after Rails initialization", :slow do
   end
 
   before(:all) do
+    JsRoutes::Engine.install_sprockets!
     Rails.configuration.eager_load = false
     Rails.application.initialize!
   end
@@ -73,7 +80,7 @@ describe "after Rails initialization", :slow do
     context "the preprocessor" do
       before(:each) do
         path = Rails.root.join('config','routes.rb').to_s
-        if sprockets_v3?
+        if sprockets_v3? || sprockets_v4?
           expect_any_instance_of(Sprockets::Context).to receive(:depend_on).with(path)
         else
           expect(ctx).to receive(:depend_on).with(path)
@@ -86,7 +93,6 @@ describe "after Rails initialization", :slow do
       end
 
       context "when dealing with js-routes.js" do
-
         context "with Rails" do
           context "and initialize on precompile" do
             before(:each) do

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ require 'rails/all'
 require 'js-routes'
 require 'active_support/core_ext/hash/slice'
 
-unless ENV['TRAVIS_CI']
+unless ENV['CI']
   code = system("yarn build")
   unless code
     exit(1)
@@ -94,10 +94,6 @@ end
 
 
 class ::App < Rails::Application
-  # Enable the asset pipeline
-  config.assets.enabled = true
-  # initialize_on_precompile
-  config.assets.initialize_on_precompile = true
   config.paths['config/routes.rb'] << 'spec/config/routes.rb'
   config.root = File.expand_path('../dummy', __FILE__)
 end