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

Fix undefined method error in sidekiq #9807

Merged
merged 2 commits into from Jan 14, 2019
Merged

Fix undefined method error in sidekiq #9807

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c355dc
Fix undefined method error in sidekiq
renatolond Jan 14, 2019
ec3d88a
Fix codeclimate issue
renatolond Jan 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/services/fetch_oembed_service.rb
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@ def fetch!
res.code != 200 ? nil : res.body_with_limit
end

validate(parse_for_format(body)) unless body.nil?
validate(parse_for_format(body)) unless body.blank?
rescue Oj::ParseError, Ox::ParseError
nil
end
Expand Down
7 changes: 7 additions & 0 deletions spec/fixtures/requests/oembed_json_empty.html
View file
Open in desktop
@@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link href='https://host.test/empty_provider.json' rel='alternate' type='application/json+oembed'>
</head>
<body></body>
</html>
18 changes: 18 additions & 0 deletions spec/services/fetch_oembed_service_spec.rb
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@
before do
stub_request(:get, "https://host.test/provider.json").to_return(status: 404)
stub_request(:get, "https://host.test/provider.xml").to_return(status: 404)
stub_request(:get, "https://host.test/empty_provider.json").to_return(status: 200)
end

describe 'discover_provider' do
Expand Down Expand Up @@ -93,6 +94,23 @@
expect(subject.call('https://host.test/oembed.html')).to be_nil
end
end

context 'Empty JSON provider is discoverable' do
before do
stub_request(:get, 'https://host.test/oembed.html').to_return(
status: 200,
headers: { 'Content-Type': 'text/html' },
body: request_fixture('oembed_json_empty.html')
)
end

it 'returns new OEmbed::Provider for JSON provider' do
subject.call('https://host.test/oembed.html')
expect(subject.endpoint_url).to eq 'https://host.test/empty_provider.json'
expect(subject.format).to eq :json
end
end

end

context 'when status code is not 200' do
Expand Down