8000 Merge pull request #3226 from DMPRoadmap/development · DMPRoadmap/roadmap@c16f001 · GitHub
[go: up one dir, main page]

Skip to content

Commit c16f001

Browse files
authored
Merge pull request #3226 from DMPRoadmap/development
Upgrade to v4.0
2 parents fd57e12 + 68bf79b commit c16f001

File tree

196 files changed

+10450
-4415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+10450
-4415
lines changed

.github/workflows/eslint.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,5 @@ jobs:
2020
- name: 'Yarn Install'
2121
run: yarn install
2222

23-
# Run the ES Lint checks on javascript files
24-
# https://github.com/marketplace/actions/run-eslint
25-
- name: 'ES Lint checks'
26-
uses: stefanoeb/eslint-action@1.0.0
27-
with:
28-
args: './app/javascript/**/*.js'
23+
- name: 'Run ESLint'
24+
run: yarn run eslint app/javascript/**/*.js --ext .js

.github/workflows/mysql.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# Install Ruby and run bundler
2020
- uses: ruby/setup-ruby@v1
2121
with:
22-
ruby-version: 2.6.3
22+
ruby-version: 2.7.6
2323
bundler-cache: true
2424

2525
# Install Node
@@ -48,28 +48,27 @@ jobs:
4848

4949
# Start the DB server and initialize the DB
5050
- name: 'Start MySQL'
51+
run: sudo systemctl start mysql
52+
53+
- name: 'Build out the test database'
5154
run: |
52-
sudo systemctl start mysql
53-
bin/rails db:setup RAILS_ENV=test
54-
bin/rails db:migrate RAILS_ENV=test
55+
bundle exec rails db:create RAILS_ENV=test
56+
bundle exec rails db:schema:load RAILS_ENV=test
57+
58+
- name: 'Run any pending database migrations'
59+
run: bin/rails db:migrate RAILS_ENV=test
5560

5661
# Prebuild the CSS, JS and image assets
5762
- name: 'Precompile all of the Assets'
58-
run: bin/rails assets:precompile
59-
60-
# briley - comment out Karma tests due to issues with dependencies. We should
61-
# replace these with RSpec feature tests
62-
# Run the JS tests
63-
# - name: 'Run Karma Tests'
64-
# run: yarn test
63+
run: bundle exec rails assets:precompile
6564

6665
# Run the unit and functional tests
6766
- name: 'Run Rspec Unit and Functional Tests'
6867
run: |
69-
bin/bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
70-
bin/bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
71-
bin/bundle exec rspec spec/mixins/
68+
bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
69+
bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
70+
bundle exec rspec spec/mixins/
7271
7372
# Run the time consuming integration tests (using Chrome headless browser)
7473
- name: 'Run Rspec Integration Tests'
75-
run: bin/bundle exec rspec spec/features/
74+
run: bundle exec rspec spec/features/

.github/workflows/postgres.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# Install Ruby and run bundler
3636
- uses: ruby/setup-ruby@v1
3737
with:
38-
ruby-version: 2.6.3
38+
ruby-version: 2.7.6
3939
bundler-cache: true
4040

4141
# Install Node
@@ -74,26 +74,20 @@ jobs:
7474
# Initialize the DB
7575
- name: 'Setup Test DB'
7676
run: |
77-
bin/rails db:setup RAILS_ENV=test
78-
bin/rails db:migrate RAILS_ENV=test
77+
bundle exec rails db:setup RAILS_ENV=test
78+
bundle exec rails db:migrate RAILS_ENV=test
7979
8080
# Prebuild the CSS, JS and image assets
8181
- name: 'Compile Assets'
82-
run: bin/rails assets:precompile
83-
84-
# briley - comment out Karma tests due to issues with dependencies. We should
85-
# replace these with RSpec feature tests
86-
# Run the JS tests
87-
# - name: 'Run Karma Tests'
88-
# run: yarn test
82+
run: bundle exec rails assets:precompile
8983

9084
# Run the unit and functional tests
9185
- name: 'Run Rspec Unit and Functional Tests'
9286
run: |
93-
bin/rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
94-
bin/rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
95-
bin/rspec spec/mixins/
87+
bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
88+
bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
89+
bundle exec rspec spec/mixins/
9690
9791
# Run the time consuming integration tests (using Chrome headless browser)
9892
- name: 'Run Integration Tests'
99-
run: bin/rspec spec/features/
93+
run: bundle exec rspec spec/features/

.github/workflows/rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# Install Ruby and run bundler
1414
- uses: ruby/setup-ruby@v1
1515
with:
16-
ruby-version: 2.6.3
16+
ruby-version: 2.7.6
1717
bundler-cache: true
1818

1919
# Run the Rubocop linter checks

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,6 @@ yarn-debug.log*
112112
/yarn-error.log
113113
yarn-debug.log*
114114
.yarn-integrity
115+
116+
# Ignore briley AWS cloud9 script to start the application
117+
cloud9-start.sh

Gemfile

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
source 'https://rubygems.org'
44

5-
ruby '>= 2.6.3'
5+
ruby '>= 2.7'
66

77
# ===========#
88
# CORE RAILS #
99
# ===========#
1010

1111
# Full-stack web application framework. (http://rubyonrails.org)
12-
gem 'rails', '~> 5.2'
12+
gem 'rails', '~> 6.1'
1313

1414
# TODO: Remove this once Rails addresses the issue with its dependency on mimemagic. Mimemagic had
1515
# an MIT license but was using some incompatible GPL license code.
1616
# Versions of mimemagic that were yanked: https://rubygems.org/gems/mimemagic/versions
1717
# Analysis of the issue: https://www.theregister.com/2021/03/25/ruby_rails_code/
18-
gem 'mimemagic', '~> 0.3.7'
18+
gem 'mimemagic'
1919

2020
# Use sqlite3 as the database for Active Record
2121
# gem 'sqlite3', '~> 1.4'
@@ -24,13 +24,17 @@ gem 'mimemagic', '~> 0.3.7'
2424
gem 'puma', group: :puma, require: false
2525

2626
# Use SCSS for stylesheets
27+
# TODO : might need to move to cssbundling-rails
28+
# SEE: https://dev.to/kolide/how-to-migrate-a-rails-6-app-from-sass-rails-to-cssbundling-rails-4l41
2729
gem 'sass-rails'
2830

2931
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
3032
gem 'webpacker'
3133

32-
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
33-
gem 'turbolinks'
34+
# Turbo gives you the speed of a single-page web application without having to write any JavaScript..
35+
# Read more: https://github.com/hotwired/turbo-rails
36+
# https://github.com/hotwired/turbo-rails/blob/main/UPGRADING.md
37+
gem 'turbo-rails'
3438

3539
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
3640
gem 'jbuilder'
@@ -60,6 +64,7 @@ gem 'bootsnap', require: false
6064

6165
# Rollbar-gem is the SDK for Ruby apps and includes support for apps using
6266
# Rails, Sinatra, Rack, plain Ruby, and other frameworks.
67+
# https://github.com/rollbar/rollbar-gem
6368
gem 'rollbar', group: :rollbar, require: false
6469

6570
# ======== #
@@ -93,6 +98,7 @@ gem 'devise_invitable'
9398
gem 'omniauth'
9499

95100
# OmniAuth Shibboleth strategies for OmniAuth 1.x
101+
# https://github.com/toyokazu/omniauth-shibboleth
96102
gem 'omniauth-shibboleth'
97103

98104
# ORCID OAuth 2.0 Strategy for OmniAuth 1.0
@@ -148,6 +154,7 @@ gem 'kaminari'
148154

149155
# Paginate in your headers, not in your response body. This follows the
150156
# proposed RFC-8288 standard for Web linking.
157+
# https://github.com/davidcelis/api-pagination
151158
gem 'api-pagination'
152159

153160
# =========== #
@@ -158,7 +165,7 @@ gem 'api-pagination'
158165
gem 'sassc-rails'
159166

160167
# Font-Awesome SASS (https://github.com/FortAwesome/font-awesome-sass)
161-
gem 'font-awesome-sass', '~> 5.13.0'
168+
gem 'font-awesome-sass', '~> 5'
162169

163170
# Use webpack to manage app-like JavaScript modules in Rails
164171
# (https://github.com/rails/webpacker)
@@ -188,10 +195,6 @@ gem 'wicked_pdf'
188195
# (http://github.com/karnov/htmltoword)
189196
gem 'htmltoword'
190197

191-
# Filename sanitization for Ruby. This is useful when you generate filenames for
192-
# downloads from user input
193-
gem 'zaru'
194-
195198
# ==================== #
196199
# INTERNATIONALIZATION #
197200
# ==================== #
@@ -239,11 +242,11 @@ group :test do
239242
# (https://github.com/thekompanee/fuubar)
240243
gem 'fuubar'
241244

242-
# Guard keeps an eye on your file modifications (http://guardgem.org)
245+
# Guard keeps an eye on your file modifications (https://github.com/guard/guard)
243246
gem 'guard'
244247

245248
# Guard gem for RSpec (https://github.com/guard/guard-rspec)
246-
gem 'guard-rspec'
249+
# gem 'guard-rspec'
247250

248251
# Library for stubbing HTTP requests in Ruby.
249252
# (http://github.com/bblimke/webmock)
@@ -273,11 +276,11 @@ group :test do
273276

274277
# Automatically create snapshots when Cucumber steps fail with Capybara
275278
# and Rails (http://github.com/mattheworiordan/capybara-screenshot)
276-
gem 'capybara-screenshot'
279+
# gem 'capybara-screenshot'
277280

278281
# Browser integration tests are expensive. We can mock external requests
279282
# in our tests, but once a browser is involved, we lose control.
280-
gem 'capybara-webmock', '~> 0.6'
283+
gem 'capybara-webmock'
281284

282285
# RSpec::CollectionMatchers lets you express expected outcomes on
283286
# collections of an object in an example.
@@ -309,22 +312,22 @@ group :ci, :development do
309312
gem 'rubocop-i18n'
310313

311314
# A collection of RuboCop cops to check for performance optimizations in Ruby code.
312-
gem 'rubocop-performance'
315+
# gem 'rubocop-performance'
313316

314317
# Automatic Rails code style checking tool. A RuboCop extension focused on enforcing
315318
# Rails best practices and coding conventions.
316-
gem 'rubocop-rails'
319+
# gem 'rubocop-rails'
317320

318321
# A RuboCop plugin for Rake tasks
319-
gem 'rubocop-rake'
322+
# gem 'rubocop-rake'
320323

321324
# Code style checking for RSpec files. A plugin for the RuboCop code style enforcing
322325
# & linting tool.
323-
gem 'rubocop-rspec'
326+
# gem 'rubocop-rspec'
324327

325328
# Thread-safety checks via static analysis. A plugin for the RuboCop code style
326329
# enforcing & linting tool.
327-
gem 'rubocop-thread_safety'
330+
# gem 'rubocop-thread_safety'
328331
end
329332

330333
group :development do

0 commit comments

Comments
 (0)
0