zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-07 21:25:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into refactor-messages

Browse source 
# Conflicts:
#	app/controllers/epp/polls_controller.rb
#	test/fixtures/messages.yml
#	test/integration/epp/poll_test.rb
#	test/models/message_test.rb
This commit is contained in:
Artur Beljajev 2018-09-17 13:30:25 +03:00
commit 52feefeb79
3 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/epp/polls_controller.rb
View file

@ -9,7 +9,7 @@ class Epp::PollsController < EppController
private private
def req_poll def req_poll
@notification = current_user.unread_notifications.last @notification = current_user.unread_notifications.order('created_at DESC').take
render_epp_response 'epp/poll/poll_no_messages' and return unless @notification render_epp_response 'epp/poll/poll_no_messages' and return unless @notification
if @notification.attached_obj_type && @notification.attached_obj_id if @notification.attached_obj_type && @notification.attached_obj_id

1
test/fixtures/notifications.yml vendored
View file

@ -2,6 +2,7 @@ greeting:
text: Welcome! text: Welcome!
read: false read: false
registrar: bestnames registrar: bestnames
created_at: <%= Time.zone.parse('2010-07-04') %>
domain_deleted: domain_deleted:
text: Your domain has been deleted text: Your domain has been deleted

19
test/integration/epp/poll_test.rb
View file

@ -24,25 +24,6 @@ class EppPollTest < ApplicationIntegrationTest
assert_equal 'Your domain has been deleted', response_xml.at_css('msgQ msg').text assert_equal 'Your domain has been deleted', response_xml.at_css('msgQ msg').text
end end
request_xml = <<-XML
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
<command>
<poll op="req"/>
</command>
</epp>
XML
post '/epp/command/poll', { frame: request_xml }, 'HTTP_COOKIE' => 'session=api_bestnames'
xml_doc = Nokogiri::XML(response.body)
assert_equal 1301.to_s, xml_doc.at_css('result')[:code]
assert_equal 1, xml_doc.css('result').size
assert_equal 2.to_s, xml_doc.at_css('msgQ')[:count]
assert_equal notification.id.to_s, xml_doc.at_css('msgQ')[:id]
assert_equal Time.zone.parse('2010-07-05').iso8601, xml_doc.at_css('msgQ qDate').text
assert_equal 'Your domain has been deleted', xml_doc.at_css('msgQ msg').text
end
def test_no_notifications def test_no_notifications
registrars(:bestnames).notifications.delete_all(:delete_all) registrars(:bestnames).notifications.delete_all(:delete_all)