Skip to content

Commit

Permalink
Update development dependencies
Browse files Browse the repository at this point in the history
Fix new RuboCop offences
  • Loading branch information
tagliala committed Dec 2, 2020
1 parent 3913689 commit 3e87418
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 35 deletions.
7 changes: 7 additions & 0 deletions .rubocop.yml
@@ -1,6 +1,8 @@
require:
- rubocop-minitest
- rubocop-performance
- rubocop-rails
- rubocop-rake

AllCops:
TargetRailsVersion: 5.0
Expand Down Expand Up @@ -45,11 +47,16 @@ Metrics/ModuleLength:

Metrics/ParameterLists:
Max: 8
Exclude:
- 'test/**/*'

Metrics/PerceivedComplexity:
Exclude:
- 'test/**/*'

Minitest/MultipleAssertions:
Enabled: false

Rails/ApplicationRecord:
Exclude:
- 'test/**/*'
Expand Down
5 changes: 3 additions & 2 deletions Rakefile
Expand Up @@ -124,5 +124,6 @@ def test_url
@test_url ||= "http://localhost:#{test_port}"
end

task(:build).prerequisites.unshift task(:commit_javascript)
task(:build).prerequisites.unshift task(:regenerate_javascript)
# rubocop:disable Rake/Desc
task build: %i[regenerate_javascript commit_javascript]
# rubocop:enable Rake/Desc
6 changes: 4 additions & 2 deletions client_side_validations.gemspec
Expand Up @@ -36,10 +36,12 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'minitest', '~> 5.14'
spec.add_development_dependency 'mocha', '~> 1.11'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.4'
spec.add_development_dependency 'rubocop', '~> 1.5'
spec.add_development_dependency 'rubocop-minitest', '~> 0.10.1'
spec.add_development_dependency 'rubocop-performance', '~> 1.9'
spec.add_development_dependency 'rubocop-rails', '~> 2.8'
spec.add_development_dependency 'simplecov', '>= 0.18.5', '< 0.20'
spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
spec.add_development_dependency 'simplecov', '>= 0.18.5', '< 0.21'
spec.add_development_dependency 'sqlite3', '~> 1.4'

# For QUnit testing
Expand Down
10 changes: 6 additions & 4 deletions test/action_view/cases/test_legacy_form_with_helpers.rb
Expand Up @@ -7,10 +7,6 @@ module ClientSideValidations
class LegacyFormWithActionViewHelpersTest < ::ActionView::TestCase
include ::ActionViewTestSetup

def automatic_id(id)
id if Rails.version >= '5.2'
end

BASE_FIELD_HELPERS.each do |field_helper, options|
define_method(:"test_form_with_#{field_helper}") do
form_with(model: @post) do |f|
Expand Down Expand Up @@ -135,6 +131,12 @@ def test_form_with_time_zone_select
end
assert_dom_equal expected, output_buffer
end

private

def automatic_id(id)
id if Rails.version >= '5.2'
end
end
end
end
40 changes: 21 additions & 19 deletions test/active_model/cases/test_validations.rb
Expand Up @@ -4,25 +4,6 @@

module ActiveModel
class ValidationsTest < ClientSideValidations::ActiveModelTestBase
class Person
include ::ActiveModel::Validations
attr_accessor :first_name, :last_name, :age, :weight

def self.name
'Person'
end

def new_record?
true
end
end

def new_person
person = Class.new(Person)
yield(person)
person.new
end

def test_validations_to_client_side_hash
person = new_person do |p|
p.validates_presence_of :first_name
Expand Down Expand Up @@ -533,5 +514,26 @@ def test_validations_to_client_side_hash_with_validator_is_disabled

assert_equal expected_hash, person.client_side_validation_hash
end

private

class Person
include ::ActiveModel::Validations
attr_accessor :first_name, :last_name, :age, :weight

def self.name
'Person'
end

def new_record?
true
end
end

def new_person
person = Class.new(Person)
yield(person)
person.new
end
end
end
18 changes: 10 additions & 8 deletions test/active_record/cases/test_uniqueness_validator.rb
Expand Up @@ -4,14 +4,6 @@

module ActiveRecord
class UniquenessValidatorTest < ClientSideValidations::ActiveRecordTestBase
def uniqueness_validator_options(hash)
if defined?(Rails.version) && Gem::Version.new(Rails.version) < Gem::Version.new('6.0.0.beta2')
{ case_sensitive: true }.merge(hash)
else
hash
end
end

def test_uniqueness_client_side_hash
expected_hash = uniqueness_validator_options(message: 'has already been taken')
assert_equal expected_hash, UniquenessValidator.new(attributes: [:name]).client_side_hash(@user, :name)
Expand Down Expand Up @@ -82,5 +74,15 @@ def test_uniqueness_client_side_hash_with_class_from_options
expected_hash = uniqueness_validator_options(message: 'has already been taken', class: 'user')
assert_equal expected_hash, UniquenessValidator.new(attributes: [:name], client_validations: { class: 'User' }).client_side_hash(@user, :name)
end

private

def uniqueness_validator_options(hash)
if defined?(Rails.version) && Gem::Version.new(Rails.version) < Gem::Version.new('6.0.0.beta2')
{ case_sensitive: true }.merge(hash)
else
hash
end
end
end
end
4 changes: 4 additions & 0 deletions test/generators/cases/test_generators.rb
Expand Up @@ -39,6 +39,8 @@ class InstallGeneratorTest < Rails::Generators::TestCase
assert_no_file 'public/javascripts/rails.validations.js'
end

private

def stub_configuration
Rails.stubs(:configuration).returns(mock('Configuration'))
end
Expand Down Expand Up @@ -72,6 +74,8 @@ class CopyAssetsGeneratorTest < Rails::Generators::TestCase
assert_file 'public/javascripts/rails.validations.js'
end

private

def stub_configuration
Rails.stubs(:configuration).returns(mock('Configuration'))
end
Expand Down

0 comments on commit 3e87418

Please sign in to comment.