Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

169L Email Updates + Ruby 3 #244

Merged
merged 59 commits into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
d10f4b8
Use ruby 3.2.2
cycomachead Apr 20, 2023
fffb14b
Matthew Chuang
Apr 24, 2023
b34384d
rubocop passing
chuang-yao-ucb May 1, 2023
5f9a3e5
Merge branch 'main' into emailTemplate
chuang-yao-ucb May 1, 2023
14760e2
changed tests
chuang-yao-ucb May 1, 2023
10e32e1
Merge pull request #25 from cs169/emailTemplate
Matthew-Kao May 1, 2023
8f245bb
Merge branch 'main' of github.com:cs169/BJC-Teacher-Tracker into cs16…
cycomachead Jun 23, 2023
dbb6ccd
Add a required flag for email templates
cycomachead Jun 23, 2023
4b6cdb2
Merge branch 'main' into cs169-final
cycomachead Aug 1, 2023
8bc1760
Webpacker runs again, remove unnecessary packages
cycomachead Aug 1, 2023
5dfd081
Merge ruby 3 version
cycomachead Aug 1, 2023
510baeb
Reorder Gems in Gemfile
cycomachead Aug 1, 2023
756ca1f
Add a .tool-versions file
cycomachead Aug 1, 2023
0260339
Update pronto+pg gems
cycomachead Aug 1, 2023
50dd9db
Minor dev dependencies update...
cycomachead Aug 1, 2023
d029e46
bundle update rails to 6.1.7.4
cycomachead Aug 1, 2023
429b53e
update webpacker...
cycomachead Aug 1, 2023
3f4347e
Run rubocop -a
cycomachead Aug 1, 2023
d339e18
rubocop -A delinting
cycomachead Aug 1, 2023
8031e5b
Update pry / pry-byebug deps
cycomachead Aug 1, 2023
52c6839
Bundle update simplecov metric_fu
cycomachead Aug 1, 2023
22f93fe
No more metric_fu, things run again
cycomachead Aug 1, 2023
ef6b83f
Cleanup email templates index
cycomachead Aug 1, 2023
99d2884
delint
cycomachead Aug 2, 2023
fb74670
update rspec rails
cycomachead Aug 2, 2023
62b455a
sigh, slow progress on fixing specs with ruby 3+updates
cycomachead Aug 2, 2023
6c4fd5f
WIP factors / fixing specs
cycomachead Aug 9, 2023
8709202
Rubocop
cycomachead Aug 9, 2023
f4e847f
fix loading support files, mocking get_lat_lng method
cycomachead Aug 13, 2023
1dd6696
Add a spec log_in method, cleanup fixtures for pages/teachers
cycomachead Aug 13, 2023
dabee65
fixup pages controller spec
cycomachead Aug 13, 2023
e7cc4b8
Refactor pages controller spec a bit for user clarity
cycomachead Aug 13, 2023
0cbd500
Update malicious spec for new post format
cycomachead Aug 13, 2023
d5aa51e
move malicious spec to teachers_controller
cycomachead Aug 13, 2023
ebaeb2a
Update fixture name in teachers model
cycomachead Aug 13, 2023
0862b94
define omniauth_callback_path
cycomachead Aug 13, 2023
b2536b8
define omniauth_callback_path
cycomachead Aug 13, 2023
dcb82fa
Fixup main_controller_spec for added fixtures
cycomachead Aug 13, 2023
6485c47
WIP: Fixup post args in schools controller spec
cycomachead Aug 13, 2023
9d77447
Schools specs work by making them request specs
cycomachead Aug 13, 2023
0c88830
All controller specs pass
cycomachead Aug 13, 2023
b3b379c
Run rubocop, set to 3.1 defaults
cycomachead Aug 13, 2023
762b7c4
Update rubocop
cycomachead Aug 13, 2023
c4cc1d9
fixup some indentation
cycomachead Aug 13, 2023
c2639d5
Restructure seeds/fixtures loading in cuke setup
cycomachead Aug 14, 2023
d2c17e3
No longer need webdrivers gem, apparently.
cycomachead Aug 14, 2023
999de12
delint
cycomachead Aug 14, 2023
4a05675
update bundler
cycomachead Aug 15, 2023
48db9d1
run bundle update...
cycomachead Aug 15, 2023
4455472
WIP cuke runs again...mostly...
cycomachead Aug 15, 2023
af4284b
remove debugger
cycomachead Aug 15, 2023
395ffd5
Cleanup cuke setup...
cycomachead Aug 15, 2023
bb6880f
update email template seeds so specs pass
cycomachead Aug 15, 2023
cb1a039
Update specs test to reflect form saying submit
cycomachead Aug 15, 2023
654a915
Pages admin features fully work -- fixes for bad test data
cycomachead Aug 15, 2023
4c8aa96
Cleanup final cuke steps for bad data
cycomachead Aug 15, 2023
2c46d4d
Fixup microsoft/omniauth config, beef up logging
cycomachead Aug 15, 2023
3a8d33e
disable some WIP 169 work around email options
cycomachead Aug 15, 2023
312bdda
minor tidying
cycomachead Aug 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up Ruby 2.7.7
- name: Set up Ruby 3.2.2
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.7
ruby-version: 3.2.2
bundler-cache: true
- name: Run RuboCop
run: bundle exec rubocop --parallel
2 changes: 1 addition & 1 deletion .github/workflows/specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Use Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.7
ruby-version: 3.2.2
bundler-cache: true
- name: Setup Code Climate
run: |
Expand Down
4 changes: 3 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ require:
- rubocop-rspec

AllCops:
TargetRubyVersion: 2.7
# TODO: rubocop needs to be updated for 3.2
TargetRubyVersion: 3.1
# RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
# to ignore them, so only the ones explicitly set in this file are enabled.
DisabledByDefault: true
Expand Down Expand Up @@ -104,6 +105,7 @@ Layout/IndentationConsistency:
# Two spaces, no tabs (for indentation).
Layout/IndentationWidth:
Enabled: true
Width: 2

Layout/LeadingCommentSpace:
Enabled: true
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.2.2
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ruby 3.2.2
nodejs 14.21.3
27 changes: 12 additions & 15 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ source "https://rubygems.org"

git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "2.7.8"
ruby "3.2.2"

gem "rails", "6.1.6"
gem "rails", "6.1.7.4"

# Production app server
gem "puma", "~> 5"
gem "pg", "~> 1.0"
gem "pg", "~> 1.5"

# Front-end Assets
gem "webpacker", "~> 4"
gem "webpacker"

# Reduces boot times through caching; required in config/boot.rb
gem "bootsnap", ">= 1.4.4", require: false
Expand Down Expand Up @@ -45,6 +45,12 @@ gem "aws-sdk-s3", require: false
# Render images for file uploads in pages
gem "image_processing", ">= 1.2"

gem "selectize-rails"
gem "smarter_csv", "~> 1.4"
gem "activerecord-import", require: false

gem "httparty", "~> 0.21.0"

group :development do
gem "annotate"
gem "guard"
Expand Down Expand Up @@ -86,26 +92,17 @@ end
# setup Cucumber, RSpec, Guard support
group :test do
gem "rspec-rails"
gem "simplecov", "< 0.18", require: false
gem "simplecov", require: false
gem "simplecov-json", require: false
gem "simplecov-console", require: false
gem "simplecov-csv", require: false
gem "cucumber-rails", require: false
gem "database_cleaner"
gem "factory_bot_rails"
gem "metric_fu"
# gem "metric_fu" # removed until ruby 3.x compat is fixed.
gem "selenium-webdriver"

gem "webdrivers"
# Accessibility Testing
gem "axe-core-rspec"
gem "axe-core-cucumber"

gem "rails-controller-testing"
end

gem "selectize-rails"
gem "smarter_csv", "~> 1.4"
gem "activerecord-import", require: false

gem "httparty", "~> 0.21.0"
Loading
Loading