Skip to content

🚨 [security] Update nokogiri 1.18.3 → 1.18.6 (patch) #3581

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ GEM
next_rails (1.4.2)
rainbow (>= 3)
nio4r (2.7.4)
nokogiri (1.18.3)
nokogiri (1.18.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oauth2 (2.0.9)
Expand Down
2 changes: 1 addition & 1 deletion spec/features/conference_registration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
expect(current_path).to eq(new_conference_conference_registration_path(conference.short_title))
click_button 'Register'

expect(conference.user_registered?(participant)).to be(true)
expect(conference.reload.user_registered?(participant)).to be(true)
end
end
end
Expand Down
13 changes: 5 additions & 8 deletions spec/features/roles_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,26 @@

before :each do
sign_in user_to_sign_in
visit admin_conference_roles_path(conference.short_title)
end

scenario "adds role #{role_name}", feature: true, js: true do
click_link('Users', href: admin_conference_role_path(conference.short_title, role_name))
visit admin_conference_role_path(conference.short_title, role_name)

fill_in 'user_email', with: user_with_no_role.email
click_button 'Add'
user_with_no_role.reload

expect(user_with_no_role.has_cached_role?(role.name, conference)).to be true
within('table#users') do
expect(page).to have_text(user_with_no_role.email)
end
end

scenario "removes role #{role_name}", feature: true, js: true do
click_link('Users', href: admin_conference_role_path(conference.short_title, role_name))
visit admin_conference_role_path(conference.short_title, role_name)

bootstrap_switch = find('tr', text: user_with_role.name).find('.bootstrap-switch-container')
bootstrap_switch.click

expect(page).to have_css('.alert', text: "Successfully removed role #{role_name} from user #{user_with_role.email}")
expect(by_role_name).to eq(role_name) | eq('organizer')
user_with_role.reload
expect(user_with_role.has_cached_role?(role_name, conference)).to be false
end
end

Expand Down
19 changes: 12 additions & 7 deletions spec/features/surveys_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,25 @@
end

context 'as an attendee' do
let(:attendee) { create(:user) }
let!(:attendee) { create(:user) }
let!(:conference) do
conf = create(:conference)
create(:registration_period, conference: conf)
conf
end
let!(:registration) { create(:registration, conference: conference, user: attendee) }
let!(:survey) do
survey = create(:survey, surveyable: conference, target: :during_registration)
create :boolean_mandatory, survey: survey
survey
end

before :each do
sign_in attendee
end

scenario 'respond to a survey during registration', feature: true, js: true do
create :registration_period, conference: conference
create :registration, conference: conference, user: attendee
survey = create(:survey, surveyable: conference, target: :during_registration)
create :boolean_mandatory, survey: survey

visit conference_conference_registration_path(conference)
expect(find(:link, survey.title).sibling('.fa-solid')[:title]).to eq('Please fill out the survey')

click_link survey.title
choose 'Yes'
Expand Down
4 changes: 2 additions & 2 deletions spec/features/tickets_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
# It's necessary to multiply by 100 because the price is in cents
page.find('#flash')
expect(flash).to eq('Ticket successfully updated.')
expect(ticket.price).to eq(Money.new(50 * 100, 'USD'))
expect(ticket.title).to eq('Event Ticket')
expect(ticket.reload.price).to eq(Money.new(50 * 100, 'USD'))
expect(ticket.reload.title).to eq('Event Ticket')
expect(Ticket.count).to eq(2)
end

Expand Down
Loading
Loading