Skip to content

Commit c881448

Browse files
etagwerkerJuanVqzarielj
authored
Bump dependencies to use Rails 7.1 as the current Rails version (#311)
* Bump dependencies to use Rails 7.1 as the current Rails version * Add `render_views` to reports_controller Without this change, rspec was failing with this: ``` 4) ReportsController#show using HTML response format shows the attributes for the right project Failure/Error: raise TypeError, "#{path.inspect} is not a valid path: must be a String, Pathname, or Resolver" TypeError: #<RSpec::Rails::ViewRendering::EmptyTemplateResolver::ResolverDecorator:0x0000000113c167e0 @resolver=#<ActionView::FileSystemResolver:0x0000000109e1bb80 @unbound_templates=#<Concurrent::Map:0x0000000109e1bb58 entries=41 default_proc=nil>, @path_parser=#<ActionView::Resolver::PathParser:0x0000000110133308 @regex=/ \A (?:(?<prefix>.*)\/)? (?<partial>_)? (?<action>.*?) (?:\.(?<locale>(?-mix:ar|bg|ca\-CAT|ca|da\-DK|de\-AT|de\-CH|de|ee|en|en\-AU|en\-BORK|en\-CA|en\-GB|en\-IND|en\-MS|en\-NEP|en\-NG|en\-NZ|en\-PAK|en\-SG|en\-TH|en\-UG|en\-US|en\-ZA|en\-au\-ocker|es\-AR|es\-MX|es|fa|fi\-FI|fr|fr\-CA|fr\-CH|he|hy|id|it|ja|ko|lt|lv|mi\-NZ|nb\-NO|nl|no\-NO|pl|pt\-BR|pt|ru|sk|sv|th|tr|uk|vi|zh\-CN|zh\-TW|(?-mix:[a-z]{2}(?:[-_][A-Z]{2})?))))?? (?:\.(?<format>(?-mix:html|text|js|css|ics|csv|vcf|vtt|png|jpeg|gif|bmp|tiff|svg|webp|mpeg|mp3|ogg|m4a|webm|mp4|otf|ttf|woff|woff2|xml|rss|atom|yaml|multipart_form|url_encoded_form|json|pdf|zip|gzip)))?? (?:\+(?<variant>[^.]*))?? (?:\.(?<handler>(?-mix:raw|erb|html|builder|ruby|jbuilder)))? \z /x>, @path="/Users/etagwerker/Projects/fastruby/points/app/views">> is not a valid path: must be a String, Pathname, or Resolver # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/actionview-7.1.0/lib/action_view/path_set.rb:79:in `block in typecast' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/actionview-7.1.0/lib/action_view/path_set.rb:68:in `map' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/actionview-7.1.0/lib/action_view/path_set.rb:68:in `typecast' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/actionview-7.1.0/lib/action_view/path_set.rb:19:in `initialize' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/actionview-7.1.0/lib/action_view/view_paths.rb:35:in `new' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/actionview-7.1.0/lib/action_view/view_paths.rb:35:in `_build_view_paths' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/actionview-7.1.0/lib/action_view/view_paths.rb:69:in `view_paths=' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-rails-4.0.2/lib/rspec/rails/view_rendering.rb:153:in `block (2 levels) in <module:ViewRendering>' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:457:in `instance_exec' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:457:in `instance_exec' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:365:in `run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:529:in `block in run_owned_hooks_for' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:528:in `each' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:528:in `run_owned_hooks_for' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:615:in `block in run_example_hooks_for' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:614:in `reverse_each' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:614:in `run_example_hooks_for' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:484:in `run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:505:in `run_before_example' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:261:in `block in run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:511:in `block in with_around_and_singleton_context_hooks' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:468:in `block in with_around_example_hooks' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:486:in `block in run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:626:in `block in run_around_example_hooks_for' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:352:in `call' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-rails-4.0.2/lib/rspec/rails/example/controller_example_group.rb:191:in `block (2 levels) in <module:ControllerExampleGroup>' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:457:in `instance_exec' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:457:in `instance_exec' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:390:in `execute_with' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:352:in `call' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-rails-4.0.2/lib/rspec/rails/adapters.rb:75:in `block (2 levels) in <module:MinitestLifecycleAdapter>' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:457:in `instance_exec' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:457:in `instance_exec' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:390:in `execute_with' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:352:in `call' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:629:in `run_around_example_hooks_for' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/hooks.rb:486:in `run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:468:in `with_around_example_hooks' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:511:in `with_around_and_singleton_context_hooks' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example.rb:259:in `run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:646:in `block in run_examples' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:642:in `map' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:642:in `run_examples' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:607:in `run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:608:in `block in run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:608:in `map' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:608:in `run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:608:in `block in run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:608:in `map' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/example_group.rb:608:in `run' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/runner.rb:121:in `block (3 levels) in run_specs' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/runner.rb:121:in `map' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/runner.rb:121:in `block (2 levels) in run_specs' # /Users/etagwerker/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/rspec-core-3.12.2/lib/rspec/core/configuration.rb:2070:in `with_suite_hooks' Add `render_views` to reports_controller ``` * Start using Rails 7.1 defaults * Use rspec-rails 6.0.x from now on * Remove duplicated group from Gemfile * bundle update and next bundle update to be consistent * Add platform for GitHub CI `bundle lock --add-platform x86_64-linux` * Remove usage of uglifier * Start using yui-compressor * Add Java build pack * ROAD-556 Use sass and terser for assets minification * ROAD-556 Remove java buildpack --------- Co-authored-by: Juan Vasquez <[email protected]> Co-authored-by: Ariel Juodziukynas <[email protected]>
1 parent f6bc154 commit c881448

File tree

7 files changed

+418
-332
lines changed

7 files changed

+418
-332
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ coverage
99
.byebug_history
1010
.tool-versions
1111
.DS_Store
12+
public/assets
1213

1314
node_modules
1415
yarn-error.log

Gemfile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ if next?
1616
# to make it work with ruby 3.1
1717
# read more about it here: https://github.com/rails/rails/issues/43998,
1818
# and here: https://gist.github.com/claudiug/bdc2fb70b10d19513208c816588aed92
19-
gem "rails", github: "rails/rails", branch: "7-0-stable"
19+
gem "rails", github: "rails/rails", branch: "main"
2020
else
21-
gem "rails", "~> 7.0.2"
21+
gem "rails", "~> 7.1.0"
2222
end
2323
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
2424

@@ -30,8 +30,6 @@ gem "bootstrap-sass", "3.4.1"
3030
gem "puma", "~> 6.3"
3131
# Use SCSS for stylesheets
3232
gem "sass-rails", "~> 5.0"
33-
# Use Uglifier as compressor for JavaScript assets
34-
gem "uglifier", ">= 1.3.0"
3533

3634
gem "bourbon"
3735
gem "matrix"
@@ -65,26 +63,28 @@ gem "rack-mini-profiler"
6563

6664
group :production do
6765
gem "newrelic_rpm"
66+
gem "terser"
6867
end
6968

7069
group :development, :test do
7170
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
7271
gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
7372
# Adds support for Capybara system testing and selenium driver
74-
gem "rspec-rails", "~> 4.0.2"
73+
gem "rspec-rails", "~> 6.0.3"
7574
gem "faker"
7675
gem "shoulda-matchers", "~> 3.1"
7776
gem "rails-controller-testing"
7877
gem "dotenv-rails"
7978
gem "recursive-open-struct"
8079
gem "factory_bot_rails"
80+
gem "next_rails"
8181
end
8282

8383
group :test do
8484
gem "apparition", git: "https://github.com/twalpole/apparition.git", ref: "7db58cc6b0e4ca4141b074ff27d5936a1b8874bf"
8585
gem "capybara"
8686
gem "webdrivers"
87-
gem "database_cleaner"
87+
gem "database_cleaner-active_record", ">= 2.1.0"
8888
gem "capybara-screenshot"
8989
gem "simplecov", require: false
9090
end
@@ -98,10 +98,6 @@ group :development do
9898
gem "standardrb", require: false
9999
end
100100

101-
group :development, :test do
102-
gem "next_rails"
103-
end
104-
105101
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
106102
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
107103

0 commit comments

Comments
 (0)