zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-04 08:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix bulk action notifications

Browse source
This commit is contained in:
Karl Erik Õunapuu 2020-12-22 19:56:51 +02:00
parent 8fffe6e736
commit 7c2e43197b
No known key found for this signature in database
GPG key ID: C9DD647298A34764
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/registrar/domain_transfers_controller.rb
View file

@ -56,7 +56,7 @@ class Registrar
if response.code == '200'
failed = parsed_response[:data][:failed].each(&:domain_name).join(', ')
flash[:notice] = t('.transferred', success: parsed_response[:data][:success].size,
flash[:notice] = t('.transferred', count: parsed_response[:data][:success].size,
failed: failed)
redirect_to registrar_domains_url
else

4
app/views/registrar/bulk_change/_api_errors.html.erb
View file

@ -1,9 +1,13 @@
<% if @api_errors %>
<div class="alert alert-danger">
<ul>
<% if @api_errors.is_a?(String) %>
<li><%= @api_errors %></li>
<% else %>
<% @api_errors.each do |error| %>
<li><%= error[:title] %></li>
<% end %>
<% end %>
</ul>
</div>
<% end %>

4
app/views/registrar/domain_transfers/form/_api_errors.html.erb
View file

@ -1,9 +1,13 @@
<% if @api_errors %>
<div class="alert alert-danger">
<ul>
<% if @api_errors.is_a?(String) %>
<li><%= @api_errors %></li>
<% else %>
<% @api_errors.each do |error| %>
<li><%= error[:title] %></li>
<% end %>
<% end %>
</ul>
</div>
<% end %>

8
test/system/registrar_area/bulk_change/bulk_transfer_test.rb
View file

@ -11,9 +11,9 @@ class RegistrarAreaBulkTransferTest < ApplicationSystemTestCase
request_stub = stub_request(:post, /domains\/transfer/).with(body: request_body,
headers: headers,
basic_auth: ['test_goodnames', 'testtest'])
.to_return(body: { data: [{
type: 'domain_transfer'
}] }.to_json, status: 200)
.to_return(body: { data: { success: [{ type: 'domain_transfer', domain_name: 'shop.test' }],
failed: []
} }.to_json, status: 200)
visit registrar_domains_url
click_link 'Bulk change'
@ -27,7 +27,7 @@ class RegistrarAreaBulkTransferTest < ApplicationSystemTestCase
end
def test_fail_gracefully
body = { errors: [{ title: 'epic fail' }] }.to_json
body = { message: 'epic fail' }.to_json
headers = { 'Content-type' => Mime[:json] }
stub_request(:post, /domains\/transfer/).to_return(status: 400, body: body, headers: headers)

6
test/system/registrar_area/bulk_change/tech_contact_test.rb
View file

@ -9,8 +9,8 @@ class RegistrarAreaTechContactBulkChangeTest < ApplicationSystemTestCase
request_stub = stub_request(:patch, /domains\/contacts/)
.with(body: { current_contact_id: 'william-001', new_contact_id: 'john-001' },
basic_auth: ['test_bestnames', 'testtest'])
.to_return(body: { affected_domains: %w[foo.test bar.test],
skipped_domains: %w[baz.test qux.test] }.to_json,
.to_return(body: { data: { affected_domains: %w[foo.test bar.test],
skipped_domains: %w[baz.test qux.test] } }.to_json,
status: 200)
visit registrar_domains_url
@ -30,7 +30,7 @@ class RegistrarAreaTechContactBulkChangeTest < ApplicationSystemTestCase
def test_fails_gracefully
stub_request(:patch, /domains\/contacts/)
.to_return(status: 400,
body: { error: { message: 'epic fail' } }.to_json,
body: { message: 'epic fail' }.to_json,
headers: { 'Content-type' => Mime[:json] })
visit registrar_domains_url