Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:GSA/Challenge_platform into 162/eval…
Browse files Browse the repository at this point in the history 
…-form-evaluation-criteria

* 'dev' of github.com:GSA/Challenge_platform: (33 commits)
  Fix broken migration staging (#235)
  fix the migrations on challenge-dev (#234)
  [104] Evaluation Form View (#225)
  [52] Dashboard fixup (#229)
  Bump axe-core-rspec from 4.10.0 to 4.10.1 (#220)
  [197] Manage Submissions Index (#216)
  remove extra comments from db/structure.sql
  add an optional rbenv hook for local dev
  remove APP_DOMAIN for local env
  [Snyk] Security upgrade rails from 7.2.1 to 7.2.1.1 (#217)
  Bump propshaft from 0.9.1 to 1.1.0
  Bump rubocop-rspec from 3.0.5 to 3.1.0
  Update Gemfile.lock
  fix: Gemfile & Gemfile.lock to reduce vulnerabilities
  remove ruby-lsp no longer needed
  Bump ruby-lsp from 0.18.4 to 0.20.1
  add CC_TEST_REPORTER_ID for CCI
  fix javascript error on combo box
  Update app/models/submission.rb
  199 Allow unique custom URLs for specs
  ...
  • Loading branch information
@cpreisinger
cpreisinger committed Oct 28, 2024
2 parents 13c836e + 48a7b31 commit e55b445
Show file tree
Hide file tree
Showing 36 changed files with 621 additions and 123 deletions.
5 changes: 4 additions & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
rspec:
executor:
name: test_executor

environment:
PHOENIX_URI: http://localhost:4000

Expand Down Expand Up @@ -123,6 +123,9 @@ jobs:
executor:
name: test_executor

environment:
- CC_TEST_REPORTER_ID: "a561562e78b6f0b3e346d4811eef2b020f977cd089bf459f102f6229dd100703"

steps:
- restore_cache:
key: repo-{{ .Environment.CIRCLE_SHA1 }}
Expand Down
2 changes: 0 additions & 2 deletions .env_login
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@ export LOGOUT_REDIRECT_EVAL_URL=http://localhost:3000/
export PHOENIX_URI="http://localhost:4000"
export LOGIN_SECRET="f4d3c40a00a8e6ed72fae5204d9ddacd40f087865d40803a6fcfb935591a271838533f06081067dac24c0085c74123e7e1c8b3e0ab562c6645b17eb769854d0d"
export JWT_SECRET="fc28c5738ca45162f61126e770a8fbdbd938d0fedcfe8fbb9f851b855b0264866364a9130e96aca8b1977e9f58edf064f1aa435ceccf415ff22fd3c24adba320"

export APP_DOMAIN="localhost"
3 changes: 3 additions & 0 deletions .envrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@ use nix
mkdir -p .nix-bundler
export BUNDLE_PATH=./.nix-bundler

# hook for rbenv locally
which rbenv &> /dev/null && eval "$(rbenv init - -zsh)"

# Login Env Vars
source .env_login
9 changes: 3 additions & 6 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ source "https://rubygems.org"
ruby "3.2.4"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.2.0"
gem "rails", "~> 7.2.1", ">= 7.2.1.1"

# Use postgresql as the database for Active Record
gem "pg"

# Use the Puma web server [https://github.com/puma/puma]
gem "puma", ">= 5.0"
gem "puma", ">= 6.4.3"

# Use the popular Faraday HTTP library
gem "faraday"
Expand All @@ -20,7 +20,7 @@ gem "faraday"
gem "jwt"

# Use simple asset pipeline
gem "propshaft", "~> 0.9.1"
gem "propshaft", "~> 1.1.0"
gem "cssbundling-rails", "~> 1.4"
gem "jsbundling-rails", "~> 1.3"

Expand Down Expand Up @@ -59,9 +59,6 @@ group :development, :test do

gem 'pry'

# add the Ruby LSP package so it's bundled with the rest of the gems and available to VS Code
gem "ruby-lsp"

# rubocop and specific extensions used by VS Code
gem "rubocop", ">= 1.66.0"
gem "rubocop-performance", require: false
Expand Down
157 changes: 75 additions & 82 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
actioncable (7.2.1.2)
actionpack (= 7.2.1.2)
activesupport (= 7.2.1.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
actionmailbox (7.2.1.2)
actionpack (= 7.2.1.2)
activejob (= 7.2.1.2)
activerecord (= 7.2.1.2)
activestorage (= 7.2.1.2)
activesupport (= 7.2.1.2)
mail (>= 2.8.0)
actionmailer (7.2.1)
actionpack (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activesupport (= 7.2.1)
actionmailer (7.2.1.2)
actionpack (= 7.2.1.2)
actionview (= 7.2.1.2)
activejob (= 7.2.1.2)
activesupport (= 7.2.1.2)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.1)
actionview (= 7.2.1)
activesupport (= 7.2.1)
actionpack (7.2.1.2)
actionview (= 7.2.1.2)
activesupport (= 7.2.1.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.2)
Expand All @@ -32,35 +32,35 @@ GEM
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (7.2.1)
actionpack (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
actiontext (7.2.1.2)
actionpack (= 7.2.1.2)
activerecord (= 7.2.1.2)
activestorage (= 7.2.1.2)
activesupport (= 7.2.1.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.2.1)
activesupport (= 7.2.1)
actionview (7.2.1.2)
activesupport (= 7.2.1.2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.2.1)
activesupport (= 7.2.1)
activejob (7.2.1.2)
activesupport (= 7.2.1.2)
globalid (>= 0.3.6)
activemodel (7.2.1)
activesupport (= 7.2.1)
activerecord (7.2.1)
activemodel (= 7.2.1)
activesupport (= 7.2.1)
activemodel (7.2.1.2)
activesupport (= 7.2.1.2)
activerecord (7.2.1.2)
activemodel (= 7.2.1.2)
activesupport (= 7.2.1.2)
timeout (>= 0.4.0)
activestorage (7.2.1)
actionpack (= 7.2.1)
activejob (= 7.2.1)
activerecord (= 7.2.1)
activesupport (= 7.2.1)
activestorage (7.2.1.2)
actionpack (= 7.2.1.2)
activejob (= 7.2.1.2)
activerecord (= 7.2.1.2)
activesupport (= 7.2.1.2)
marcel (~> 1.0)
activesupport (7.2.1)
activesupport (7.2.1.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
Expand All @@ -77,12 +77,14 @@ GEM
activerecord (>= 3.2, < 8.0)
rake (>= 10.4, < 14.0)
ast (2.4.2)
axe-core-api (4.10.0)
axe-core-api (4.10.1)
dumb_delegator
ostruct
virtus
axe-core-rspec (4.10.0)
axe-core-api (= 4.10.0)
axe-core-rspec (4.10.1)
axe-core-api (= 4.10.1)
dumb_delegator
ostruct
virtus
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand Down Expand Up @@ -129,7 +131,7 @@ GEM
erubi (1.13.0)
factory_bot (6.5.0)
activesupport (>= 5.0.0)
faker (3.4.2)
faker (3.5.1)
i18n (>= 1.8.11, < 2)
faraday (2.12.0)
faraday-net_http (>= 2.0, < 3.4)
Expand All @@ -153,12 +155,12 @@ GEM
activesupport (>= 5.0.0)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
json (2.7.2)
json (2.7.4)
jwt (2.9.3)
base64
language_server-protocol (3.17.0.3)
logger (1.6.1)
loofah (2.22.0)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -174,7 +176,7 @@ GEM
msgpack (1.7.3)
net-http (0.4.1)
uri
net-imap (0.4.17)
net-imap (0.5.0)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -196,13 +198,13 @@ GEM
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
ostruct (0.6.0)
parallel (1.26.3)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
pg (1.5.8)
prism (1.2.0)
propshaft (0.9.1)
pg (1.5.9)
propshaft (1.1.0)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
Expand All @@ -224,20 +226,20 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.2.1)
actioncable (= 7.2.1)
actionmailbox (= 7.2.1)
actionmailer (= 7.2.1)
actionpack (= 7.2.1)
actiontext (= 7.2.1)
actionview (= 7.2.1)
activejob (= 7.2.1)
activemodel (= 7.2.1)
activerecord (= 7.2.1)
activestorage (= 7.2.1)
activesupport (= 7.2.1)
rails (7.2.1.2)
actioncable (= 7.2.1.2)
actionmailbox (= 7.2.1.2)
actionmailer (= 7.2.1.2)
actionpack (= 7.2.1.2)
actiontext (= 7.2.1.2)
actionview (= 7.2.1.2)
activejob (= 7.2.1.2)
activemodel (= 7.2.1.2)
activerecord (= 7.2.1.2)
activestorage (= 7.2.1.2)
activesupport (= 7.2.1.2)
bundler (>= 1.15.0)
railties (= 7.2.1)
railties (= 7.2.1.2)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -249,25 +251,23 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.2.1)
actionpack (= 7.2.1)
activesupport (= 7.2.1)
railties (7.2.1.2)
actionpack (= 7.2.1.2)
activesupport (= 7.2.1.2)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
rbs (3.6.1)
logger
rdoc (6.7.0)
psych (>= 4.0.0)
regexp_parser (2.9.2)
reline (0.5.10)
io-console (~> 0.5)
rexml (3.3.8)
rspec-core (3.13.1)
rexml (3.3.9)
rspec-core (3.13.2)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -286,7 +286,7 @@ GEM
rspec-support (3.13.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.66.1)
rubocop (1.67.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -303,20 +303,15 @@ GEM
rubocop-performance (1.22.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.26.2)
rubocop-rails (2.27.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (3.1.0)
rubocop-rspec (3.2.0)
rubocop (~> 1.61)
ruby-lsp (0.20.0)
language_server-protocol (~> 3.17.0)
prism (>= 1.2, < 2.0)
rbs (>= 3, < 4)
sorbet-runtime (>= 0.5.10782)
ruby-progressbar (1.13.0)
rubyzip (2.3.2)
securerandom (0.3.1)
Expand All @@ -331,14 +326,13 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sorbet-runtime (0.5.11602)
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.1.1)
thor (1.3.2)
thread_safe (0.3.6)
timeout (0.4.1)
turbo-rails (2.0.10)
turbo-rails (2.0.11)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.6)
Expand Down Expand Up @@ -366,7 +360,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.7.0)
zeitwerk (2.7.1)

PLATFORMS
aarch64-linux
Expand All @@ -392,10 +386,10 @@ DEPENDENCIES
jsbundling-rails (~> 1.3)
jwt
pg
propshaft (~> 0.9.1)
propshaft (~> 1.1.0)
pry
puma (>= 5.0)
rails (~> 7.2.0)
puma (>= 6.4.3)
rails (~> 7.2.1, >= 7.2.1.1)
rails-controller-testing
rspec-rails
rspec_junit_formatter
Expand All @@ -405,7 +399,6 @@ DEPENDENCIES
rubocop-rails (>= 2.26.0)
rubocop-rake
rubocop-rspec
ruby-lsp
selenium-webdriver (>= 4.24.0)
simplecov (~> 0.17.0)
stimulus-rails
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/evaluation_forms_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def update
respond_to do |format|
if @evaluation_form.update(evaluation_form_params)
format.html do
redirect_to evaluation_form_url(@evaluation_form), notice: I18n.t("evaluation_form_saved")
redirect_to evaluation_forms_url, notice: I18n.t("evaluation_form_saved")
end
format.json { render :show, status: :ok, location: @evaluation_form }
else
Expand Down
Loading

0 comments on commit e55b445

Please sign in to comment.