From 45c2e5b18ac9ed05533900c27a85d33064a87024 Mon Sep 17 00:00:00 2001 From: tkalliom Date: Mon, 11 Apr 2022 10:24:56 +0300 Subject: [PATCH 1/5] Use correct assertions in model spec, broken with RSpec 3 upgrade --- spec/models/article_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb index 3e3c6b61..5d73a407 100644 --- a/spec/models/article_spec.rb +++ b/spec/models/article_spec.rb @@ -4,7 +4,7 @@ describe Article do it 'should be translatable' do - Article.translates?.should be_true + Article.translates?.should be true end describe 'localized article' do @@ -12,7 +12,9 @@ let(:article) { create(:localized_article) } subject { article } - it { should have(3).translations } + it 'should have 3 translations' do + article.translations.size.should == 3 + end it 'should have italian translation' do I18n.with_locale :it do From 60368c96f98a1c8bd976c6585e61ae76c9b7ee32 Mon Sep 17 00:00:00 2001 From: tkalliom Date: Mon, 11 Apr 2022 10:19:17 +0300 Subject: [PATCH 2/5] Match test app Devise dependency to what AA 1.0 required --- Appraisals | 1 + Gemfile | 2 +- gemfiles/rails4_2.gemfile | 2 +- gemfiles/rails5_0.gemfile | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Appraisals b/Appraisals index 2cd73a66..7e7f7328 100644 --- a/Appraisals +++ b/Appraisals @@ -4,6 +4,7 @@ appraise 'rails4_2' do end appraise 'rails5_0' do + gem 'devise', '~> 4.0' gem 'rails', '~> 4.2.9' gem 'globalize', '~> 5.0.0' end diff --git a/Gemfile b/Gemfile index f09f859a..a8576102 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'uglifier' gem 'jquery-rails' # ActiveAdmin requires devise < 4.0 -gem 'devise', '~> 3.2' +gem 'devise', '~> 3.5' group :test do gem 'sqlite3', '~> 1.3.5' diff --git a/gemfiles/rails4_2.gemfile b/gemfiles/rails4_2.gemfile index 4f6e65a0..73bfda7a 100644 --- a/gemfiles/rails4_2.gemfile +++ b/gemfiles/rails4_2.gemfile @@ -7,7 +7,7 @@ gem "coffee-rails" gem "therubyracer", platforms: :ruby gem "uglifier" gem "jquery-rails" -gem "devise", "~> 3.2" +gem "devise", "~> 3.5" gem "rails", "~> 4.2.9" gem "globalize", "~> 5.0.0" diff --git a/gemfiles/rails5_0.gemfile b/gemfiles/rails5_0.gemfile index 4f6e65a0..22f3f933 100644 --- a/gemfiles/rails5_0.gemfile +++ b/gemfiles/rails5_0.gemfile @@ -7,7 +7,7 @@ gem "coffee-rails" gem "therubyracer", platforms: :ruby gem "uglifier" gem "jquery-rails" -gem "devise", "~> 3.2" +gem "devise", "~> 4.0" gem "rails", "~> 4.2.9" gem "globalize", "~> 5.0.0" From 26ffc4187d9cde5d1c2381da1d0246d1e79f3e82 Mon Sep 17 00:00:00 2001 From: tkalliom Date: Mon, 4 Apr 2022 16:09:04 +0300 Subject: [PATCH 3/5] Add asset manifest to test app for Sprockets 4 compatibility --- spec/dummy/app/assets/config/manifest.js | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 spec/dummy/app/assets/config/manifest.js diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js new file mode 100644 index 00000000..25e4ccc8 --- /dev/null +++ b/spec/dummy/app/assets/config/manifest.js @@ -0,0 +1,2 @@ +//= link application.js +//= link_directory ../stylesheets .css From e7eac0483f36e993428ffe379a8ed4174a72715d Mon Sep 17 00:00:00 2001 From: tkalliom Date: Mon, 11 Apr 2022 12:26:51 +0300 Subject: [PATCH 4/5] Explicitly require assets in test app --- spec/dummy/app/assets/javascripts/active_admin.js | 1 + spec/dummy/app/assets/stylesheets/active_admin.css.scss | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/spec/dummy/app/assets/javascripts/active_admin.js b/spec/dummy/app/assets/javascripts/active_admin.js index d2b66c59..283b603d 100644 --- a/spec/dummy/app/assets/javascripts/active_admin.js +++ b/spec/dummy/app/assets/javascripts/active_admin.js @@ -1 +1,2 @@ //= require active_admin/base +//= require active_admin/active_admin_globalize.js diff --git a/spec/dummy/app/assets/stylesheets/active_admin.css.scss b/spec/dummy/app/assets/stylesheets/active_admin.css.scss index 90ba1d47..b1c6ccbc 100644 --- a/spec/dummy/app/assets/stylesheets/active_admin.css.scss +++ b/spec/dummy/app/assets/stylesheets/active_admin.css.scss @@ -1,3 +1,7 @@ +/* + *= require active_admin/active_admin_globalize + */ + // SASS variable overrides must be declared before loading up Active Admin's styles. // // To view the variables that Active Admin provides, take a look at From d488491bb29b10cc316d0e30464d5f9f62627c7c Mon Sep 17 00:00:00 2001 From: tkalliom Date: Mon, 11 Apr 2022 16:29:15 +0300 Subject: [PATCH 5/5] Specify Rails 5.0 in the corresponding appraisal --- Appraisals | 4 ++-- gemfiles/rails5_0.gemfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Appraisals b/Appraisals index 7e7f7328..48ca2b8e 100644 --- a/Appraisals +++ b/Appraisals @@ -5,8 +5,8 @@ end appraise 'rails5_0' do gem 'devise', '~> 4.0' - gem 'rails', '~> 4.2.9' - gem 'globalize', '~> 5.0.0' + gem 'rails', '~> 5.0.7.2' + gem 'globalize', '~> 5.1.0' end appraise 'rails5_1' do diff --git a/gemfiles/rails5_0.gemfile b/gemfiles/rails5_0.gemfile index 22f3f933..5b462401 100644 --- a/gemfiles/rails5_0.gemfile +++ b/gemfiles/rails5_0.gemfile @@ -8,8 +8,8 @@ gem "therubyracer", platforms: :ruby gem "uglifier" gem "jquery-rails" gem "devise", "~> 4.0" -gem "rails", "~> 4.2.9" -gem "globalize", "~> 5.0.0" +gem "rails", "~> 5.0.7.2" +gem "globalize", "~> 5.1.0" group :test do gem "sqlite3", "~> 1.3.5"