gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Delint from a local pronto run

Browse source
This commit is contained in:
Michael Ball 2021-02-24 20:53:28 -08:00
parent 27873c307b
commit 5c902e7e36
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/events_helper.rb
View file

@ -221,7 +221,7 @@ module EventsHelper
def calendar_event_text(event, event_schedule, conference) def calendar_event_text(event, event_schedule, conference)
<<~TEXT <<~TEXT
#{conference.title} - #{event.title} #{conference.title} - #{event.title}
#{event_schedule.start_time.strftime("%Y %B %e - %H:%M")} #{event_schedule.timezone} #{event_schedule.start_time.strftime('%Y %B %e - %H:%M')} #{event_schedule.timezone}
More Info: #{conference_program_proposal_url(conference, event)} More Info: #{conference_program_proposal_url(conference, event)}
Join: #{event.url} Join: #{event.url}

6
config/puma.rb
View file

@ -46,9 +46,9 @@ end
lowlevel_error_handler do |ex, env| lowlevel_error_handler do |ex, env|
Sentry.capture_exception( Sentry.capture_exception(
ex, ex,
:message => ex.message, message: ex.message,
:extra => { :puma => env }, extra: { puma: env },
:transaction => "Puma" transaction: "Puma"
) )
# note the below is just a Rack response # note the below is just a Rack response
[500, {}, ["An error has occurred, and engineers have been informed. Please reload the page. If you continue to have problems, contact conference@snap.berkeley.edu\n"]] [500, {}, ["An error has occurred, and engineers have been informed. Please reload the page. If you continue to have problems, contact conference@snap.berkeley.edu\n"]]

2
spec/features/commercials_spec.rb
View file

@ -69,7 +69,7 @@ feature Commercial do
scenario 'does not add an invalid commercial of an event', feature: true, js: true do scenario 'does not add an invalid commercial of an event', feature: true, js: true do
# TODO-SNAPCON # TODO-SNAPCON
skip("Snap!Con allows all materials to be saved.") skip('Snap!Con allows all materials to be saved.')
visit edit_conference_program_proposal_path(conference.short_title, event.id) visit edit_conference_program_proposal_path(conference.short_title, event.id)
click_link 'Materials' click_link 'Materials'
fill_in 'commercial_url', with: 'invalid_commercial_url' fill_in 'commercial_url', with: 'invalid_commercial_url'

3
spec/support/external_request.rb
View file

@ -35,6 +35,7 @@ def mock_commercial_request
end end
def mock_image_request def mock_image_request
WebMock.stub_request(:post, "https://api.cloudinary.com/v1_1/snapcon/image/destroy") # TODO-SNAPCON: This needs to be configurable somehow.
WebMock.stub_request(:post, 'https://api.cloudinary.com/v1_1/snapcon/image/destroy')
.to_return(status: 200, body: {}.to_json, headers: {}) .to_return(status: 200, body: {}.to_json, headers: {})
end end