Skip to content
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
15 changes: 15 additions & 0 deletions app/controllers/repp/v1/base_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,21 @@ def render_success(code: nil, message: nil, data: nil)
render(json: @response, status: :ok)
end

def render_action_pending_success(data: nil)
render_success(
code: Epp::Response::Result::Code.codes[:completed_successfully_action_pending],
message: Epp::Response::Result::Code.default_descriptions[1001],
data: data
)
end

def render_domain_command_success(pending:)
data = { domain: { name: @domain.name } }
return render_action_pending_success(data: data) if pending

render_success(data: data)
end

def epp_errors
@epp_errors ||= ActiveModel::Errors.new(self)
end
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/repp/v1/domains_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def update
return
end

render_success(data: { domain: { name: @domain.name } })
render_domain_command_success(pending: @domain.epp_pending_update.present?)
end

api :GET, '/repp/v1/domains/:domain_name/transfer_info'
Expand Down Expand Up @@ -153,7 +153,7 @@ def destroy
handle_errors(@domain) and return unless action.call
# rubocop:enable Style/AndOr

render_success(data: { domain: { name: @domain.name } })
render_domain_command_success(pending: @domain.epp_pending_delete.present?)
end

private
Expand Down
4 changes: 2 additions & 2 deletions test/integration/repp/v1/domains/delete_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ def test_domain_pending_delete_confirmation
@domain.reload
json = JSON.parse(response.body, symbolize_names: true)
assert_response :ok
assert_equal 1000, json[:code]
assert_equal 'Command completed successfully', json[:message]
assert_equal 1001, json[:code]
assert_equal Epp::Response::Result::Code.default_descriptions[1001], json[:message]

assert @domain.statuses.include? DomainStatus::PENDING_DELETE_CONFIRMATION
assert_not @domain.statuses.include? DomainStatus::PENDING_DELETE
Expand Down
8 changes: 7 additions & 1 deletion test/integration/repp/v1/domains/update_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def test_domain_pending_update_on_registrant_change

json = update_domain(registrant: { code: new_registrant.code })

assert_repp_success(json)
assert_repp_action_pending(json)
refute_equal new_registrant.code, @domain.registrant.code
assert_includes @domain.statuses, DomainStatus::PENDING_UPDATE
end
Expand Down Expand Up @@ -202,6 +202,12 @@ def assert_repp_success(json)
assert_equal 1000, json[:code]
end

def assert_repp_action_pending(json)
assert_response :ok
assert_equal 1001, json[:code]
assert_equal Epp::Response::Result::Code.default_descriptions[1001], json[:message]
end

def assert_repp_error(json, http_status:, code:, message:)
assert_response http_status
assert_equal code, json[:code]
Expand Down