From b103ac6e52056a460a4552f56271d438f4e98315 Mon Sep 17 00:00:00 2001 From: Pavel Date: Fri, 20 Dec 2024 15:13:50 +0200 Subject: [PATCH] Fixed bags --- Gemfile.lock | 449 ++++++++++++----------- spec/features/people/edit_person_spec.rb | 4 +- spec/features/people/show_person_spec.rb | 2 +- spec/views/people/show.html.haml_spec.rb | 6 +- 4 files changed, 249 insertions(+), 212 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2f9caee3..95b3c081 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GIT GEM remote: https://rubygems.org/ specs: - Ascii85 (1.1.0) + Ascii85 (1.1.1) actioncable (5.0.7) actionpack (= 5.0.7) nio4r (>= 1.2, < 3.0) @@ -48,185 +48,219 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) afm (0.2.2) - airbrussh (1.4.0) + airbrussh (1.5.3) sshkit (>= 1.6.1, != 1.7.0) arel (7.1.4) ast (2.4.2) - autoprefixer-rails (10.4.16.0) + autoprefixer-rails (10.4.19.0) execjs (~> 2) axlsx (2.0.1) htmlentities (~> 4.3.1) nokogiri (>= 1.4.1) rubyzip (~> 1.0.0) - bcrypt (3.1.16) - better_errors (2.8.0) - coderay (>= 1.0.0) + base64 (0.2.0) + bcrypt (3.1.20) + better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) + rouge (>= 1.0.0) + binding_of_caller (1.0.1) + debug_inspector (>= 1.2.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - builder (3.2.4) - callsite (0.0.11) - capistrano (3.11.2) + builder (3.3.0) + capistrano (3.19.2) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capybara (2.18.0) + capybara (3.32.2) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) carrierwave (0.10.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - chunky_png (1.3.8) + childprocess (5.1.0) + logger (~> 1.5) + chunky_png (1.4.0) cliver (0.3.2) - codeclimate-test-reporter (0.6.0) - simplecov (>= 0.7.1, < 1.0.0) + codeclimate-test-reporter (1.0.9) + simplecov (<= 0.13) coderay (1.1.3) - coffee-rails (4.2.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - concurrent-ruby (1.1.10) - connection_pool (2.2.0) + coffee-script-source (1.12.2) + concurrent-ruby (1.3.4) + connection_pool (2.2.5) crass (1.0.6) - database_cleaner (1.5.3) - debug_inspector (0.0.2) + database_cleaner (2.1.0) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.2.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + debug_inspector (1.2.0) devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) responders warden (~> 1.2.3) - diff-lcs (1.2.5) + diff-lcs (1.5.1) docile (1.1.5) - erubi (1.12.0) + e2mmap (0.1.0) + erubi (1.13.1) erubis (2.7.0) - et-orbi (1.1.6) + et-orbi (1.2.11) tzinfo execjs (2.9.0) - factory_girl (4.7.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) - faraday (0.10.1) - multipart-post (>= 1.2, < 3) - fast_blank (1.0.0) - ffaker (2.2.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + fast_blank (1.0.1) + ffaker (2.16.0) ffi (1.15.5) - font-awesome-sass (4.7.0) - sass (>= 3.2) - foreman (0.82.0) - thor (~> 0.19.1) - fugit (1.1.6) - et-orbi (~> 1.1, >= 1.1.6) - raabro (~> 1.1) - fuubar (2.2.0) + font-awesome-sass (6.7.2) + sassc (~> 2.0) + foreman (0.88.1) + fugit (1.11.1) + et-orbi (~> 1, >= 1.2.11) + raabro (~> 1.4) + fuubar (2.5.1) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - given_core (3.8.0) + given_core (3.8.2) sorcerer (>= 0.3.7) global_phone (1.0.1) globalid (0.4.2) activesupport (>= 4.2.0) - haml (4.0.7) + haml (6.1.4) + temple (>= 0.8.2) + thor tilt - haml-rails (0.9.0) - actionpack (>= 4.0.1) - activesupport (>= 4.0.1) - haml (>= 4.0.6, < 5.0) - html2haml (>= 1.0.1) - railties (>= 4.0.1) - haml_lint (0.37.1) - haml (>= 4.0, < 5.3) + haml-rails (0.1) + haml_lint (0.45.0) + haml (>= 4.0, < 6.2) parallel (~> 1.10) rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) hashery (2.1.2) - html2haml (2.0.0) - erubis (~> 2.7.0) - haml (~> 4.0.0) - nokogiri (~> 1.6.0) - ruby_parser (~> 3.5) htmlentities (4.3.4) - i18n (1.10.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (7.0.0) railties (>= 3.2.16) - json (2.6.3) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - launchy (2.4.3) - addressable (~> 2.3) - letter_opener (1.7.0) - launchy (~> 2.2) + json (2.7.6) + kaminari (1.2.2) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) + actionview + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) + activerecord + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) + launchy (3.0.1) + addressable (~> 2.8) + childprocess (~> 5.0) + letter_opener (1.10.0) + launchy (>= 2.2, < 4) letter_opener_web (1.3.4) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - loofah (2.19.1) + logger (1.5.3) + loofah (2.21.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - meta_request (0.4.0) - callsite (~> 0.0, >= 0.0.11) - rack-contrib (~> 1.1) - railties (>= 3.0.0, < 5.1.0) - method_source (0.8.2) - mime-types (3.4.1) + meta_request (0.8.5) + rack-contrib (>= 1.1, < 3) + railties (>= 3.0.0, < 9) + method_source (1.1.0) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - mini_magick (4.9.4) + mime-types-data (3.2024.1203) + mini_magick (5.0.1) mini_mime (1.1.2) - mini_portile2 (2.1.0) + mini_portile2 (2.4.0) minitest (5.15.0) - momentjs-rails (2.15.1) + momentjs-rails (2.29.4.1) railties (>= 3.1) - multipart-post (2.0.0) + multipart-post (2.3.0) mustache (1.1.1) nested_form (0.3.2) - net-scp (2.0.0) - net-ssh (>= 2.6.5, < 6.0.0) - net-ssh (5.2.0) - newrelic_rpm (6.7.0.359) - nio4r (2.7.0) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-ssh (6.1.0) + newrelic_rpm (9.16.1) + nio4r (2.7.3) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - paper_trail (5.2.2) - activerecord (>= 3.0, < 6.0) + ostruct (0.1.0) + paper_trail (10.3.1) + activerecord (>= 4.2) request_store (~> 1.1) parallel (1.20.1) parser (2.7.2.0) ast (~> 2.4.1) pdf-core (0.7.0) - pdf-reader (2.10.0) - Ascii85 (~> 1.0) + pdf-reader (2.13.0) + Ascii85 (>= 1.0, < 3.0, != 2.0.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (0.20.0) - pkg-config (1.5.6) + pg (1.2.3) poltergeist (1.18.1) capybara (>= 2.1, < 4) cliver (~> 0.3.1) @@ -234,8 +268,9 @@ GEM prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) - prawn-rails (1.4.2) + prawn-rails (1.6.0) actionview (>= 3.1.0) + activesupport (>= 3.1.0) prawn prawn-table prawn-table (0.2.2) @@ -243,28 +278,27 @@ GEM prawn-templates (0.1.2) pdf-reader (~> 2.0) prawn (~> 2.2) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-nav (0.2.4) - pry (>= 0.9.10, < 0.11.0) - pry-rails (0.3.4) - pry (>= 0.9.10) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-nav (1.0.0) + pry (>= 0.9.10, < 0.15) + pry-rails (0.3.11) + pry (>= 0.13.0) public_suffix (4.0.7) - puma (5.6.8) + puma (6.5.0) nio4r (~> 2.0) - pundit (1.1.0) + pundit (2.4.0) activesupport (>= 3.0.0) - raabro (1.1.6) - rack (2.2.6.4) - rack-contrib (1.2.0) - rack (>= 0.9.1) - rack-protection (1.5.3) + raabro (1.4.0) + rack (2.2.10) + rack-contrib (2.5.0) + rack (< 4) + rack-protection (2.2.4) rack rack-test (0.6.3) rack (>= 1.0) - rack_session_access (0.1.1) + rack_session_access (0.2.0) builder (>= 2.0.0) rack (>= 1.0.0) rails (5.0.7) @@ -279,12 +313,13 @@ GEM bundler (>= 1.3.0) railties (= 5.0.7) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.1) - actionpack (~> 5.x) - actionview (~> 5.x) - activesupport (~> 5.x) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) @@ -296,59 +331,57 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (13.0.6) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - react_on_rails (3.0.4) + rake (13.2.1) + react_on_rails (3.0.6) connection_pool execjs (~> 2.5) foreman rails (>= 3.2) rainbow (~> 2.1) - recaptcha (3.3.0) + recaptcha (5.9.0) json - redis (3.3.5) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) - redis-session-store (0.9.1) - actionpack (>= 3, < 5.1) - redis (~> 3) - regexp_parser (2.1.1) - request_store (1.3.1) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + redis (4.5.1) + redis-namespace (1.11.0) + redis (>= 4) + redis-session-store (0.11.4) + actionpack (>= 3, < 8) + redis (>= 3, < 5) + regexp_parser (1.8.2) + request_store (1.7.0) + rack (>= 1.4) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) rexml (3.2.5) - rmagick (5.3.0) - pkg-config (~> 1.4) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-activemodel-mocks (1.0.3) + rouge (3.30.0) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-activemodel-mocks (1.2.1) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.5.3) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-given (3.8.0) - given_core (= 3.8.0) + rspec-support (~> 3.13.0) + rspec-given (3.8.2) + given_core (= 3.8.2) rspec (>= 2.14.0) - rspec-mocks (3.5.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-support (~> 3.13.0) + rspec-rails (4.1.2) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.13.2) rubocop (1.7.0) parallel (~> 1.10) parser (>= 2.7.1.5) @@ -367,88 +400,92 @@ GEM ruby-lint (2.3.1) parser (~> 2.2) slop (~> 3.4, >= 3.4.7) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby-rc4 (0.1.5) - ruby_parser (3.8.2) - sexp_processor (~> 4.1) + ruby2_keywords (0.0.5) rubyzip (1.0.0) - rufus-scheduler (3.5.2) - fugit (~> 1.1, >= 1.1.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + rufus-scheduler (3.9.2) + fugit (~> 1.1, >= 1.11.1) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) ffi (~> 1.9) - sentry-raven (2.3.0) - faraday (>= 0.7.6, < 1.0) - sexp_processor (4.7.0) - shoulda-matchers (3.1.1) - activesupport (>= 4.0.0) - sidekiq (4.2.2) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) - rack-protection (~> 1.5) - redis (~> 3.2, >= 3.2.1) - sidekiq-scheduler (3.0.0) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + sentry-raven (3.1.2) + faraday (>= 1.0) + shoulda-matchers (4.5.1) + activesupport (>= 4.2.0) + sidekiq (5.2.10) + connection_pool (~> 2.2, >= 2.2.2) + rack (~> 2.0) + rack-protection (>= 1.5.0) + redis (~> 4.5, < 4.6.0) + sidekiq-scheduler (3.2.2) + e2mmap redis (>= 3, < 5) rufus-scheduler (~> 3.2) sidekiq (>= 3) + thwait tilt (>= 1.4.0) - simple_form (3.3.1) - actionpack (> 4, < 5.1) - activemodel (> 4, < 5.1) - simplecov (0.12.0) + simple_form (5.0.3) + actionpack (>= 5.0) + activemodel (>= 5.0) + simplecov (0.13.0) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) slop (3.6.0) - sorcerer (1.0.2) - sprockets (3.7.2) + sorcerer (2.0.1) + sprockets (3.7.5) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sprockets-svg (1.2.0) + sprockets-svg (1.3.0) chunky_png + mini_magick nokogiri - rmagick sprockets (>= 3) - sshkit (1.20.0) + sshkit (1.23.2) + base64 net-scp (>= 1.1.2) + net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) + ostruct sysexits (1.2.0) - thor (0.19.4) + temple (0.8.2) + thor (1.2.2) thread_safe (0.3.6) - tilt (2.0.10) + thwait (0.2.0) + e2mmap + tilt (2.4.0) ttfunk (1.6.2.1) tzinfo (1.2.11) thread_safe (~> 0.1) - tzinfo-data (1.2016.7) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - uglifier (4.2.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) unicode-display_width (1.8.0) - warden (1.2.6) - rack (>= 1.0) + warden (1.2.9) + rack (>= 2.0.9) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS - ruby + -darwin-24 DEPENDENCIES autoprefixer-rails @@ -517,4 +554,4 @@ DEPENDENCIES uglifier BUNDLED WITH - 1.17.3 + 2.3.27 diff --git a/spec/features/people/edit_person_spec.rb b/spec/features/people/edit_person_spec.rb index b22d760e..08088c47 100644 --- a/spec/features/people/edit_person_spec.rb +++ b/spec/features/people/edit_person_spec.rb @@ -31,8 +31,8 @@ end describe 'Gender' do - it_behaves_like :valid_select, 'Person', 'person[gender]', I18n.t('people.show.male'), "#{I18n.t('.gender')}: #{I18n.t('people.show.male')}" - it_behaves_like :valid_select, 'Person', 'person[gender]', I18n.t('people.show.female'), "#{I18n.t('.gender')}: #{I18n.t('people.show.female')}" + it_behaves_like :valid_select, 'Person', 'person[gender]', 'Чоловіча', "#{I18n.t('people.show.gender')}: #{I18n.t('people.show.male')}" + it_behaves_like :valid_select, 'Person', 'person[gender]', 'Жіноча', "#{I18n.t('people.show.gender')}: #{I18n.t('people.show.female')}" end end diff --git a/spec/features/people/show_person_spec.rb b/spec/features/people/show_person_spec.rb index fc9e1dd4..deef9dd3 100644 --- a/spec/features/people/show_person_spec.rb +++ b/spec/features/people/show_person_spec.rb @@ -33,7 +33,7 @@ end describe 'do change', :js do - When { click_button I18n.t('.add_to_group') } + When { click_button I18n.t('people.show.add_to_group') } When { find('#move-to-group', text: academic_group_2.title).click } Then { expect(find('table', text: "#{I18n.t('people.show.group')} #{I18n.t('people.show.join_date')} #{I18n.t('people.show.actions')}")).to have_css('tr', text: academic_group_2.title) } diff --git a/spec/views/people/show.html.haml_spec.rb b/spec/views/people/show.html.haml_spec.rb index 4bc53084..f5072bf3 100644 --- a/spec/views/people/show.html.haml_spec.rb +++ b/spec/views/people/show.html.haml_spec.rb @@ -25,7 +25,7 @@ When { render file: 'people/show.html.haml', layout: 'layouts/person_tabs' } describe 'general' do - Then { expect(rendered).to have_selector('h1', text: person.complex_name) } + Then { expect(rendered).to have_selector('h1', text: complex_name(person)) } And { expect(rendered).to have_text("#{I18n.t('people.show.telephone')} 1: #{person.telephones.first.phone}") } And { expect(rendered).to have_text("Email: #{person.email}") } And { expect(rendered).to have_text(/#{I18n.t('people.show.gender')}: (#{I18n.t('people.show.male')}|#{I18n.t('people.show.female')})/) } @@ -143,7 +143,7 @@ Given { assign(:academic_groups, [group]) } context 'no role' do - Then { expect(rendered).not_to have_selector('button.dropdown-toggle', text: I18n.t('people.show.add_to_group')) } + Then { expect(rendered).not_to have_selector('button.dropdown-toggle span', text: I18n.t('people.show.add_to_group')) } end context 'with roles' do @@ -153,7 +153,7 @@ Given(:activities) { ['person:move_to_group'] } Then do - expect(rendered).to have_selector('#change-academic-group button.dropdown-toggle', text: I18n.t('people.show.add_to_group')) + expect(rendered).to have_selector('#change-academic-group button.dropdown-toggle span', text: I18n.t('people.show.add_to_group')) end And { expect(menu).to have_link(group.title, href: '#') }