diff --git a/Gemfile b/Gemfile index d77023264..d6867207f 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'coffee-rails', '~> 5.0.0' gem 'jquery-rails', '~> 4.5' gem 'jquery-ui-rails', '~>6.0.1' -gem 'rails', '~> 6.0.4' +gem 'rails', '~> 6.0.0' gem 'sassc-rails', '~> 2.1.2' gem 'bootstrap-sass', '3.4.1' @@ -37,7 +37,7 @@ gem 'mysql2', '~> 0.5.4', group: :mysql gem 'pg', '~> 1.4.3', group: :postgresql group :development do - gem 'spring' + gem 'spring', '~> 3' gem 'yard' gem 'tolk', '~> 4.3.0' @@ -59,7 +59,7 @@ group :test do # get test coverage info on codeclimate gem 'codeclimate-test-reporter', '1.0.7', group: :test, require: nil - gem 'database_cleaner' + gem 'database_cleaner', '~> 1' gem 'factory_bot_rails' gem 'minitest-stub-const' gem 'mocha', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 389ac8b41..8f8899333 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,26 +4,26 @@ GEM RedCloth (4.3.2) aasm (5.3.0) concurrent-ruby (~> 1.0) - actioncable (6.0.4.7) - actionpack (= 6.0.4.7) + actioncable (6.0.5.1) + actionpack (= 6.0.5.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.4.7) - actionpack (= 6.0.4.7) - activejob (= 6.0.4.7) - activerecord (= 6.0.4.7) - activestorage (= 6.0.4.7) - activesupport (= 6.0.4.7) + actionmailbox (6.0.5.1) + actionpack (= 6.0.5.1) + activejob (= 6.0.5.1) + activerecord (= 6.0.5.1) + activestorage (= 6.0.5.1) + activesupport (= 6.0.5.1) mail (>= 2.7.1) - actionmailer (6.0.4.7) - actionpack (= 6.0.4.7) - actionview (= 6.0.4.7) - activejob (= 6.0.4.7) + actionmailer (6.0.5.1) + actionpack (= 6.0.5.1) + actionview (= 6.0.5.1) + activejob (= 6.0.5.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.4.7) - actionview (= 6.0.4.7) - activesupport (= 6.0.4.7) + actionpack (6.0.5.1) + actionview (= 6.0.5.1) + activesupport (= 6.0.5.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -31,36 +31,36 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (6.0.4.7) - actionpack (= 6.0.4.7) - activerecord (= 6.0.4.7) - activestorage (= 6.0.4.7) - activesupport (= 6.0.4.7) + actiontext (6.0.5.1) + actionpack (= 6.0.5.1) + activerecord (= 6.0.5.1) + activestorage (= 6.0.5.1) + activesupport (= 6.0.5.1) nokogiri (>= 1.8.5) - actionview (6.0.4.7) - activesupport (= 6.0.4.7) + actionview (6.0.5.1) + activesupport (= 6.0.5.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.4.7) - activesupport (= 6.0.4.7) + activejob (6.0.5.1) + activesupport (= 6.0.5.1) globalid (>= 0.3.6) - activemodel (6.0.4.7) - activesupport (= 6.0.4.7) + activemodel (6.0.5.1) + activesupport (= 6.0.5.1) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.4.7) - activemodel (= 6.0.4.7) - activesupport (= 6.0.4.7) - activestorage (6.0.4.7) - actionpack (= 6.0.4.7) - activejob (= 6.0.4.7) - activerecord (= 6.0.4.7) - marcel (~> 1.0.0) - activesupport (6.0.4.7) + activerecord (6.0.5.1) + activemodel (= 6.0.5.1) + activesupport (= 6.0.5.1) + activestorage (6.0.5.1) + actionpack (= 6.0.5.1) + activejob (= 6.0.5.1) + activerecord (= 6.0.5.1) + marcel (~> 1.0) + activesupport (6.0.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -69,8 +69,8 @@ GEM acts_as_list (1.0.4) activerecord (>= 4.2) ast (2.4.2) - autoprefixer-rails (10.1.0.0) - execjs + autoprefixer-rails (10.4.7.0) + execjs (~> 2) backport (1.2.0) bcrypt (3.1.18) benchmark (0.2.0) @@ -86,7 +86,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - bullet (7.0.2) + bullet (7.0.3) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -102,13 +102,13 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.10) crass (1.0.6) - database_cleaner (1.8.5) + database_cleaner (1.99.0) diff-lcs (1.5.0) - docile (1.3.4) + docile (1.4.0) e2mmap (0.1.0) - erubi (1.10.0) - execjs (2.7.0) - factory_bot (6.2.0) + erubi (1.11.0) + execjs (2.8.1) + factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) @@ -188,20 +188,20 @@ GEM rack (>= 1.2.0) rack-test (2.0.2) rack (>= 1.3) - rails (6.0.4.7) - actioncable (= 6.0.4.7) - actionmailbox (= 6.0.4.7) - actionmailer (= 6.0.4.7) - actionpack (= 6.0.4.7) - actiontext (= 6.0.4.7) - actionview (= 6.0.4.7) - activejob (= 6.0.4.7) - activemodel (= 6.0.4.7) - activerecord (= 6.0.4.7) - activestorage (= 6.0.4.7) - activesupport (= 6.0.4.7) + rails (6.0.5.1) + actioncable (= 6.0.5.1) + actionmailbox (= 6.0.5.1) + actionmailer (= 6.0.5.1) + actionpack (= 6.0.5.1) + actiontext (= 6.0.5.1) + actionview (= 6.0.5.1) + activejob (= 6.0.5.1) + activemodel (= 6.0.5.1) + activerecord (= 6.0.5.1) + activestorage (= 6.0.5.1) + activesupport (= 6.0.5.1) bundler (>= 1.3.0) - railties (= 6.0.4.7) + railties (= 6.0.5.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -217,15 +217,15 @@ GEM railties (>= 6.0.0, < 8) rails_autolink (1.1.6) rails (> 3.1) - railties (6.0.4.7) - actionpack (= 6.0.4.7) - activesupport (= 6.0.4.7) + railties (6.0.5.1) + actionpack (= 6.0.5.1) + activesupport (= 6.0.5.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.1.1) rake (13.0.6) - rb-fsevent (0.11.0) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) ref (2.0.0) @@ -237,14 +237,14 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-support (3.11.0) - rubocop (1.34.1) + rubocop (1.35.0) json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.0, < 2.0) + rubocop-ast (>= 1.20.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.21.0) @@ -267,7 +267,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.4) smart_properties (1.17.0) solargraph (0.45.0) backport (~> 1.2) @@ -285,7 +285,7 @@ GEM tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) spring (3.1.1) - sprockets (4.0.3) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -340,7 +340,7 @@ DEPENDENCIES byebug codeclimate-test-reporter (= 1.0.7) coffee-rails (~> 5.0.0) - database_cleaner + database_cleaner (~> 1) factory_bot_rails font-awesome-sass (~> 6.1.2) htmlentities @@ -355,7 +355,7 @@ DEPENDENCIES pg (~> 1.4.3) puma (~> 5.6) rack-mini-profiler - rails (~> 6.0.4) + rails (~> 6.0.0) rails-controller-testing rails-dom-testing (~> 2.0.0) rails_autolink @@ -365,7 +365,7 @@ DEPENDENCIES sassc-rails (~> 2.1.2) simplecov solargraph - spring + spring (~> 3) sqlite3 therubyracer tolk (~> 4.3.0) @@ -375,4 +375,4 @@ DEPENDENCIES yard BUNDLED WITH - 2.2.22 + 2.2.33 diff --git a/test/integration/locale_test.rb b/test/integration/locale_test.rb index 084f88fd4..409718b37 100644 --- a/test/integration/locale_test.rb +++ b/test/integration/locale_test.rb @@ -17,6 +17,9 @@ def test_locale_index assert_response :success assert_template "todos/index" end + + # Finally log in as normal admin user to prevent other tests from failing to the non-English locale. + logs_in_as(users(:admin_user), 'abracadabra') end end