Skip to content
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.

Sign up for GitHub

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

Jump to bottom

SRCH-2261 upgrade nokogiri to 1.11.5 #730

Merged
merged 1 commit into from
May 25, 2021
Merged

SRCH-2261 upgrade nokogiri to 1.11.5 #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ group :development, :test do
gem 'faker', '~> 1.8'
gem 'pry-rails', '~> 0.3.6'
gem 'awesome_print'
gem 'puma', '~> 3.12'
gem 'puma', '~> 5.3'
end

group :test do
Expand Down
9 changes: 5 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ GEM
bcrypt (3.1.16)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
bindata (2.4.9)
bindata (2.4.10)
buftok (0.2.0)
builder (3.2.4)
byebug (11.1.3)
Expand Down Expand Up @@ -496,7 +496,7 @@ GEM
net-http-persistent (2.9.4)
newrelic_rpm (5.0.0.342)
nio4r (2.5.7)
nokogiri (1.11.3)
nokogiri (1.11.5)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
omniauth (1.4.3)
Expand Down Expand Up @@ -529,7 +529,8 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (3.1.1)
puma (3.12.6)
puma (5.3.1)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.5.2)
rack (2.2.3)
Expand Down Expand Up @@ -880,7 +881,7 @@ DEPENDENCIES
poltergeist (~> 1.18.1)
pry-byebug (~> 3.5)
pry-rails (~> 0.3.6)
puma (~> 3.12)
puma (~> 5.3)
rack-contrib (~> 2.1.0)
rack-cors (~> 1.1.0)
rails (~> 5.2.0)
Expand Down
28 changes: 20 additions & 8 deletions spec/models/affiliate_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,16 @@
name: 'external-tracking-site'}) }.to_not raise_error
end

it 'should not allow malformed external tracking code' do
expect { described_class.create!({ display_name: 'a site',
footer_fragment: '<script>var a;',
name: 'external-tracking-site'}) }.to raise_error
# malformed tags are rejected, but missing tags are not, i.e. "<h1>foo"
# https://cm-jira.usa.gov/browse/SRCH-2274
it 'does not allow malformed external tracking code' do
affiliate = described_class.new(
valid_attributes.merge(external_tracking_code: '<script>var a;</script')
)
expect(affiliate).not_to be_valid
expect(affiliate.errors.full_messages).to include(
"External tracking code is invalid: 1:35: ERROR: End tag : expected '>'."
)
end

it 'allows valid external tracking code' do
Expand All @@ -532,10 +538,16 @@
name: 'footer-fragment-site'}) }.to_not raise_error
end

it 'should not allow malformed footer_fragment' do
expect { described_class.create!({ display_name: 'a site',
footer_fragment: '<script>var a;',
name: 'footer-fragment-site'}) }.to raise_error
# malformed tags are rejected, but missing tags are not, i.e. "<h1>foo"
# https://cm-jira.usa.gov/browse/SRCH-2274
it 'does not allow a malformed footer_fragment' do
affiliate = described_class.new(
valid_attributes.merge(footer_fragment: '<script>var a;</script')
)
expect(affiliate).not_to be_valid
expect(affiliate.errors.full_messages).to include(
"Footer fragment is invalid: 1:35: ERROR: End tag : expected '>'."
)
end
end

Expand Down