js-routes 2.2.3 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b706c51040d12aaa69182dad9d25304ba947fe1e80cc5171775864a27d6f4ed8
-  data.tar.gz: 1a105e8a4dbc9cfde5a787a0714b6e0bf0758b6291f6945f0a16ca9c1e7a47a9
+  metadata.gz: d0fd81f6f8575bb26353c7e485f0551cc62420a266e22d5503739332b5762037
+  data.tar.gz: b84d4ad0f70f8e1f454bdd2c6fb8b77a316376b3407a3fd0b6c681d87b87ada9
 SHA512:
-  metadata.gz: f053d1f48cb8a4f9f7ac7f1e68d37f4816d09e42e0a91660fb84c1e9f4ad36d439019f6f402f1e2fce30467e6b0d5b799fd08bbe70bfc2aa8423c63f053f0bdb
-  data.tar.gz: bdcf72700542350da423e9cf62b4abcc0ba326400c4077c70c5f6174edb75a7e61b6b6a765a0454b4cd1a2fc5ddbf91f3a16294ce995d9ab31d9984153c29b4c
+  metadata.gz: 23db2ecfc872d470727b60d7c63148aa15d9d5b76d6eaedbf7bbe5ee964ae5ca5abfb09f69199dd813fcd0b09b12d0920fcb0abf9b09a1bb2a6dbfbaf7884e75
+  data.tar.gz: faf0d713243b705277604493bdf2f5d9f61c5cd953ef9bcfbcd1f2d88fdfd850d27ed48e0740f0fa4c0f4492a310bec13d6a76fc070113703ab7e7750e812b0c

data/.eslintrc.js

@@ -4,7 +4,7 @@
     'eslint:recommended',
     'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
-    'prettier/@typescript-eslint',
+    'prettier',
   ],
   parser: '@typescript-eslint/parser',
   plugins: ['@typescript-eslint'],

data/.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ["2.7"]
+        gemfile:
+          - gemfiles/rails50_sprockets_3.gemfile
+          - gemfiles/rails51_sprockets_3.gemfile
+          - gemfiles/rails52_sprockets_3.gemfile
+          - gemfiles/rails70_sprockets_4.gemfile
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+      - name: install dependencies
+        run: |
+          bundle install --jobs 3 --retry 3
+          yarn install
+      - name: test
+        run: bundle exec rake spec

data/Appraisals

@@ -8,12 +8,10 @@ def define_appraisal(rails, version, sprockets)
 end
 
 [
-  [:rails40, '4.0.13', [2, 3]],
-  [:rails41, '4.1.16', [2, 3]],
-  [:rails42, '4.2.9',  [2, 3]],
   [:rails50, '5.0.5',  [3]],
   [:rails51, '5.1.3',  [3]],
-  [:rails52, '5.2.3',  [3]]
+  [:rails52, '5.2.3',  [3]],
+  [:rails70, '7.0.3.1', [4]]
 ].each do |name, version, sprockets|
   define_appraisal(name, version, sprockets)
 end

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## master
 
+
+## v2.2.5
+
+* Upgraded eslint and prettier versions [#304](https://github.com/railsware/js-routes/issues/304)
+* Fix middleware generator [#300](https://github.com/railsware/js-routes/issues/300)
+* Support `params` special parameter
+
 ## v2.2.4
 
 * Fix rails engine loading if sprockets is not in Gemfile. Fixes [#294](https://github.com/railsware/js-routes/issues/294)

data/Readme.md

@@ -1,10 +1,8 @@
 # JsRoutes
-[![Build Status](https://travis-ci.org/railsware/js-routes.svg?branch=master)](https://travis-ci.org/railsware/js-routes)
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Frailsware%2Fjs-routes.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Frailsware%2Fjs-routes?ref=badge_shield)
 
-Generates javascript file that defines all Rails named routes as javascript helpers
+[![CI](https://github.com/railsware/js-routes/actions/workflows/ci.yml/badge.svg)](https://github.com/railsware/js-routes/actions/workflows/ci.yml)
 
-[UPGRADE TO 2.0](./VERSION_2_UPGRADE.md)
+Generates javascript file that defines all Rails named routes as javascript helpers
 
 ## Intallation
 
@@ -54,15 +52,15 @@ Add the following to `config/environments/development.rb`:
   config.middleware.use(JsRoutes::Middleware)
 ```
 
-Use it in `app/javascript/packs/application.js`:
+Use it in any JS file:
 
 ``` javascript
-import * as Routes from '../routes';
-// window.Routes = Routes;
-alert(Routes.post_path(1))
+import {post_path} from '../routes';
+
+alert(post_path(1))
 ```
 
-Upgrade `rake assets:precompile` to update js-routes files: 
+Upgrade `rake assets:precompile` to update js-routes files in `Rakefile`: 
 
 ``` ruby
 namespace :assets do
@@ -133,11 +131,12 @@ Create routes file `app/javascript/routes.js.erb`:
 <%= JsRoutes.generate() %>
 ```
 
-Use routes wherever you need them `app/javascript/packs/application.js`: 
+Use routes wherever you need them: 
 
 ``` javascript
-import * as Routes from 'routes.js.erb';
-window.Routes = Routes;
+import {post_path} from 'routes.js.erb';
+
+alert(post_path(2));
 ```
 
 <div id='advanced-setup'></div>
@@ -175,14 +174,20 @@ You can manipulate the generated helper manually by injecting ruby into javascri
 export const routes = <%= JsRoutes.generate(module_type: nil, namespace: nil) %>
 ```
 
-If you want to generate the routes files outside of the asset pipeline, you can use `JsRoutes.generate!`:
+If you want to generate the routes files manually with custom options, you can use `JsRoutes.generate!`:
 
 ``` ruby
 path = Rails.root.join("app/javascript")
 
-JsRoutes.generate!("#{path}/app_routes.js", exclude: [/^admin_/, /^api_/])
-JsRoutes.generate!("#{path}/adm_routes.js", include: /^admin_/)
-JsRoutes.generate!("#{path}/api_routes.js", include: /^api_/, default_url_options: {format: "json"})
+JsRoutes.generate!(
+  "#{path}/app_routes.js", exclude: [/^admin_/, /^api_/]
+)
+JsRoutes.generate!(
+"#{path}/adm_routes.js", include: /^admin_/
+)
+JsRoutes.generate!(
+  "#{path}/api_routes.js", include: /^api_/, default_url_options: {format: "json"}
+)
 ```
 
 <div id='definitions'></div>
@@ -252,11 +257,12 @@ end
 Or dynamically in JavaScript, although only [Formatter Options](#formatter-options) are supported:
 
 ``` js
-import * as Routes from 'routes'
-Routes.configure({
+import {configure, config} from 'routes'
+
+configure({
   option: value
 });
-Routes.config(); // current config
+config(); // current config
 ```
 
 ### Available Options
@@ -290,7 +296,7 @@ Options to configure JavaScript file generator. These options are only available
   * Note: generated URLs will first use the protocol, host, and port options specified in the route definition. Otherwise, the URL will be based on the option specified in the `default_url_options` config. If no default option has been set, then the URL will fallback to the current URL based on `window.location`.
 * `compact` - Remove `_path` suffix in path routes(`*_url` routes stay untouched if they were enabled)
   * Default: `false`
-  * Sample route call when option is set to true: Routes.users() => `/users`
+  * Sample route call when option is set to true: `users() // => /users`
 * `application` - a key to specify which rails engine you want to generate routes too.
   * This option allows to only generate routes for a specific rails engine, that is mounted into routes instead of all Rails app routes
   * Default: `Rails.application`
@@ -323,41 +329,44 @@ Options to configure routes formatting. These options are available both in Ruby
 Configuration above will create a nice javascript file with `Routes` object that has all the rails routes available:
 
 ``` js
-import * as Routes from 'routes';
+import {
+  user_path, user_project_path, company_path
+} as Routes from 'routes';
 
-Routes.users_path() 
+users_path() 
   // => "/users"
 
-Routes.user_path(1) 
+user_path(1) 
   // => "/users/1"
   
-Routes.user_path(1, {format: 'json'}) 
+user_path(1, {format: 'json'}) 
   // => "/users/1.json"
 
-Routes.user_path(1, {anchor: 'profile'}) 
+user_path(1, {anchor: 'profile'}) 
   // => "/users/1#profile"
 
-Routes.new_user_project_path(1, {format: 'json'}) 
+new_user_project_path(1, {format: 'json'}) 
   // => "/users/1/projects/new.json"
 
-Routes.user_project_path(1,2, {q: 'hello', custom: true}) 
+user_project_path(1,2, {q: 'hello', custom: true}) 
   // => "/users/1/projects/2?q=hello&custom=true"
 
-Routes.user_project_path(1,2, {hello: ['world', 'mars']}) 
+user_project_path(1,2, {hello: ['world', 'mars']}) 
   // => "/users/1/projects/2?hello%5B%5D=world&hello%5B%5D=mars"
 
 var google = {id: 1, name: "Google"};
-Routes.company_path(google) 
+company_path(google) 
   // => "/companies/1"
 
 var google = {id: 1, name: "Google", to_param: "google"};
-Routes.company_path(google) 
+company_path(google) 
   // => "/companies/google"
 ```
 
 In order to make routes helpers available globally:
 
 ``` js
+import * as Routes from '../routes';
 jQuery.extend(window, Routes)
 ```
 
@@ -366,22 +375,18 @@ jQuery.extend(window, Routes)
 Possible to get `spec` of route by function `toString`:
 
 ```js
-Routes.users_path.toString() // => "/users(.:format)"
-Routes.user_path.toString() // => "/users/:id(.:format)"
-```
-
-This function allow to get the same `spec` for route, if you will get string representation of the route function:
+import {user_path, users_path}  from '../routes'
 
-```js
-'' + Routes.users_path // => "/users(.:format)", a string representation of the object
-'' + Routes.user_path // => "/users/:id(.:format)"
+users_path.toString() // => "/users(.:format)"
+user_path.toString() // => "/users/:id(.:format)"
 ```
 
+
 Route function also contain method `requiredParams` inside which returns required param names array:
 
 ```js
-Routes.users_path.requiredParams() // => []
-Routes.user_path.requiredParams() // => ['id']
+users_path.requiredParams() // => []
+user_path.requiredParams() // => ['id']
 ```
 
 
@@ -395,8 +400,10 @@ Sometimes the destinction between JS Hash and Object can not be found by JsRoute
 In this case you would need to pass a special key to help:
 
 ``` js
-Routes.company_project_path({company_id: 1, id: 2}) // => Not enough parameters
-Routes.company_project_path({company_id: 1, id: 2, _options: true}) // => "/companies/1/projects/2"
+import {company_project_path} from '../routes'
+
+company_project_path({company_id: 1, id: 2}) // => Not enough parameters
+company_project_path({company_id: 1, id: 2, _options: true}) // => "/companies/1/projects/2"
 ```
 
 
@@ -417,7 +424,7 @@ import {
   inbox_message_path,
   inbox_attachment_path,
   user_path,
-} from 'routes.js.erb'
+} from '../routes'
 ```
 
 Such import structure allows for moddern JS bundlers like [Webpack](https://webpack.js.org/) to only include explicitly imported routes into JS bundle file.

data/gemfiles/rails50_sprockets_3.gemfile

@@ -5,4 +5,4 @@ source "http://rubygems.org"
 gem "railties", "~> 5.0.5"
 gem "sprockets", "~> 3.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails51_sprockets_3.gemfile

@@ -5,4 +5,4 @@ source "http://rubygems.org"
 gem "railties", "~> 5.1.3"
 gem "sprockets", "~> 3.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails52_sprockets_3.gemfile

@@ -5,4 +5,4 @@ source "http://rubygems.org"
 gem "railties", "~> 5.2.3"
 gem "sprockets", "~> 3.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails70_sprockets_4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "railties", "~> 7.0.3.1"
+gem "sprockets", "~> 4.0"
+
+gemspec path: "../"

data/lib/js_routes/engine.rb

@@ -29,7 +29,8 @@ end
 
 
 class Engine < ::Rails::Engine
-  if defined?(::Sprockets::Railtie)
+  def self.install_sprockets!
+    return if defined?(@installed_sprockets)
     require 'sprockets/version'
     v2                = Gem::Dependency.new('', ' ~> 2')
     vgte3             = Gem::Dependency.new('', ' >= 3')
@@ -58,6 +59,10 @@ class Engine < ::Rails::Engine
         raise StandardError, "Sprockets version #{sprockets_version} is not supported"
       end
     end
+    @installed_sprockets = true
+  end
+  if defined?(::Sprockets::Railtie)
+    install_sprockets!
   end
 end
 end

data/lib/js_routes/generators/middleware.rb

@@ -52,7 +52,7 @@ end
       {},
       {module_type: 'DTS'}
     ].map do |config|
-      File.join('/', JsRoutes.new(config).configuration.output_file) + "\n"
+      File.join('/', JsRoutes::Configuration.new(config).output_file) + "\n"
     end.join
   end
 end

data/lib/js_routes/instance.rb

@@ -2,7 +2,7 @@ require "js_routes/configuration"
 require "js_routes/route"
 
 module JsRoutes
-  class Instance
+  class Instance # :nodoc:
 
     attr_reader :configuration
     #
@@ -55,7 +55,7 @@ module JsRoutes
         'ROUTES_OBJECT'       => routes_object,
         'RAILS_VERSION'       => ActionPack.version,
         'DEPRECATED_GLOBBING_BEHAVIOR' => ActionPack::VERSION::MAJOR == 4 && ActionPack::VERSION::MINOR == 0,
-
+        'DEPRECATED_FALSE_PARAMETER_BEHAVIOR' => ActionPack::VERSION::MAJOR < 7,
         'APP_CLASS'           => application.class.to_s,
         'DEFAULT_URL_OPTIONS' => json(@configuration.default_url_options),
         'PREFIX'              => json(@configuration.prefix),

data/lib/js_routes/middleware.rb

@@ -21,12 +21,16 @@ module JsRoutes
     def update_js_routes
       new_mtime = routes_mtime
       unless new_mtime == @mtime
-        JsRoutes.generate!
-        JsRoutes.definitions!
+        regenerate
         @mtime = new_mtime
       end
     end
 
+    def regenerate
+      JsRoutes.generate!
+      JsRoutes.definitions!
+    end
+
     def routes_mtime
       File.mtime(@routes_file)
     rescue Errno::ENOENT

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 module JsRoutes
-  VERSION = "2.2.3"
+  VERSION = "2.2.5"
 end

data/lib/routes.d.ts

@@ -53,6 +53,7 @@ declare type KeywordUrlOptions = Optional<{
     port: string | number;
     anchor: string;
     trailing_slash: boolean;
+    params: RouteParameters;
 }>;
 declare type RouteOptions = KeywordUrlOptions & RouteParameters;
 declare type PartsTable = Record<string, {
@@ -63,6 +64,7 @@ declare type ModuleType = "CJS" | "AMD" | "UMD" | "ESM" | "DTS" | "NIL";
 declare const RubyVariables: {
     PREFIX: string;
     DEPRECATED_GLOBBING_BEHAVIOR: boolean;
+    DEPRECATED_FALSE_PARAMETER_BEHAVIOR: boolean;
     SPECIAL_OPTIONS_KEY: string;
     DEFAULT_URL_OPTIONS: RouteParameters;
     SERIALIZER: Serializer;

data/lib/routes.js

@@ -2,7 +2,10 @@
  * File generated by js-routes RubyVariables.GEM_VERSION
  * Based on Rails RubyVariables.RAILS_VERSION routes of RubyVariables.APP_CLASS
  */
-RubyVariables.WRAPPER(() => {
+// eslint-disable-next-line
+RubyVariables.WRAPPER(
+// eslint-disable-next-line
+() => {
     const hasProp = (value, key) => Object.prototype.hasOwnProperty.call(value, key);
     let NodeTypes;
     (function (NodeTypes) {
@@ -176,7 +179,11 @@ RubyVariables.WRAPPER(() => {
         }
         path_identifier(object) {
             const result = this.unwrap_path_identifier(object);
-            return this.is_nullable(result) || result === false ? "" : "" + result;
+            return this.is_nullable(result) ||
+                (RubyVariables.DEPRECATED_FALSE_PARAMETER_BEHAVIOR &&
+                    result === false)
+                ? ""
+                : "" + result;
         }
         unwrap_path_identifier(object) {
             let result = object;
@@ -222,12 +229,23 @@ RubyVariables.WRAPPER(() => {
                 ...options,
             };
             const keyword_parameters = {};
-            const query_parameters = {};
+            let query_parameters = {};
             for (const key in options) {
                 if (!hasProp(options, key))
                     continue;
                 const value = options[key];
-                if (this.is_reserved_option(key)) {
+                if (key === "params") {
+                    if (this.is_object(value)) {
+                        query_parameters = {
+                            ...query_parameters,
+                            ...value,
+                        };
+                    }
+                    else {
+                        throw new Error("params value should always be an object");
+                    }
+                }
+                else if (this.is_reserved_option(key)) {
                     keyword_parameters[key] = value;
                 }
                 else {
@@ -251,7 +269,7 @@ RubyVariables.WRAPPER(() => {
             return { keyword_parameters, query_parameters };
         }
         build_route(parts, required_params, default_options, route, absolute, args) {
-            const { keyword_parameters, query_parameters, } = this.partition_parameters(parts, required_params, default_options, args);
+            const { keyword_parameters, query_parameters } = this.partition_parameters(parts, required_params, default_options, args);
             const missing_params = required_params.filter((param) => !hasProp(query_parameters, param) ||
                 this.is_nullable(query_parameters[param]));
             if (missing_params.length) {

data/lib/routes.ts

@@ -70,6 +70,7 @@ type KeywordUrlOptions = Optional<{
   port: string | number;
   anchor: string;
   trailing_slash: boolean;
+  params: RouteParameters;
 }>;
 
 type RouteOptions = KeywordUrlOptions & RouteParameters;
@@ -81,6 +82,7 @@ type ModuleType = "CJS" | "AMD" | "UMD" | "ESM" | "DTS" | "NIL";
 declare const RubyVariables: {
   PREFIX: string;
   DEPRECATED_GLOBBING_BEHAVIOR: boolean;
+  DEPRECATED_FALSE_PARAMETER_BEHAVIOR: boolean;
   SPECIAL_OPTIONS_KEY: string;
   DEFAULT_URL_OPTIONS: RouteParameters;
   SERIALIZER: Serializer;
@@ -95,7 +97,9 @@ declare const define:
 
 declare const module: { exports: any } | undefined;
 
+// eslint-disable-next-line
 RubyVariables.WRAPPER(
+  // eslint-disable-next-line
   (): RouterExposedMethods => {
     const hasProp = (value: unknown, key: string) =>
       Object.prototype.hasOwnProperty.call(value, key);
@@ -222,7 +226,7 @@ RubyVariables.WRAPPER(
       "port",
       "protocol",
     ] as const;
-    type ReservedOption = typeof ReservedOptions[any];
+    type ReservedOption = (typeof ReservedOptions)[any];
 
     class UtilsClass {
       configuration: Configuration = {
@@ -233,7 +237,7 @@ RubyVariables.WRAPPER(
           RubyVariables.SERIALIZER || this.default_serializer.bind(this),
       };
 
-      default_serializer(value: any, prefix?: string | null): string {
+      default_serializer(value: unknown, prefix?: string | null): string {
         if (this.is_nullable(value)) {
           return "";
         }
@@ -292,14 +296,16 @@ RubyVariables.WRAPPER(
           }
           return {
             args: args.slice(0, args.length - 1),
-            options: (last_el as any) as RouteOptions,
+            options: last_el as unknown as RouteOptions,
           };
         } else {
           return { args, options: {} };
         }
       }
 
-      looks_like_serialized_model(object: any): object is ModelRouteParameter {
+      looks_like_serialized_model(
+        object: unknown
+      ): object is ModelRouteParameter {
         return (
           this.is_object(object) &&
           !(this.configuration.special_options_key in object) &&
@@ -309,11 +315,15 @@ RubyVariables.WRAPPER(
 
       path_identifier(object: QueryRouteParameter): string {
         const result = this.unwrap_path_identifier(object);
-        return this.is_nullable(result) || result === false ? "" : "" + result;
+        return this.is_nullable(result) ||
+          (RubyVariables.DEPRECATED_FALSE_PARAMETER_BEHAVIOR &&
+            result === false)
+          ? ""
+          : "" + result;
       }
 
       unwrap_path_identifier(object: QueryRouteParameter): unknown {
-        let result: any = object;
+        let result: unknown = object;
         if (!this.is_object(object)) {
           return object;
         }
@@ -365,11 +375,20 @@ RubyVariables.WRAPPER(
         };
 
         const keyword_parameters: KeywordUrlOptions = {};
-        const query_parameters: RouteParameters = {};
+        let query_parameters: RouteParameters = {};
         for (const key in options) {
           if (!hasProp(options, key)) continue;
           const value = options[key];
-          if (this.is_reserved_option(key)) {
+          if (key === "params") {
+            if (this.is_object(value)) {
+              query_parameters = {
+                ...query_parameters,
+                ...(value as RouteParameters),
+              };
+            } else {
+              throw new Error("params value should always be an object");
+            }
+          } else if (this.is_reserved_option(key)) {
             keyword_parameters[key] = value as any;
           } else {
             if (
@@ -401,15 +420,13 @@ RubyVariables.WRAPPER(
         absolute: boolean,
         args: OptionalRouteParameter[]
       ): string {
-        const {
-          keyword_parameters,
-          query_parameters,
-        } = this.partition_parameters(
-          parts,
-          required_params,
-          default_options,
-          args
-        );
+        const { keyword_parameters, query_parameters } =
+          this.partition_parameters(
+            parts,
+            required_params,
+            default_options,
+            args
+          );
         const missing_params = required_params.filter(
           (param) =>
             !hasProp(query_parameters, param) ||

data/package.json

@@ -12,13 +12,13 @@
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^4.9.0",
     "@typescript-eslint/parser": "^4.9.0",
-    "eslint": "^7.14.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint": "^8.35.0",
+    "eslint-config-prettier": "^8.7.0",
+    "eslint-plugin-import": "^2.27.5",
     "husky": "^4.3.0",
     "lint-staged": "^10.5.2",
     "pinst": "^2.1.1",
-    "prettier": "^2.2.1"
+    "prettier": "^2.8.4"
   },
   "scripts": {
     "build": "tsc && yarn lint:fix",
@@ -31,7 +31,8 @@
     }
   },
   "lint-staged": {
-    "./lib/routes.ts": ["yarn lint:fix" ]
+    "./lib/routes.ts": [
+      "yarn lint:fix"
+    ]
   }
-
 }

data/spec/js_routes/default_serializer_spec.rb

@@ -3,29 +3,29 @@ require "spec_helper"
 describe JsRoutes, "#serialize" do
 
   before(:each) do
-    evaljs(JsRoutes.generate({module_type: nil, namespace: 'Routes'}))
+    evaljs(JsRoutes.generate(module_type: nil, namespace: 'Routes'))
   end
 
   it "should provide this method" do
-    expect(evaljs("Routes.serialize({a: 1, b: [2,3], c: {d: 4, e: 5}, f: ''})")).to eq(
+    expectjs("Routes.serialize({a: 1, b: [2,3], c: {d: 4, e: 5}, f: ''})").to eq(
       "a=1&b%5B%5D=2&b%5B%5D=3&c%5Bd%5D=4&c%5Be%5D=5&f="
     )
   end
 
   it "should provide this method" do
-    expect(evaljs("Routes.serialize({a: 1, b: [2,3], c: {d: 4, e: 5}, f: ''})")).to eq(
+    expectjs("Routes.serialize({a: 1, b: [2,3], c: {d: 4, e: 5}, f: ''})").to eq(
       "a=1&b%5B%5D=2&b%5B%5D=3&c%5Bd%5D=4&c%5Be%5D=5&f="
     )
   end
 
   it "works with JS suckiness" do
-    expect(evaljs(
+    expectjs(
       [
         "const query = Object.create(null);",
         "query.a = 1;",
         "query.b = 2;",
         "Routes.serialize(query);",
       ].join("\n")
-    )).to eq("a=1&b=2")
+    ).to eq("a=1&b=2")
   end
 end