Skip to content

Commit 9700559

Browse files
authored
Merge pull request #947 from DavyJonesLocker/chore/updates
Minor updates
2 parents dfcd0b5 + 15f0bce commit 9700559

File tree

10 files changed

+28
-23
lines changed

10 files changed

+28
-23
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## main / unreleased
4+
5+
* [ENHANCEMENT] Update QUnit to 2.22.0
6+
* [ENHANCEMENT] Prefer `require_relative` for internal requires
7+
38
## 22.2.0 / 2026-06-01
49

510
* [FEATURE] Allow Rails 8.0 alpha

lib/client_side_validations.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# frozen_string_literal: true
22

3-
require 'client_side_validations/config'
4-
require 'client_side_validations/active_model' if defined?(ActiveModel)
5-
require 'client_side_validations/active_record' if defined?(ActiveRecord)
6-
require 'client_side_validations/action_view' if defined?(ActionView)
3+
require_relative 'client_side_validations/config'
4+
require_relative 'client_side_validations/active_model' if defined?(ActiveModel)
5+
require_relative 'client_side_validations/active_record' if defined?(ActiveRecord)
6+
require_relative 'client_side_validations/action_view' if defined?(ActionView)
77

88
if defined?(Rails)
9-
require 'client_side_validations/engine'
10-
require 'client_side_validations/generators'
9+
require_relative 'client_side_validations/engine'
10+
require_relative 'client_side_validations/generators'
1111
end

lib/client_side_validations/action_view.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ module Helpers
77
end
88
end
99

10-
require 'client_side_validations/core_ext'
11-
require 'client_side_validations/action_view/form_helper'
10+
require_relative 'core_ext'
11+
require_relative 'action_view/form_helper'
1212

1313
if ActionView::Helpers::FormHelper.method_defined?(:form_with)
14-
require 'client_side_validations/action_view/form_with_helper'
14+
require_relative 'action_view/form_with_helper'
1515
end
1616

17-
require 'client_side_validations/action_view/form_builder'
17+
require_relative 'action_view/form_builder'
1818

1919
ActiveSupport.on_load(:action_view) { include ClientSideValidations::ActionView::Helpers::FormHelper }
2020
ActionView::Helpers::FormBuilder.prepend ClientSideValidations::ActionView::Helpers::FormBuilder

lib/client_side_validations/active_model.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# frozen_string_literal: true
22

3-
require 'client_side_validations/core_ext'
4-
require 'client_side_validations/extender'
5-
require 'client_side_validations/active_model/conditionals'
3+
require_relative 'core_ext'
4+
require_relative 'extender'
5+
require_relative 'active_model/conditionals'
66

77
module ClientSideValidations
88
module ActiveModel

lib/client_side_validations/active_record.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# frozen_string_literal: true
22

3-
require 'client_side_validations/active_model'
4-
require 'client_side_validations/extender'
3+
require_relative 'active_model'
54

65
ActiveSupport.on_load(:active_record) { include ClientSideValidations::ActiveModel::Validations }
76

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# frozen_string_literal: true
22

33
require 'active_support/json'
4-
require 'client_side_validations/core_ext/range'
5-
require 'client_side_validations/core_ext/regexp'
4+
5+
require_relative 'core_ext/range'
6+
require_relative 'core_ext/regexp'

lib/client_side_validations/generators.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ def self.assets
1414
end
1515
end
1616

17-
require 'client_side_validations/generators/rails_validations'
17+
require_relative 'generators/rails_validations'

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
"@rollup/plugin-babel": "^6.0.4",
2828
"@rollup/plugin-node-resolve": "^15.2.2",
2929
"chrome-launcher": "^1.1.2",
30-
"puppeteer-core": "^23.2.0",
31-
"rollup": "^4.21.1",
30+
"puppeteer-core": "^23.4.0",
31+
"rollup": "^4.22.0",
3232
"rollup-plugin-copy": "^3.5.0",
33-
"standard": "^17.1.0"
33+
"standard": "^17.1.2"
3434
},
3535
"dependencies": {},
3636
"peerDependencies": {

test/javascript/public/test/validators/confirmation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
QUnit.module('Confirmation options', {
22
beforeEach: function () {
33
$('#qunit-fixture')
4-
.append('<input id="password" type="password" />')
4+
.append('<input id="password" type="password" autocomplete="new-password" />')
55
.append('<input id="password_confirmation" type="password" />')
66
.append('<input id="username" type="text" />')
77
.append('<input id="username_confirmation" type="text" />')

test/javascript/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def call(env)
3030
use AssetPath, urls: ['/vendor/assets/javascripts'], root: File.expand_path('../', $LOAD_PATH.find { |p| p.include?('jquery-rails') })
3131

3232
DEFAULT_JQUERY_VERSION = '3.7.1'
33-
QUNIT_VERSION = '2.21.0'
33+
QUNIT_VERSION = '2.22.0'
3434

3535
helpers do
3636
def jquery_version

0 commit comments

Comments
 (0)