summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2013-09-06 14:24:36 +0200
committerPetr Viktorin <pviktori@redhat.com>2013-09-16 13:56:51 +0200
commitac5447f57953dd022f63f9f801c5628df3e4b832 (patch)
tree426d1d12b331bd60778a2da835ad2cd3d7e90d4f
parent771511fd2597c907fc5293ce1289070551240a91 (diff)
downloadfreeipa.git-ac5447f57953dd022f63f9f801c5628df3e4b832.tar.gz
freeipa.git-ac5447f57953dd022f63f9f801c5628df3e4b832.tar.xz
freeipa.git-ac5447f57953dd022f63f9f801c5628df3e4b832.zip
Fix redirection on deletion of last dns record entry
https://fedorahosted.org/freeipa/ticket/3907
-rw-r--r--install/ui/src/freeipa/dns.js2
-rw-r--r--ipatests/test_webui/test_dns.py21
2 files changed, 21 insertions, 2 deletions
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index c31313a1..62b20e31 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -1313,7 +1313,7 @@ IPA.dnsrecord_redirection_dialog = function(spec) {
};
that.on_ok = function() {
- navigation.show_entity_page('dnszone','default');
+ navigation.show_entity('dnszone','default');
};
return that;
diff --git a/ipatests/test_webui/test_dns.py b/ipatests/test_webui/test_dns.py
index aeff77b8..c832190d 100644
--- a/ipatests/test_webui/test_dns.py
+++ b/ipatests/test_webui/test_dns.py
@@ -46,11 +46,12 @@ ZONE_DATA = {
RECORD_PKEY = 'itest'
+A_IP = '192.168.1.10'
RECORD_ADD_DATA = {
'pkey': RECORD_PKEY,
'add': [
('textbox', 'idnsname', RECORD_PKEY),
- ('textbox', 'a_part_ip_address', '192.168.1.10'),
+ ('textbox', 'a_part_ip_address', A_IP),
]
}
@@ -98,6 +99,24 @@ class test_dns(UI_driver):
self.navigate_by_breadcrumb("DNS Zones")
self.delete_record(ZONE_PKEY)
+ def test_last_entry_deletion(self):
+ """
+ Test last entry deletion
+ """
+ self.init_app()
+ self.add_record(ZONE_ENTITY, ZONE_DATA)
+ self.navigate_to_record(ZONE_PKEY)
+ self.add_record(ZONE_ENTITY, RECORD_ADD_DATA,
+ facet=ZONE_DEFAULT_FACET)
+ self.navigate_to_record(RECORD_PKEY)
+ self.delete_record(A_IP, parent=self.get_facet(), table_name='arecord')
+ self.assert_dialog('message_dialog')
+ self.dialog_button_click('ok')
+ self.wait_for_request(n=2)
+ self.assert_facet(ZONE_ENTITY, ZONE_DEFAULT_FACET)
+ self.navigate_by_breadcrumb("DNS Zones")
+ self.delete_record(ZONE_PKEY)
+
def test_config_crud(self):
"""
Basic CRUD: dnsconfig