Skip to content

Commit

Permalink
Merge branch 'weekly-digest-notes' of github.com:rubyforgood/casa int…
Browse files Browse the repository at this point in the history
…o weekly-digest-notes

Corrects linting errors
  • Loading branch information
colefortner committed Sep 15, 2021
2 parents 6c7a865 + 7b32a48 commit 8a044d5
Show file tree
Hide file tree
Showing 250 changed files with 4,262 additions and 3,068 deletions.
1 change: 0 additions & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
POSTGRES_HOST_AUTH_METHOD: trust
POSTGRES_PORT: 5432
run: |
bundle exec skylight disable_dev_warning
yarn
bundle exec rake db:create
bundle exec rake db:schema:load
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@ jobs:
steps:
- name: Checkout repository
uses: actions/[email protected]
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Build
run: docker-compose build
- name: bundle install
run: docker-compose run web bundle install
- name: db:reset
run: docker-compose run web rails db:reset
- name: Create downloads folder
run: |
mkdir -p tmp/downloads
chmod 777 tmp tmp/downloads
- name: docker UP
run: docker-compose up -d
- name: db:reset
run: docker-compose exec -T web rails db:reset
- name: Test
run: docker-compose exec -T web bundle exec rspec spec
1 change: 0 additions & 1 deletion .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
POSTGRES_HOST_AUTH_METHOD: trust
POSTGRES_PORT: 5432
run: |
bundle exec skylight disable_dev_warning
yarn
bundle exec rake db:create
bundle exec rake db:schema:load
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: actions/[email protected]
with:
node-version: 14.x
node-version: 12.x

- run: yarn
- run: yarn test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ yarn-debug.log*

.rails_routes*
.vscode
.rubocop.yml

coverage/
.idea/
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.0.1
ruby-3.0.2
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 3.0.1
ruby 3.0.2
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.0.1-alpine AS builder
FROM ruby:3.0.2-alpine AS builder

LABEL maintainer="[email protected]"

Expand All @@ -24,7 +24,7 @@ COPY . .

### BUILD STEP DONE ###

FROM ruby:3.0.1-alpine
FROM ruby:3.0.2-alpine

ARG RAILS_ROOT=/usr/src/app/

Expand Down
23 changes: 12 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.0.1"
ruby "3.0.2"
gem "rails", "~> 6.1.4"

gem "after_party" # post-deployment tasks
Expand All @@ -13,23 +13,22 @@ gem "devise" # for authentication
gem "devise_invitable"
gem "draper" # adds decorators for cleaner presentation logic
gem "faker" # creates realistic seed data, valuable for staging and demos
gem "jbuilder", "~> 2.11" # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem "jbuilder" # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem "noticed" # Notifications
gem "paper_trail" # tracking changes
gem "pg", ">= 0.18", "< 2.0" # Use postgresql as the database for Active Record
gem "puma", "~> 5.4" # Use Puma as the app server
gem "pg" # Use postgresql as the database for Active Record
gem "puma" # Use Puma as the app server
gem "pundit" # for authorization management - based on user.role field
gem "rack-attack" # for blocking & throttling abusive requests
gem "skylight" # automated performance testing https://www.skylight.io/
gem "webpacker", "~> 5.4" # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem "image_processing", "~> 1.12" # Set of higher-level helper methods for image processing.
gem "lograge" # log less so heroku papertrail quits rate limiting our logs
gem "filterrific" # filtering and sorting of models

gem "bootsnap", ">= 1.4.2", require: false # Reduces boot times through caching; required in config/boot.rb
gem "bootsnap", require: false # Reduces boot times through caching; required in config/boot.rb
gem "bugsnag" # tracking errors in prod
gem "sablon" # Word document templating tool for Case Court Reports
gem "paranoia", "~> 2.2" # For soft-deleting purpose
gem "paranoia" # For soft-deleting purpose
gem "request_store"

group :development, :test do
Expand All @@ -39,16 +38,16 @@ group :development, :test do
gem "factory_bot_rails"
gem "pry"
gem "pry-byebug"
gem "rspec-rails", "~> 5.0.1"
gem "rspec-rails", "~> 5.0.2"
gem "shoulda-matchers"
gem "standard", "~> 1.1.7" # linter https://github.com/testdouble/standard
gem "standard", "~> 1.3.0" # linter https://github.com/testdouble/standard
gem "cypress-on-rails", "~> 1.11"
end

group :development do
gem "annotate" # for adding db field listings to models as comments
gem "letter_opener" # Opens emails in new tab for easier testing
gem "listen", ">= 3.0.5", "< 3.7"
gem "listen", ">= 3.0.5", "< 3.8"
gem "spring" # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem "spring-commands-rspec"
gem "spring-watcher-listen", "~> 2.0.0"
Expand All @@ -62,10 +61,12 @@ group :test do
gem "database_cleaner-active_record", "~> 2.0.1"
gem "rake"
gem "rails-controller-testing"
gem "selenium-webdriver", "4.0.0.beta4" # temporarily locking to a beta version until 4.x comes out - to fix docker tests https://github.com/SeleniumHQ/selenium/issues/9001
gem "selenium-webdriver", "4.0.0.rc1" # temporarily locking to a beta version until 4.x comes out - to fix docker tests https://github.com/SeleniumHQ/selenium/issues/9001
gem "simplecov", "~> 0.21.2", require: false # 0.17.1 pinned as a workaround for https://github.com/codeclimate/test-reporter/issues/418
gem "webdrivers" # easy installation and use of web drivers to run system tests with browsers
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]

gem "scout_apm", "~> 4.1"
Loading

0 comments on commit 8a044d5

Please sign in to comment.