diff --git a/Gemfile b/Gemfile index 5f90a81b5..5f3eae436 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ source 'https://rubygems.org' ruby File.read(".ruby-version").strip gem 'puma' -gem 'rails', '~> 6.1.6.1' +gem 'rails', '~> 6.1.6' gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f' gem 'mime-types-data' gem 'mime-types' diff --git a/Gemfile.lock b/Gemfile.lock index 339eb37a1..90d9906ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,40 +13,40 @@ GEM GEM remote: https://rubygems.org/ specs: - actioncable (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + actioncable (6.1.7.2) + actionpack (= 6.1.7.2) + activesupport (= 6.1.7.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionmailbox (6.1.7.2) + actionpack (= 6.1.7.2) + activejob (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) mail (>= 2.7.1) - actionmailer (6.1.6.1) - actionpack (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionmailer (6.1.7.2) + actionpack (= 6.1.7.2) + actionview (= 6.1.7.2) + activejob (= 6.1.7.2) + activesupport (= 6.1.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.6.1) - actionview (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionpack (6.1.7.2) + actionview (= 6.1.7.2) + activesupport (= 6.1.7.2) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.6.1) - actionpack (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actiontext (6.1.7.2) + actionpack (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) nokogiri (>= 1.8.5) - actionview (6.1.6.1) - activesupport (= 6.1.6.1) + actionview (6.1.7.2) + activesupport (= 6.1.7.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -58,26 +58,26 @@ GEM activemodel (>= 4.1, < 7.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (6.1.6.1) - activesupport (= 6.1.6.1) + activejob (6.1.7.2) + activesupport (= 6.1.7.2) globalid (>= 0.3.6) - activemodel (6.1.6.1) - activesupport (= 6.1.6.1) + activemodel (6.1.7.2) + activesupport (= 6.1.7.2) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.1.6.1) - activemodel (= 6.1.6.1) - activesupport (= 6.1.6.1) - activestorage (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activesupport (= 6.1.6.1) + activerecord (6.1.7.2) + activemodel (= 6.1.7.2) + activesupport (= 6.1.7.2) + activestorage (6.1.7.2) + actionpack (= 6.1.7.2) + activejob (= 6.1.7.2) + activerecord (= 6.1.7.2) + activesupport (= 6.1.7.2) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.6.1) + activesupport (6.1.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -92,7 +92,7 @@ GEM autoprefixer-rails (10.4.7.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.705.0) + aws-partitions (1.710.0) aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -369,20 +369,20 @@ GEM rack-test (2.0.2) rack (>= 1.3) rack-timeout (0.6.3) - rails (6.1.6.1) - actioncable (= 6.1.6.1) - actionmailbox (= 6.1.6.1) - actionmailer (= 6.1.6.1) - actionpack (= 6.1.6.1) - actiontext (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activemodel (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + rails (6.1.7.2) + actioncable (= 6.1.7.2) + actionmailbox (= 6.1.7.2) + actionmailer (= 6.1.7.2) + actionpack (= 6.1.7.2) + actiontext (= 6.1.7.2) + actionview (= 6.1.7.2) + activejob (= 6.1.7.2) + activemodel (= 6.1.7.2) + activerecord (= 6.1.7.2) + activestorage (= 6.1.7.2) + activesupport (= 6.1.7.2) bundler (>= 1.15.0) - railties (= 6.1.6.1) + railties (= 6.1.7.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -393,9 +393,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) - railties (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + railties (6.1.7.2) + actionpack (= 6.1.7.2) + activesupport (= 6.1.7.2) method_source rake (>= 12.2) thor (~> 1.0) @@ -412,7 +412,7 @@ GEM redcarpet (3.6.0) redis-client (0.12.1) connection_pool - regexp_parser (2.6.2) + regexp_parser (2.7.0) request_store (1.5.1) rack (>= 1.4) responders (3.1.0) @@ -527,7 +527,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby @@ -590,7 +590,7 @@ DEPENDENCIES pundit rack-mini-profiler rack-timeout (~> 0.6) - rails (~> 6.1.6.1) + rails (~> 6.1.6) rails-assets-momentjs! rails-controller-testing react-rails diff --git a/spec/features/staff/proposals_spec.rb b/spec/features/staff/proposals_spec.rb index ac682c94e..d0a395dbc 100644 --- a/spec/features/staff/proposals_spec.rb +++ b/spec/features/staff/proposals_spec.rb @@ -142,25 +142,25 @@ end # FactoryBot 😤 - # context "Promoting a waitlisted proposal" do - # let(:proposal) { create(:proposal_with_track, state: Proposal::State::WAITLISTED) } - # let(:program_session) { create(:program_session_with_proposal, state: ProgramSession::UNCONFIRMED_WAITLISTED, proposal: proposal) } - # - # before do - # visit event_staff_program_session_path(event, program_session) - # click_link 'Promote' - # end - # - # it "sets proposal state to accepted and program session state to unconfirmed_accepted" do - # skip "FactoryBot 😤" - # expect(proposal.reload.state).to eql(Proposal::State::ACCEPTED) - # expect(program_session.reload.state).to eql(ProgramSession::UNCONFIRMED_ACCEPTED) - # end - # - # it "doesn't send an email notification" do - # skip "FactoryBot 😤" - # expect(ActionMailer::Base.deliveries).to be_empty - # end - # end - # end + # context "Promoting a waitlisted proposal" do + # let(:proposal) { create(:proposal_with_track, state: Proposal::State::WAITLISTED) } + # let(:program_session) { create(:program_session_with_proposal, state: ProgramSession::UNCONFIRMED_WAITLISTED, proposal: proposal) } + # + # before do + # visit event_staff_program_session_path(event, program_session) + # click_link 'Promote' + # end + # + # it "sets proposal state to accepted and program session state to unconfirmed_accepted" do + # skip "FactoryBot 😤" + # expect(proposal.reload.state).to eql(Proposal::State::ACCEPTED) + # expect(program_session.reload.state).to eql(ProgramSession::UNCONFIRMED_ACCEPTED) + # end + # + # it "doesn't send an email notification" do + # skip "FactoryBot 😤" + # expect(ActionMailer::Base.deliveries).to be_empty + # end + # end + end end