From 2a792edd6e66e0495ece84accb056def74cee961 Mon Sep 17 00:00:00 2001 From: David Cliff Date: Wed, 28 Aug 2024 19:38:51 +0000 Subject: [PATCH] Pinning sass to quiet the noisy deprecation notices which will be fixed with an upcoming bootstrap update --- .version | 2 +- Gemfile | 1 + Gemfile.lock | 9 +++++---- spec/controllers/works_controller_spec.rb | 7 +++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.version b/.version index fef250dd2..74d0c76f1 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.6.23 +2.6.25 diff --git a/Gemfile b/Gemfile index 9fd779e5b..2187687f4 100644 --- a/Gemfile +++ b/Gemfile @@ -71,6 +71,7 @@ gem 'pg' gem 'rsolr', '>= 1.0', '< 3' gem 'ruby-filemagic' gem 'ruby-vips' +gem 'sass-embedded', '1.77.5' # temp fix for https://github.com/twbs/bootstrap/issues/40621 gem 'sidekiq' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 205562269..30dd51cfc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,7 +168,7 @@ GEM ffi (1.17.0-x86_64-linux-gnu) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (4.27.3-x86_64-linux) + google-protobuf (4.27.4-x86_64-linux) bigdecimal rake (>= 13) hamlit (3.0.3) @@ -227,7 +227,7 @@ GEM multipart-post (2.4.1) net-http (0.4.1) uri - net-imap (0.4.14) + net-imap (0.4.15) date net-protocol net-pop (0.1.2) @@ -362,8 +362,8 @@ GEM ffi (~> 1.12) logger rubyzip (2.3.2) - sass-embedded (1.77.8-x86_64-linux-gnu) - google-protobuf (~> 4.26) + sass-embedded (1.77.5-x86_64-linux-gnu) + google-protobuf (>= 3.25, < 5.0) selenium-webdriver (4.10.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -454,6 +454,7 @@ DEPENDENCIES rubocop-rails ruby-filemagic ruby-vips + sass-embedded (= 1.77.5) selenium-webdriver sidekiq simplecov diff --git a/spec/controllers/works_controller_spec.rb b/spec/controllers/works_controller_spec.rb index 9b1b4c031..fc682eeb9 100644 --- a/spec/controllers/works_controller_spec.rb +++ b/spec/controllers/works_controller_spec.rb @@ -24,4 +24,11 @@ expect(subject).to redirect_to action: :show, id: assigns(:work)['id'] end end + + describe 'new' do + it 'presents the interface to upload a file' do + get :new + expect(response).to render_template('works/new') + end + end end