Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
- Use Node 20
- Update node dependencies
- Update Ruby dependencies
- Fix new offenses
- Remove timeliness gen in favour of built-in comparison validator
  • Loading branch information
tagliala committed Jan 5, 2024
1 parent 0eb454b commit dd4a467
Show file tree
Hide file tree
Showing 15 changed files with 171 additions and 265 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'
cache: 'yarn'
- name: Yarn
run: yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'
cache: 'yarn'
- name: Yarn
run: yarn
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ gem 'slim-rails', '~> 3.6'
gem 'sucker_punch', '~> 3.2'
gem 'turbolinks', '~> 5.2'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
gem 'validates_timeliness', '~> 7.0.0.beta2'

group :development, :test do
gem 'bullet'
Expand Down
25 changes: 10 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ GEM
bootsnap (1.17.0)
msgpack (~> 1.2)
builder (3.2.4)
bullet (7.1.4)
bullet (7.1.5)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
Expand Down Expand Up @@ -155,7 +155,7 @@ GEM
faraday-net_http (3.0.2)
friendly_id (5.5.1)
activerecord (>= 4.0.0)
glob (0.4.0)
glob (0.4.1)
globalid (1.2.1)
activesupport (>= 6.1)
hashdiff (1.1.0)
Expand Down Expand Up @@ -212,7 +212,7 @@ GEM
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mime-types (3.5.1)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1205)
mini_mime (1.1.5)
Expand All @@ -221,14 +221,14 @@ GEM
msgpack (1.7.2)
multi_xml (0.6.0)
mutex_m (0.2.0)
net-imap (0.4.9)
net-imap (0.4.9.1)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-smtp (0.4.0.1)
net-protocol
netrc (0.11.0)
newrelic_rpm (9.6.0)
Expand Down Expand Up @@ -275,7 +275,7 @@ GEM
psych (5.1.2)
stringio
public_suffix (5.0.4)
puma (6.4.0)
puma (6.4.1)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.8)
Expand Down Expand Up @@ -373,9 +373,9 @@ GEM
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.19.0)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.24.0)
rubocop-factory_bot (2.25.0)
rubocop (~> 1.33)
rubocop-performance (1.20.1)
rubocop (>= 1.48.1, < 2.0)
Expand All @@ -385,7 +385,7 @@ GEM
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rspec (2.25.0)
rubocop-rspec (2.26.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
Expand Down Expand Up @@ -434,7 +434,6 @@ GEM
temple (0.10.3)
thor (1.3.0)
tilt (2.3.0)
timeliness (0.4.5)
timeout (0.4.1)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
Expand All @@ -443,9 +442,6 @@ GEM
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uniform_notifier (1.16.0)
validates_timeliness (7.0.0.beta2)
activemodel (>= 7.0.0, < 8)
timeliness (>= 0.3.10, < 1)
version_gem (1.1.3)
warden (1.2.9)
rack (>= 2.0.9)
Expand Down Expand Up @@ -519,12 +515,11 @@ DEPENDENCIES
sucker_punch (~> 3.2)
turbolinks (~> 5.2)
tzinfo-data
validates_timeliness (~> 7.0.0.beta2)
web-console
webmock

RUBY VERSION
ruby 3.2.2p53

BUNDLED WITH
2.5.3
2.5.4
4 changes: 2 additions & 2 deletions app/models/itinerary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ def name
validates :num_people, numericality: { only_integer: true, greater_than: 0, less_than: 10 }, allow_blank: true
validates :fuel_cost, numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than: 10_000 }
validates :tolls, numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than: 10_000 }
validates :leave_date, timeliness: { on_or_after: -> { Time.current } }, if: :will_save_change_to_leave_date?
validates :return_date, presence: true, timeliness: { on_or_after: :leave_date }, if: :round_trip?
validates :leave_date, comparison: { greater_than_or_equal_to: -> { Time.current } }, if: :will_save_change_to_leave_date?
validates :return_date, presence: true, comparison: { greater_than_or_equal_to: :leave_date }, if: :round_trip?

validate :driver_is_female, if: -> { pink }

Expand Down
42 changes: 0 additions & 42 deletions config/initializers/validates_timeliness.rb

This file was deleted.

17 changes: 0 additions & 17 deletions config/locales/validate_timeliness.it-IT.yml

This file was deleted.

17 changes: 0 additions & 17 deletions config/locales/validates_timeliness.en-US.yml

This file was deleted.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"version": "1.0.0",
"engines": {
"node": ">= 18.0",
"node": ">= 20.0",
"yarn": "^1.19.0"
},
"dependencies": {
Expand Down Expand Up @@ -33,13 +33,13 @@
"jquery": "^3.7.1",
"jquery-ujs": "^1.2.3",
"mini-css-extract-plugin": "^2.7.6",
"postcss": "^8.4.32",
"postcss": "^8.4.33",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-import": "^15.1.0",
"postcss-import": "^16.0.0",
"postcss-loader": "^7.3.4",
"postcss-preset-env": "^9.3.0",
"resolve-url-loader": "^5.0.0",
"sass": "~1.69.5",
"sass": "~1.69.7",
"sass-loader": "^13.3.3",
"shakapacker": "7.2.1",
"style-loader": "^3.3.3",
Expand All @@ -57,7 +57,7 @@
"eslint": ">=8.27.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.6.0",
"eslint-plugin-n": "^16.6.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-webpack-plugin": "^4.0.1",
"stylelint": "^15.11.0",
Expand Down
8 changes: 4 additions & 4 deletions spec/system/conversations_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
visit new_conversation_path(itinerary_id: itinerary.id)

fill_in 'conversation_message_body', with: message
click_button t('conversations.form.send')
click_on t('conversations.form.send')
expect(page).to have_content message
fill_in 'conversation_message_body', with: another_message
click_button t('conversations.form.send')
click_on t('conversations.form.send')
expect(page).to have_content message
expect(page).to have_content another_message
end
Expand All @@ -42,7 +42,7 @@
login_via_auth0
visit new_conversation_path(itinerary_id: itinerary.id)

click_button t('conversations.form.send')
click_on t('conversations.form.send')

expect(page).to have_css '.alert-danger'
end
Expand All @@ -58,7 +58,7 @@
login_via_auth0
visit conversation_path(conversation, itinerary_id: itinerary.id)

click_button t('conversations.form.send')
click_on t('conversations.form.send')

expect(page).to have_css '.alert-danger'
end
Expand Down
22 changes: 11 additions & 11 deletions spec/system/feedbacks_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

login_via_auth0

click_link Feedback.model_name.human
click_link t('helpers.links.new')
click_on Feedback.model_name.human
click_on t('helpers.links.new')
fill_in 'feedback_message', with: 'This is a new feedback'
click_button t('helpers.submit.create', model: Feedback)
click_on t('helpers.submit.create', model: Feedback)
expect(page).to have_current_path feedbacks_path
expect(page).to have_content t('flash.feedbacks.success.create')
end
Expand All @@ -23,9 +23,9 @@
login_via_auth0
visit feedback_path(feedback)

click_link t('helpers.links.edit')
click_on t('helpers.links.edit')
fill_in 'feedback_message', with: 'This is a modified message'
click_button t('helpers.submit.update', model: Feedback)
click_on t('helpers.submit.update', model: Feedback)
expect(page).to have_current_path feedbacks_path
expect(page).to have_content t('flash.feedbacks.success.update')
expect(feedback.reload.message).to eq 'This is a modified message'
Expand All @@ -38,9 +38,9 @@
login_via_auth0
visit feedback_path(feedback)

click_link t('helpers.links.edit')
click_on t('helpers.links.edit')
fill_in 'feedback_message', with: 'This is a modified message'
click_button t('helpers.submit.update', model: Feedback)
click_on t('helpers.submit.update', model: Feedback)
expect(page).to have_current_path feedbacks_path
expect(page).to have_content t('flash.feedbacks.success.update')
expect(feedback.reload.message).to eq 'This is a modified message'
Expand All @@ -53,9 +53,9 @@
login_via_auth0
visit feedback_path(feedback)

click_link t('helpers.links.edit')
click_on t('helpers.links.edit')
select 'fixed', from: 'feedback_status'
click_button t('helpers.submit.update', model: Feedback)
click_on t('helpers.submit.update', model: Feedback)
expect(page).to have_current_path feedbacks_path
expect(page).to have_content t('flash.feedbacks.success.update')
expect(feedback.reload.fixed?).to be true
Expand Down Expand Up @@ -106,7 +106,7 @@
login_via_auth0
visit new_feedback_path

click_button t('helpers.submit.create', model: Feedback)
click_on t('helpers.submit.create', model: Feedback)
expect(page).to have_css '.alert-danger'
end

Expand All @@ -117,7 +117,7 @@
login_via_auth0
visit edit_feedback_path(feedback)
fill_in 'feedback_message', with: ''
click_button t('helpers.submit.update', model: Feedback)
click_on t('helpers.submit.update', model: Feedback)
expect(page).to have_css '.alert-danger'
end
end
Loading

0 comments on commit dd4a467

Please sign in to comment.