IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

webui: move service action panel actions to action dropdown

Browse Source 
Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
This commit is contained in:
Petr Vobornik 2014-05-13 17:31:32 +02:00
parent 2af21743df
commit 254b41e485
2 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
install/ui/src/freeipa/service.js
View File

@ -117,11 +117,6 @@ return {
}, },
{ {
name: 'provisioning', name: 'provisioning',
action_panel: {
$factory: IPA.action_panel,
name: 'provisioning_actions',
actions: ['unprovision']
},
fields: [ fields: [
{ {
$type: 'service_provisioning_status', $type: 'service_provisioning_status',
@ -132,14 +127,6 @@ return {
}, },
{ {
name: 'certificate', name: 'certificate',
action_panel: {
$factory: IPA.action_panel,
name: 'cert_actions',
actions: [
'request_cert', 'view_cert', 'get_cert',
'revoke_cert', 'restore_cert'
]
},
fields: [ fields: [
{ {
$type: 'certificate_status', $type: 'certificate_status',
@ -157,6 +144,14 @@ return {
'cert_revoke', 'cert_revoke',
'cert_restore' 'cert_restore'
], ],
header_actions: [
'unprovision',
'request_cert',
'view_cert',
'get_cert',
'revoke_cert',
'restore_cert'
],
state: { state: {
evaluators: [ evaluators: [
IPA.service.has_keytab_evaluator, IPA.service.has_keytab_evaluator,

30
ipatests/test_webui/test_service.py
View File

@ -90,7 +90,6 @@ class test_service(sevice_tasks):
data = self.prep_data() data = self.prep_data()
pkey = data.get('pkey') pkey = data.get('pkey')
csr = self.load_csr(csr_path) csr = self.load_csr(csr_path)
panel = 'cert_actions'
host = self.config.get('ipa_server') host = self.config.get('ipa_server')
realm = self.config.get('ipa_realm') realm = self.config.get('ipa_realm')
@ -100,35 +99,35 @@ class test_service(sevice_tasks):
self.assert_visible("div[name='certificate-missing']") self.assert_visible("div[name='certificate-missing']")
# cert request # cert request
self.action_panel_action(panel, 'request_cert') self.action_list_action('request_cert', confirm=False)
self.fill_text('textarea.certificate', csr) self.fill_text('textarea.certificate', csr)
self.dialog_button_click('issue') self.dialog_button_click('issue')
self.wait_for_request(n=2, d=0.5) self.wait_for_request(n=2, d=0.5)
self.assert_visible("div[name='certificate-valid']") self.assert_visible("div[name='certificate-valid']")
# cert view # cert view
self.action_panel_action(panel, 'view_cert') self.action_list_action('view_cert', confirm=False)
self.wait() self.wait()
self.assert_text("tbody tr:nth-child(2) td:nth-child(2)", host) self.assert_text("tbody tr:nth-child(2) td:nth-child(2)", host)
self.assert_text("tbody tr:nth-child(3) td:nth-child(2)", realm) self.assert_text("tbody tr:nth-child(3) td:nth-child(2)", realm)
self.dialog_button_click('close') self.dialog_button_click('close')
# cert get # cert get
self.action_panel_action(panel, 'get_cert') self.action_list_action('get_cert', confirm=False)
self.wait() self.wait()
# We don't know the cert text, so at least open and close the dialog # We don't know the cert text, so at least open and close the dialog
self.dialog_button_click('close') self.dialog_button_click('close')
## cert revoke # cert revoke
self.action_panel_action(panel, 'revoke_cert') self.action_list_action('revoke_cert', confirm=False)
self.wait() self.wait()
self.select('select', '6') self.select('select', '6')
self.dialog_button_click('ok') self.dialog_button_click('ok')
self.wait_for_request(n=2) self.wait_for_request(n=2)
self.assert_visible("div[name='certificate-revoked']") self.assert_visible("div[name='certificate-revoked']")
## cert restore # cert restore
self.action_panel_action(panel, 'restore_cert') self.action_list_action('restore_cert', confirm=False)
self.wait() self.wait()
self.dialog_button_click('ok') self.dialog_button_click('ok')
self.wait_for_request(n=2) self.wait_for_request(n=2)
@ -155,13 +154,12 @@ class test_service(sevice_tasks):
self.add_record(ENTITY, data) self.add_record(ENTITY, data)
self.navigate_to_record(pkey) self.navigate_to_record(pkey)
panel = 'cert_actions' self.assert_action_list_action('request_cert', visible=False)
self.assert_action_panel_action(panel, 'request_cert', visible=False) self.assert_action_list_action('revoke_cert', visible=False)
self.assert_action_panel_action(panel, 'revoke_cert', visible=False) self.assert_action_list_action('restore_cert', visible=False)
self.assert_action_panel_action(panel, 'restore_cert', visible=False)
self.assert_action_panel_action(panel, 'view_cert', enabled=False) self.assert_action_list_action('view_cert', enabled=False)
self.assert_action_panel_action(panel, 'get_cert', enabled=False) self.assert_action_list_action('get_cert', enabled=False)
self.navigate_by_breadcrumb('Services') self.navigate_by_breadcrumb('Services')
self.delete_record(pkey, data.get('del')) self.delete_record(pkey, data.get('del'))
@ -171,8 +169,8 @@ class test_service(sevice_tasks):
pkey = self.get_http_pkey() pkey = self.get_http_pkey()
self.navigate_to_record(pkey) self.navigate_to_record(pkey)
self.assert_action_panel_action(panel, 'view_cert') self.assert_action_list_action('view_cert')
self.assert_action_panel_action(panel, 'get_cert') self.assert_action_list_action('get_cert')
@screenshot @screenshot
def test_kerberos_flags(self): def test_kerberos_flags(self):