diff --git a/Gemfile.lock b/Gemfile.lock index 4c89fb496..022646b21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ PATH highline (~> 2.1.0) jbuilder (~> 2.11) jquery-rails (~> 4.5.1) - jquery-ui-rails (~> 6.0.1) + jquery-ui-rails (~> 7.0.0) json-schema (~> 3.0.0) kaminari-actionview (~> 1.2.2) kaminari-mongoid (~> 1.0.2) @@ -34,7 +34,7 @@ PATH origin (~> 2.3.1) pundit (~> 2.3.0) rack-cache (~> 1.14.0) - rails (>= 7.1) + rails (>= 7.1.3.1) rails-html-sanitizer (~> 1.6.0) rails-i18n (~> 7.0.6) responders (~> 3.1.0) @@ -49,27 +49,27 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.3.4) - actioncable (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + actioncable (7.1.3.2) + actionpack (= 7.1.3.2) + activesupport (= 7.1.3.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) + actionmailbox (7.1.3.2) + actionpack (= 7.1.3.2) + activejob (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.2) - actionpack (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activesupport (= 7.1.2) + actionmailer (7.1.3.2) + actionpack (= 7.1.3.2) + actionview (= 7.1.3.2) + activejob (= 7.1.3.2) + activesupport (= 7.1.3.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop @@ -77,9 +77,9 @@ GEM rails-dom-testing (~> 2.2) actionmailer-with-request (0.5.0) rails (>= 5) - actionpack (7.1.2) - actionview (= 7.1.2) - activesupport (= 7.1.2) + actionpack (7.1.3.2) + actionview (= 7.1.3.2) + activesupport (= 7.1.3.2) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -87,35 +87,35 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.2) - actionpack (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) + actiontext (7.1.3.2) + actionpack (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.2) - activesupport (= 7.1.2) + actionview (7.1.3.2) + activesupport (= 7.1.3.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.2) - activesupport (= 7.1.2) + activejob (7.1.3.2) + activesupport (= 7.1.3.2) globalid (>= 0.3.6) - activemodel (7.1.2) - activesupport (= 7.1.2) - activerecord (7.1.2) - activemodel (= 7.1.2) - activesupport (= 7.1.2) + activemodel (7.1.3.2) + activesupport (= 7.1.3.2) + activerecord (7.1.3.2) + activemodel (= 7.1.3.2) + activesupport (= 7.1.3.2) timeout (>= 0.4.0) - activestorage (7.1.2) - actionpack (= 7.1.2) - activejob (= 7.1.2) - activerecord (= 7.1.2) - activesupport (= 7.1.2) + activestorage (7.1.3.2) + actionpack (= 7.1.3.2) + activejob (= 7.1.3.2) + activerecord (= 7.1.3.2) + activesupport (= 7.1.3.2) marcel (~> 1.0) - activesupport (7.1.2) + activesupport (7.1.3.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -125,18 +125,18 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) adomain (0.2.4) addressable (~> 2.5) logger attr_extras (7.1.0) - autoprefixer-rails (10.4.15.0) + autoprefixer-rails (10.4.16.0) execjs (~> 2) base64 (0.2.0) bazaar (0.0.2) bcrypt (3.1.20) - bigdecimal (3.1.4) + bigdecimal (3.1.7) bindex (0.8.1) bootstrap-kaminari-views (0.0.5) kaminari (>= 0.13) @@ -173,7 +173,7 @@ GEM execjs coffee-script-source (1.12.2) colorize (1.1.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) crass (1.0.6) custom_fields (2.14.0.alpha1) @@ -198,14 +198,13 @@ GEM warden (~> 1.2.3) devise-encryptable (0.2.0) devise (>= 2.1.0) - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) dragonfly (1.4.0) addressable (~> 2.3) multi_json (~> 1.0) rack (>= 1.3) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) dry-core (1.0.1) concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) @@ -214,7 +213,8 @@ GEM concurrent-ruby (~> 1.0) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) - dry-types (1.7.1) + dry-types (1.7.2) + bigdecimal (~> 3.0) concurrent-ruby (~> 1.0) dry-core (~> 1.0) dry-inflector (~> 1.0) @@ -228,9 +228,9 @@ GEM error_highlight (0.6.0) erubi (1.12.0) execjs (2.9.1) - factory_bot (6.4.0) + factory_bot (6.4.6) activesupport (>= 5.0.0) - factory_bot_rails (6.4.0) + factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) ffi (1.16.3) @@ -255,12 +255,12 @@ GEM httparty (0.16.4) mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.11.0) + io-console (0.7.2) + irb (1.12.0) rdoc - reline (>= 0.3.8) + reline (>= 0.4.2) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -268,7 +268,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) + jquery-ui-rails (7.0.0) railties (>= 3.2.16) json-schema (3.0.0) addressable (>= 2.8) @@ -332,14 +332,14 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) - mime-types (3.5.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.1003) + mime-types-data (3.2024.0305) mimetype-fu (0.1.2) mini_mime (1.1.5) - minitest (5.20.0) + minitest (5.22.3) moneta (1.6.0) monetize (1.12.0) money (~> 6.12) @@ -347,7 +347,7 @@ GEM i18n (>= 0.6.4, <= 2) mongo (2.19.3) bson (>= 4.14.1, < 5.0.0) - mongoid (8.0.7) + mongoid (8.0.8) activemodel (>= 5.1, < 7.2, != 7.0.0) mongo (>= 2.18.0, < 3.0.0) ruby2_keywords (~> 0.0.5) @@ -364,31 +364,31 @@ GEM mustermann-grape (1.0.2) mustermann (>= 1.0.0) mutex_m (0.2.0) - net-imap (0.4.5) + net-imap (0.4.10) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0) + net-smtp (0.5.0) net-protocol - nio4r (2.6.0) - nokogiri (1.14.5-x86_64-darwin) + nio4r (2.7.1) + nokogiri (1.14.5-arm64-darwin) racc (~> 1.4) origin (2.3.1) orm_adapter (0.5.0) pony (1.13.1) mail (>= 2.0) - psych (5.1.1.1) + psych (5.1.2) stringio public_suffix (5.0.4) - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) pundit (2.3.1) activesupport (>= 3.0.0) racc (1.7.3) - rack (3.0.8) + rack (3.0.10) rack-accept (0.4.5) rack (>= 0.4) rack-cache (1.14.0) @@ -403,20 +403,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.2) - actioncable (= 7.1.2) - actionmailbox (= 7.1.2) - actionmailer (= 7.1.2) - actionpack (= 7.1.2) - actiontext (= 7.1.2) - actionview (= 7.1.2) - activejob (= 7.1.2) - activemodel (= 7.1.2) - activerecord (= 7.1.2) - activestorage (= 7.1.2) - activesupport (= 7.1.2) + rails (7.1.3.2) + actioncable (= 7.1.3.2) + actionmailbox (= 7.1.3.2) + actionmailer (= 7.1.3.2) + actionpack (= 7.1.3.2) + actiontext (= 7.1.3.2) + actionview (= 7.1.3.2) + activejob (= 7.1.3.2) + activemodel (= 7.1.3.2) + activerecord (= 7.1.3.2) + activestorage (= 7.1.3.2) + activesupport (= 7.1.3.2) bundler (>= 1.15.0) - railties (= 7.1.2) + railties (= 7.1.3.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -428,40 +428,40 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.8) + rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.2) - actionpack (= 7.1.2) - activesupport (= 7.1.2) + railties (7.1.3.2) + actionpack (= 7.1.3.2) + activesupport (= 7.1.3.2) irb rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rake (13.1.0) - rdoc (6.6.0) + rdoc (6.6.3.1) psych (>= 4.0.0) - regexp_parser (2.8.2) - reline (0.4.0) + regexp_parser (2.9.0) + reline (0.5.0) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.0.3) + rspec-support (~> 3.13.0) + rspec-rails (6.0.4) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -469,7 +469,7 @@ GEM rspec-expectations (~> 3.12) rspec-mocks (~> 3.12) rspec-support (~> 3.12) - rspec-support (3.12.1) + rspec-support (3.13.1) ruby2_keywords (0.0.5) rubyzip (2.3.2) sanitize (6.0.2) @@ -516,9 +516,9 @@ GEM sprockets (>= 3.0.0) ssrf_filter (1.0.8) stringex (2.8.6) - stringio (3.0.9) + stringio (3.1.0) temple (0.10.3) - thor (1.3.0) + thor (1.3.1) tilt (2.0.11) timeout (0.4.1) tzinfo (2.0.6) @@ -542,10 +542,10 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.3) - zeitwerk (2.6.12) + zeitwerk (2.6.13) PLATFORMS - x86_64-darwin-22 + arm64-darwin-22 DEPENDENCIES capybara (~> 3.39.0) diff --git a/locomotivecms.gemspec b/locomotivecms.gemspec index ac2caf767..59ac2b768 100644 --- a/locomotivecms.gemspec +++ b/locomotivecms.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.files = Dir['{app,config,db,lib,vendor}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md'] s.files.reject! { |fn| fn.include?('app/javascript') } - s.add_dependency 'rails', '>= 7.1' + s.add_dependency 'rails', '>= 7.1.3.1' s.add_dependency 'rails-html-sanitizer', '~> 1.6.0' s.add_dependency 'devise', '~> 4.9.3' @@ -48,7 +48,7 @@ Gem::Specification.new do |s| s.add_dependency 'sass-rails', '~> 6.0.0' s.add_dependency 'coffee-rails', '~> 5.0' s.add_dependency 'jquery-rails', '~> 4.5.1' - s.add_dependency 'jquery-ui-rails', '~> 6.0.1' + s.add_dependency 'jquery-ui-rails', '~> 7.0.0' s.add_dependency 'flash_cookie_session', '~> 1.1.6' s.add_dependency 'bootstrap-sass', '~> 3.4.1' diff --git a/spec/system/create_site_spec.rb b/spec/system/create_site_spec.rb index 76ce52fd2..09e3e3294 100644 --- a/spec/system/create_site_spec.rb +++ b/spec/system/create_site_spec.rb @@ -15,7 +15,7 @@ fill_in 'Name', with: '' click_button 'Create' message = page.find("#site_name").native.attribute("validationMessage") - expect(message).to eq "Please fill out this field." + expect(message).to eq "Please fill in this field." expect(page).not_to have_content('Site was successfully created.') end diff --git a/spec/system/sign_up_spec.rb b/spec/system/sign_up_spec.rb index 1526d97dd..ffb8badf5 100644 --- a/spec/system/sign_up_spec.rb +++ b/spec/system/sign_up_spec.rb @@ -17,7 +17,7 @@ sign_up_with 'John Doe', 'valid@example.com', '' expect(page).to have_content('Already have an account?') message = page.find("#locomotive_account_password").native.attribute("validationMessage") - expect(message).to eq "Please fill out this field." + expect(message).to eq "Please fill in this field." end it 'with not matching passwords' do