diff --git a/Gemfile b/Gemfile index ec206de6e..be7dde430 100644 --- a/Gemfile +++ b/Gemfile @@ -150,6 +150,9 @@ gem 'chronic' # Salesforce gem 'openstax_salesforce' +# see https://stackoverflow.com/a/79361034 +gem 'concurrent-ruby', '1.3.4' + # Allows 'ap' alternative to 'pp', used in a mailer gem 'awesome_print' diff --git a/Gemfile.lock b/Gemfile.lock index 4aa08b3cc..303435498 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,10 +76,10 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_attr (0.17.0) - actionpack (>= 3.0.2, < 8.0) - activemodel (>= 3.0.2, < 8.0) - activesupport (>= 3.0.2, < 8.0) + active_attr (0.17.1) + actionpack (>= 3.0.2, < 8.1) + activemodel (>= 3.0.2, < 8.1) + activesupport (>= 3.0.2, < 8.1) activejob (6.1.7.8) activesupport (= 6.1.7.8) globalid (>= 0.3.6) @@ -88,7 +88,7 @@ GEM activerecord (6.1.7.8) activemodel (= 6.1.7.8) activesupport (= 6.1.7.8) - activerecord-import (1.8.1) + activerecord-import (2.1.0) activerecord (>= 4.2) activestorage (6.1.7.8) actionpack (= 6.1.7.8) @@ -109,27 +109,29 @@ GEM apipie-rails (1.4.2) actionpack (>= 5.0) activesupport (>= 5.0) - ast (2.4.2) - autoprefixer-rails (10.4.19.0) + ast (2.4.3) + autoprefixer-rails (10.4.21.0) execjs (~> 2) awesome_print (1.9.2) - aws-eventstream (1.3.0) - aws-partitions (1.987.0) - aws-record (2.13.2) + aws-eventstream (1.3.2) + aws-partitions (1.1102.0) + aws-record (2.13.3) aws-sdk-dynamodb (~> 1, >= 1.85.0) - aws-sdk-autoscaling (1.121.0) - aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-autoscaling (1.134.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-cloudwatch (1.103.0) - aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-cloudwatch (1.113.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.209.1) + aws-sdk-core (3.223.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-dynamodb (1.125.0) - aws-sdk-core (~> 3, >= 3.207.0) + logger + aws-sdk-dynamodb (1.143.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) aws-sdk-rails (3.13.0) aws-record (~> 2) @@ -139,28 +141,28 @@ GEM aws-sessionstore-dynamodb (~> 2) concurrent-ruby (>= 1.3.1) railties (>= 5.2.0) - aws-sdk-rds (1.252.0) - aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-rds (1.275.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-ses (1.75.0) - aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-ses (1.83.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-sesv2 (1.63.0) - aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-sesv2 (1.75.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.86.0) - aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-sqs (1.94.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) aws-sessionstore-dynamodb (2.2.0) aws-sdk-dynamodb (~> 1, >= 1.85.0) rack (>= 2, < 4) rack-session (>= 1, < 3) - aws-sigv4 (1.10.0) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt (3.1.20) - bigdecimal (3.1.8) - bindata (2.5.0) + bigdecimal (3.1.9) + bindata (2.5.1) bindex (0.8.1) blazer (2.6.5) activerecord (>= 5) @@ -173,7 +175,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.3.0) - byebug (11.1.3) + byebug (12.0.0) capybara (3.40.0) addressable matrix @@ -190,7 +192,7 @@ GEM capybara (>= 1.0, < 4) launchy cgi (0.4.2) - chartkick (5.1.1) + chartkick (5.1.5) childprocess (5.1.0) logger (~> 1.5) choice (0.2.0) @@ -227,84 +229,68 @@ GEM bigdecimal rexml crass (1.0.6) - css_parser (1.19.0) + css_parser (1.21.1) addressable - database_cleaner (2.0.2) + database_cleaner (2.1.0) database_cleaner-active_record (>= 2, < 3) database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) date (3.4.1) - db-query-matchers (0.13.0) - activesupport (>= 4.0, < 7.3) + db-query-matchers (0.14.0) + activesupport (>= 4.0, < 8.1) rspec (>= 3.0) declarative (0.0.20) - delayed_job (4.1.12) - activesupport (>= 3.0, < 8.0) - delayed_job_active_record (4.1.10) - activerecord (>= 3.0, < 8.0) + delayed_job (4.1.13) + activesupport (>= 3.0, < 9.0) + delayed_job_active_record (4.1.11) + activerecord (>= 3.0, < 9.0) delayed_job (>= 3.0, < 5) - delayed_job_heartbeat_plugin (0.5.0) + delayed_job_heartbeat_plugin (0.6.0) delayed_job (>= 4.1.0) delayed_job_active_record (>= 4.1.0) delayed_job_worker_pool (1.0.0) delayed_job (>= 3.0, < 4.2) - diff-lcs (1.5.1) - diffy (3.4.2) + diff-lcs (1.6.2) + diffy (3.4.3) docile (1.4.1) - doorkeeper (5.7.1) + doorkeeper (5.8.2) railties (>= 5) - dotenv (2.8.1) - dotenv-rails (2.8.1) - dotenv (= 2.8.1) - railties (>= 3.2) + dotenv (3.1.8) + dotenv-rails (3.1.8) + dotenv (= 3.1.8) + railties (>= 6.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) error_page_assets (0.4) erubi (1.13.1) eventmachine (1.2.7) - exception_notification (4.5.0) - actionmailer (>= 5.2, < 8) - activesupport (>= 5.2, < 8) + exception_notification (4.6.0) + actionmailer (>= 5.2, < 9) + activesupport (>= 5.2, < 9) execjs (2.10.0) - factory_bot (6.5.0) - activesupport (>= 5.0.0) - factory_bot_rails (6.4.3) - factory_bot (~> 6.4) + factory_bot (6.5.1) + activesupport (>= 6.1.0) + factory_bot_rails (6.4.4) + factory_bot (~> 6.5) railties (>= 5.0.0) - faker (3.4.2) + faker (3.5.1) i18n (>= 1.8.11, < 2) fakeredis (0.9.2) redis (~> 4.8) - faraday (1.10.4) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) + faraday (1.2.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) faraday-http-cache (2.5.1) faraday (>= 0.8) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.2) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) faraday_middleware (1.2.1) faraday (~> 1.0) ffi (1.16.3) @@ -313,20 +299,22 @@ GEM jquery-rails rails (< 7) responders - font-awesome-rails (4.7.0.8) - railties (>= 3.2, < 8.0) + font-awesome-rails (4.7.0.9) + railties (>= 3.2, < 9.0) formatador (1.1.0) get_process_mem (1.0.0) bigdecimal (>= 2.0) ffi (~> 1.0) globalid (1.2.1) activesupport (>= 6.1) - guard (2.18.1) + guard (2.19.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) + logger (~> 1.6) lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) + ostruct (~> 0.6) pry (>= 0.13.0) shellany (~> 0.0) thor (>= 0.18.1) @@ -340,17 +328,18 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - hashdiff (1.1.1) + hashdiff (1.1.2) hashie (5.0.0) - highline (3.1.1) + highline (3.1.2) reline htmlentities (4.3.4) http_accept_language (2.1.1) http_parser.rb (0.8.0) - httpclient (2.8.3) - i18n (1.14.6) + httpclient (2.9.0) + mutex_m + i18n (1.14.7) concurrent-ruby (~> 1.0) - i18n-tasks (1.0.14) + i18n-tasks (1.0.15) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -359,8 +348,9 @@ GEM parser (>= 3.2.2.1) rails-i18n rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.8, >= 1.8.1) terminal-table (>= 1.5.1) - io-console (0.7.2) + io-console (0.8.0) jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -373,21 +363,22 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.7.2) + json (2.12.0) json-jwt (1.15.3.1) activesupport (>= 4.2) aes_key_wrap bindata httpclient - jwt (2.9.3) + jwt (2.10.1) base64 keyword_search (1.5.0) knockoutjs-rails (3.5.1.1) railties (>= 3.1) - language_server-protocol (3.17.0.3) - launchy (3.0.1) + language_server-protocol (3.17.0.5) + launchy (3.1.1) addressable (~> 2.8) childprocess (~> 5.0) + logger (~> 1.6) lev (13.0.0) actionpack (>= 4.2) active_attr @@ -397,19 +388,23 @@ GEM hashie openstax_transaction_isolation openstax_transaction_retry - libv8-node (18.19.0.0) - libv8-node (18.19.0.0-x86_64-darwin) - libv8-node (18.19.0.0-x86_64-linux) + libv8-node (23.6.1.0) + libv8-node (23.6.1.0-aarch64-linux) + libv8-node (23.6.1.0-arm64-darwin) + libv8-node (23.6.1.0-x86_64-darwin) + libv8-node (23.6.1.0-x86_64-linux) + libv8-node (23.6.1.0-x86_64-linux-musl) + lint_roller (1.1.0) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.1) + logger (1.7.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.24.0) + loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) lumberjack (1.2.10) @@ -421,37 +416,49 @@ GEM marcel (1.0.4) maruku (0.7.3) matrix (0.4.2) - meta_request (0.8.3) + meta_request (0.8.5) rack-contrib (>= 1.1, < 3) - railties (>= 3.0.0, < 8) + railties (>= 3.0.0, < 9) method_source (1.1.0) mini_mime (1.1.5) - mini_portile2 (2.8.8) - mini_racer (0.16.0) - libv8-node (~> 18.19.0.0) - minitest (5.25.4) - msgpack (1.7.3) + mini_racer (0.18.1) + libv8-node (~> 23.6.1.0) + minitest (5.25.5) + msgpack (1.8.0) multi_json (1.15.0) - multi_xml (0.6.0) + multi_xml (0.7.1) + bigdecimal (~> 3.1) multipart-post (2.4.1) + mutex_m (0.3.0) nenv (0.3.0) - net-imap (0.5.7) + net-http (0.6.0) + uri + net-imap (0.5.8) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.5.0) + net-smtp (0.5.1) net-protocol nio4r (2.7.4) - nokogiri (1.18.8) - mini_portile2 (~> 2.8.2) + nokogiri (1.18.8-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.8-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.8-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.8-arm-linux-musl) + racc (~> 1.4) + nokogiri (1.18.8-arm64-darwin) racc (~> 1.4) nokogiri (1.18.8-x86_64-darwin) racc (~> 1.4) nokogiri (1.18.8-x86_64-linux-gnu) racc (~> 1.4) + nokogiri (1.18.8-x86_64-linux-musl) + racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) @@ -461,13 +468,14 @@ GEM version_gem (~> 1.1) oauth-tty (1.0.5) version_gem (~> 1.1, >= 1.1.1) - oauth2 (1.4.11) + oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 4) - oj (3.16.6) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oj (3.16.10) bigdecimal (>= 3.0) ostruct (>= 0.2) oj_mimic_json (1.0.1) @@ -477,14 +485,15 @@ GEM omniauth-facebook (10.0.0) bigdecimal omniauth-oauth2 (>= 1.2, < 3) - omniauth-google-oauth2 (0.8.2) + omniauth-google-oauth2 (0.8.0) jwt (>= 2.0) - oauth2 (~> 1.1) - omniauth (~> 1.1) + omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.6) - omniauth-identity (3.0.9) - bcrypt - omniauth + omniauth-identity (3.1.2) + bcrypt (~> 3.1) + mutex_m (~> 0.1) + omniauth (>= 1) + version_gem (~> 1.1, >= 1.1.8) omniauth-oauth (1.2.1) oauth omniauth (>= 1.0, < 3) @@ -515,7 +524,7 @@ GEM rails (>= 3.0) openstax_rescue_from (4.3.0) rails (>= 3.1, < 7.0) - openstax_salesforce (8.1.0) + openstax_salesforce (8.2.0) openstax_active_force rails (>= 5.0, < 7.0) restforce @@ -532,17 +541,17 @@ GEM lev rails (>= 5.0, < 8.0) request_store - ostruct (0.6.0) + ostruct (0.6.1) p3p (2.0.0) rack (>= 1.6.2) - parallel (1.26.3) - parallel_tests (4.7.2) + parallel (1.27.0) + parallel_tests (5.2.0) parallel - parser (3.3.5.0) + parser (3.3.8.0) ast (~> 2.4.1) racc pg (1.5.9) - posthog-ruby (2.5.1) + posthog-ruby (2.9.0) concurrent-ruby (~> 1) premailer (1.27.0) addressable @@ -552,12 +561,13 @@ GEM actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - pry (0.14.2) + prism (1.4.0) + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) psych (3.3.4) - public_suffix (6.0.1) - puma (6.4.3) + public_suffix (6.0.2) + puma (6.6.0) nio4r (~> 2.0) puma_worker_killer (1.0.0) bigdecimal (>= 2.0) @@ -604,10 +614,10 @@ GEM rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - rails-i18n (7.0.9) + rails-i18n (7.0.10) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - rails-settings-cached (2.9.5) + rails-settings-cached (2.9.6) activerecord (>= 5.0.0) railties (>= 5.0.0) railties (6.1.7.8) @@ -622,8 +632,8 @@ GEM rb-inotify (0.11.1) ffi (~> 1.0) redis (4.8.1) - redis-actionpack (5.4.0) - actionpack (>= 5, < 8) + redis-actionpack (5.5.0) + actionpack (>= 5) redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) redis-activesupport (5.3.0) @@ -640,8 +650,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.11.0) redis (>= 4, < 6) - regexp_parser (2.9.2) - reline (0.5.10) + regexp_parser (2.10.0) + reline (0.6.1) io-console (~> 0.5) representable (3.2.0) declarative (< 0.1.0) @@ -652,14 +662,14 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - restforce (7.5.0) - faraday (>= 1.1.0, < 2.12.0) + restforce (8.0.0) + faraday (>= 1.1.0, < 3.0.0) faraday-follow_redirects (<= 0.3.0, < 1.0.0) faraday-multipart (>= 1.0.0, < 2.0.0) faraday-net_http (< 4.0.0) hashie (>= 1.2.0, < 6.0) jwt (>= 1.5.6) - rexml (3.3.9) + rexml (3.4.1) roar (1.2.0) representable (~> 3.1) roar-rails (1.2.0) @@ -673,44 +683,47 @@ GEM rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.1) + rspec-core (3.13.3) rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) + rspec-expectations (3.13.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-instafail (1.0.0) rspec - rspec-mocks (3.13.2) + rspec-mocks (3.13.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.13.1) - rubocop (1.67.0) + rspec-rails (6.1.5) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.3) + rubocop (1.75.5) json (~> 2.3) - language_server-protocol (>= 3.17.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.4, < 3.0) - rubocop-ast (>= 1.32.2, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.44.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) - parser (>= 3.3.1.0) - rubocop-rspec (3.1.0) - rubocop (~> 1.61) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.44.1) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-rspec (3.6.0) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) ruby-graphviz (1.2.5) rexml ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - rubyzip (2.3.2) + rubyzip (2.4.1) safely_block (0.4.1) sass (3.4.19) sass-rails (5.0.8) @@ -726,25 +739,25 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sentry-delayed_job (5.20.1) + sentry-delayed_job (5.23.0) delayed_job (>= 4.0) - sentry-ruby (~> 5.20.1) - sentry-rails (5.20.1) + sentry-ruby (~> 5.23.0) + sentry-rails (5.23.0) railties (>= 5.0) - sentry-ruby (~> 5.20.1) - sentry-ruby (5.20.1) + sentry-ruby (~> 5.23.0) + sentry-ruby (5.23.0) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) shellany (0.0.1) - shoulda-matchers (3.1.3) - activesupport (>= 4.0.0) + shoulda-matchers (6.5.0) + activesupport (>= 5.2.0) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - smarter_csv (1.12.1) + smarter_csv (1.14.3) snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) @@ -756,25 +769,28 @@ GEM actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) + terminal-table (4.0.0) + unicode-display_width (>= 1.1.1, < 4) terser (1.2.5) execjs (>= 0.3.0, < 3) test_xml (0.1.8) diffy (~> 3.0) nokogiri (>= 1.3.2) thor (1.3.2) - tilt (2.4.0) + tilt (2.6.0) timecop (0.9.10) timeout (0.4.3) trailblazer-option (0.1.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.6.0) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) + uri (1.0.3) vcr (6.3.1) base64 - version_gem (1.1.4) + version_gem (1.1.8) web-console (4.2.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) @@ -784,7 +800,7 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0, < 4.11) - webmock (3.24.0) + webmock (3.25.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -803,9 +819,16 @@ GEM zeitwerk (2.6.18) PLATFORMS - ruby + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin x86_64-darwin x86_64-linux + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES action_interceptor @@ -829,6 +852,7 @@ DEPENDENCIES codecov coffee-rails compass-rails + concurrent-ruby (= 1.3.4) database_cleaner db-query-matchers delayed_job_active_record @@ -921,4 +945,4 @@ DEPENDENCIES will_paginate BUNDLED WITH - 2.3.27 + 2.6.2 diff --git a/app/routines/update_user_contact_info.rb b/app/routines/update_user_contact_info.rb index b492791cc..765c73c0a 100644 --- a/app/routines/update_user_contact_info.rb +++ b/app/routines/update_user_contact_info.rb @@ -117,8 +117,6 @@ def call end user.adopter_status = sf_contact.adoption_status - user.is_kip = sf_school&.is_kip || sf_school&.is_child_of_kip - user.grant_tutor_access = sf_contact.grant_tutor_access if school.nil? && !sf_school.nil? users_without_cached_school += 1 @@ -141,11 +139,9 @@ def salesforce_contacts contacts ||= OpenStax::Salesforce::Remote::Contact.select( :id, :email, - :email_alt, :faculty_verified, :school_type, :adoption_status, - :grant_tutor_access, :accounts_uuid ) .where("Accounts_UUID__c != null") diff --git a/config/puma.rb b/config/puma.rb index 2e447bc7d..3fa393912 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,6 +1,6 @@ require 'rails' require 'active_model' -require 'dotenv/rails-now' +require "dotenv/load" require_relative 'dev_url_options' diff --git a/spec/cassettes/Newflow/Students/student_signup_flow/sf_setup.yml b/spec/cassettes/Newflow/Students/student_signup_flow/sf_setup.yml deleted file mode 100644 index 484c3538d..000000000 --- a/spec/cassettes/Newflow/Students/student_signup_flow/sf_setup.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- -http_interactions: -- request: - method: post - uri: https:///services/oauth2/token - body: - encoding: US-ASCII - string: grant_type=password&client_id=&client_secret=&username=&password= - headers: - User-Agent: - - Faraday v1.10.4 - Content-Type: - - application/x-www-form-urlencoded - Accept-Encoding: - - gzip;q=1.0,deflate;q=0.6,identity;q=0.3 - Accept: - - "*/*" - response: - status: - code: 200 - message: OK - headers: - Date: - - Fri, 18 Oct 2024 23:41:46 GMT - Set-Cookie: - - BrowserId=iWXHOY2qEe-om4-Ar5tPbw; domain=.salesforce.com; path=/; expires=Sat, - 18-Oct-2025 23:41:46 GMT; Max-Age=31536000; secure; SameSite=None - - CookieConsentPolicy=0:0; path=/; expires=Sat, 18-Oct-2025 23:41:46 GMT; Max-Age=31536000; - secure - - LSKey-c$CookieConsentPolicy=0:0; path=/; expires=Sat, 18-Oct-2025 23:41:46 - GMT; Max-Age=31536000; secure - Strict-Transport-Security: - - max-age=63072000; includeSubDomains - X-Content-Type-Options: - - nosniff - Cache-Control: - - no-cache,must-revalidate,max-age=0,no-store,private - Expires: - - Thu, 01 Jan 1970 00:00:00 GMT - X-Readonlymode: - - 'false' - Content-Type: - - application/json;charset=UTF-8 - Vary: - - Accept-Encoding - Transfer-Encoding: - - chunked - body: - encoding: ASCII-8BIT - string: '{"access_token":"","instance_url":"","id":"https:///id/00DU0000000KwchMAC/005U0000005akrEIAQ","token_type":"Bearer","issued_at":"1729294906256","signature":""}' - recorded_at: Fri, 18 Oct 2024 23:41:46 GMT -recorded_with: VCR 6.3.1 diff --git a/spec/features/newflow/student_signup_flow_spec.rb b/spec/features/newflow/student_signup_flow_spec.rb index 372c0eea0..cd353c174 100644 --- a/spec/features/newflow/student_signup_flow_spec.rb +++ b/spec/features/newflow/student_signup_flow_spec.rb @@ -2,19 +2,12 @@ require 'vcr_helper' require 'byebug' module Newflow - feature 'Student signup flow', js: true, vcr: VCR_OPTS do + feature 'Student signup flow', js: true do before do load 'db/seeds.rb' turn_on_student_feature_flag end - before(:all) do - VCR.use_cassette('Newflow/Students/student_signup_flow/sf_setup', VCR_OPTS) do - @proxy = SalesforceProxy.new - @proxy.setup_cassette - end - end - let(:email) do Faker::Internet::email end