openstack/murano-dashboard
Code Issues Proposed changes

Rename 'Package Definitions' tab to 'Packages'

Browse Source 
This page contains information about packages, not about package definitions
(which are MuranoPL classes).

Change-Id: I55d9ff04cf34b62be4b9783a09182b08ca38acd3
This commit is contained in:
Ekaterina Chernova 2016-01-21 18:01:43 +03:00
parent e3d0764c4c
commit bf2c140071
9 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
muranodashboard/locale/django.pot
View File

@ -736,7 +736,7 @@ msgstr ""
#: muranodashboard/packages/panel.py:22 muranodashboard/packages/tables.py:238
#: muranodashboard/templates/packages/index.html:5
msgid "Package Definitions"
msgid "Packages"
msgstr ""
#: muranodashboard/packages/tables.py:34
@ -1249,7 +1249,7 @@ msgid "'Import Bundle'"
msgstr ""
#: muranodashboard/templates/packages/index.html:15
msgid "\"Package Definitions\""
msgid "\"Packages\""
msgstr ""
#: muranodashboard/templates/packages/modify_package.html:6

2
muranodashboard/packages/panel.py
View File

@ -19,7 +19,7 @@ from muranodashboard import dashboard
class PackageDefinitions(horizon.Panel):
name = _("Package Definitions")
name = _("Packages")
slug = 'packages'

2
muranodashboard/packages/tables.py
View File

@ -236,7 +236,7 @@ class PackageDefinitionsTable(tables.DataTable):
class Meta(object):
name = 'packages'
prev_pagination_param = 'marker'
verbose_name = _('Package Definitions')
verbose_name = _('Packages')
template = 'common/_data_table.html'
table_actions = (PackagesFilterAction,
ImportPackage,

2
muranodashboard/templates/catalog/index.html
View File

@ -112,7 +112,7 @@
target="_blank"> {{ repo_url }}</a>.
<br><br>
Go to
<b><a href={{ pkg_def_url }}>Package Definitions</a></b>,
<b><a href={{ pkg_def_url }}>Packages</a></b>,
click 'Import Package' and select <i>Repository</i> as a
<i>Package Source</i>. {% endblocktrans %}
{% else %}

4
muranodashboard/templates/packages/index.html
View File

@ -2,7 +2,7 @@
{% load i18n %}
{% load static %}
{% load compress %}
{% block title %}{% trans "Package Definitions" %}{% endblock %}
{% block title %}{% trans "Packages" %}{% endblock %}
{% block css %}
{{ block.super }}
@ -12,7 +12,7 @@
{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Package Definitions") %}
{% include "horizon/common/_page_header.html" with title=_("Packages") %}
{% endblock page_header %}
{% block main %}
{{ table.render }}

2
muranodashboard/templates/services/_data_table.html
View File

@ -69,7 +69,7 @@
<a href="{{ repo_url }}" target="_blank"> {{ repo_url }}</a>.
<br><br>
Go to
<b><a href={{ pkg_def_url }}>Package Definitions</a></b>,
<b><a href={{ pkg_def_url }}>Packages</a></b>,
click 'Import Package' and select
<i>Repository</i> as a <i>Package Source</i>.
{% endblocktrans %}

2
muranodashboard/tests/functional/base.py
View File

@ -127,7 +127,7 @@ class UITestCase(BaseDeps):
def get_element_id(self, el_name):
el = ui.WebDriverWait(self.driver, 10).until(
EC.presence_of_element_located(
(by.By.XPATH, consts.AppPackageDefinitions.format(el_name))))
(by.By.XPATH, consts.AppPackages.format(el_name))))
path = el.get_attribute("id")
return path.split('__')[-1]

2
muranodashboard/tests/functional/consts.py
View File

@ -8,7 +8,7 @@ HotPackageDir = os.path.join(os.path.dirname(os.path.realpath(__file__)),
CategorySelector = "//a[contains(text(), '{0}')][contains(@class, 'dropdown-toggle')]" # noqa
App = "//div[contains(@class, 'app-list')]//h4[contains(text(), '{0}')]"
MockAppDescr = "//div[h4[contains(text(), 'MockApp')]]/p"
AppPackageDefinitions = "//tr[@data-display='{0}']"
AppPackages = "//tr[@data-display='{0}']"
TagInDetails = "//div[contains(@class, 'app-meta')]//ul//li[strong[contains(text(), 'Tags')]]" # noqa
TestImage = "//tr[td[contains(text(), '{0}')]]"
DeleteImageMeta = TestImage + "//td//button[contains(text(), 'Delete Metadata')]" # noqa

48
muranodashboard/tests/functional/sanity_check.py
View File

@ -44,8 +44,8 @@ class TestSuiteSmoke(base.UITestCase):
def test_smoke_package_definitions_panel(self):
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.check_panel_is_present('Package Definitions')
self.go_to_submenu('Packages')
self.check_panel_is_present('Packages')
class TestSuiteEnvironment(base.ApplicationTestCase):
@ -640,12 +640,12 @@ class TestSuitePackages(base.PackageTestCase):
"""Test check ability to change name of the package
Scenario:
1. Navigate to 'Package Definitions' page
1. Navigate to 'Packages' page
2. Select package and click on 'Modify Package'
3. Rename package
"""
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.select_action_for_package(self.postgre_id,
'modify_package')
self.fill_field(by.By.ID, 'id_name', 'PostgreSQL-modified')
@ -653,7 +653,7 @@ class TestSuitePackages(base.PackageTestCase):
self.wait_for_alert_message()
self.check_element_on_page(by.By.XPATH,
c.AppPackageDefinitions.format(
c.AppPackages.format(
'PostgreSQL-modified'))
self.select_action_for_package(self.postgre_id,
@ -662,20 +662,20 @@ class TestSuitePackages(base.PackageTestCase):
self.driver.find_element_by_xpath(c.InputSubmit).click()
self.check_element_on_page(by.By.XPATH,
c.AppPackageDefinitions.format(
c.AppPackages.format(
'PostgreSQL'))
def test_modify_package_add_tag(self):
"""Test that new tag is shown in description
Scenario:
1. Navigate to 'Package Definitions' page
1. Navigate to 'Packages' page
2. Click on "Modify Package" and add new tag
3. Got to the Application Catalog page
4. Check, that new tag is browsed in application description
"""
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.select_action_for_package(self.postgre_id,
'modify_package')
@ -693,11 +693,11 @@ class TestSuitePackages(base.PackageTestCase):
"""Test check ability to download package from repository
Scenario:
1. Navigate to 'Package Definitions' page
1. Navigate to 'Packages' page
2. Select PostgreSQL package and click on "More>Download Package"
"""
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.select_action_for_package(self.postgre_id, 'more')
self.select_action_for_package(self.postgre_id, 'download_package')
@ -706,14 +706,14 @@ class TestSuitePackages(base.PackageTestCase):
"""Test check ability to make package active or inactive
Scenario:
1. Navigate to 'Package Definitions' page
1. Navigate to 'Packages' page
2. Select some package and make it inactive ("More>Toggle Active")
3. Check that package is inactive
4. Select some package and make it active ("More>Toggle Active ")
5. Check that package is active
"""
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.select_action_for_package(self.postgre_id, 'more')
self.select_action_for_package(self.postgre_id, 'toggle_enabled')
@ -729,14 +729,14 @@ class TestSuitePackages(base.PackageTestCase):
"""Test check ability to make package active or inactive
Scenario:
1. Navigate to 'Package Definitions' page
1. Navigate to 'Packages' page
2. Select some package and make it inactive ("More>Toggle Public")
3. Check that package is unpublic
4. Select some package and make it active ("More>Toggle Public ")
5. Check that package is public
"""
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.select_action_for_package(self.postgre_id, 'more')
self.select_action_for_package(self.postgre_id,
@ -754,12 +754,12 @@ class TestSuitePackages(base.PackageTestCase):
"""Test check ability to change description of the package
Scenario:
1. Navigate to 'Package Definitions' page
1. Navigate to 'Packages' page
2. Select package and click on 'Modify Package'
3. Change description
"""
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.select_action_for_package(self.mockapp_id,
'modify_package')
@ -772,12 +772,12 @@ class TestSuitePackages(base.PackageTestCase):
c.MockAppDescr).text)
def test_upload_package(self):
"""Test package uploading via Package Definitions view.
"""Test package uploading via Packages view.
Skips category selection step.
"""
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.driver.find_element_by_id(c.UploadPackage).click()
el = self.driver.find_element_by_css_selector(
@ -805,7 +805,7 @@ class TestSuitePackages(base.PackageTestCase):
"""Test package modifying a package after uploading it."""
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.driver.find_element_by_id(c.UploadPackage).click()
el = self.driver.find_element_by_css_selector(
@ -828,7 +828,7 @@ class TestSuitePackages(base.PackageTestCase):
self.wait_for_alert_message()
self.check_element_on_page(
by.By.XPATH, c.AppPackageDefinitions.format(pkg_name))
by.By.XPATH, c.AppPackages.format(pkg_name))
self.check_package_parameter_by_name(pkg_name, 'Public', 'True')
self.check_package_parameter_by_name(pkg_name, 'Active', 'False')
@ -907,7 +907,7 @@ class TestSuiteRepository(base.PackageTestCase):
self._compose_app(pkg_name)
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.driver.find_element_by_id(c.UploadPackage).click()
sel = self.driver.find_element_by_css_selector(
"select[name='upload-import_type']")
@ -925,7 +925,7 @@ class TestSuiteRepository(base.PackageTestCase):
self.wait_for_alert_message()
self.check_element_on_page(
by.By.XPATH, c.AppPackageDefinitions.format(pkg_name))
by.By.XPATH, c.AppPackages.format(pkg_name))
def test_import_package_from_repo(self):
"""Test package importing via fqn from repo with dependant apps."""
@ -941,7 +941,7 @@ class TestSuiteRepository(base.PackageTestCase):
self._compose_app(pkg_name_grand_child)
self.navigate_to('Manage')
self.go_to_submenu('Package Definitions')
self.go_to_submenu('Packages')
self.driver.find_element_by_id(c.UploadPackage).click()
sel = self.driver.find_element_by_css_selector(
"select[name='upload-import_type']")
@ -961,4 +961,4 @@ class TestSuiteRepository(base.PackageTestCase):
pkg_names = [pkg_name_parent, pkg_name_child, pkg_name_grand_child]
for pkg_name in pkg_names:
self.check_element_on_page(
by.By.XPATH, c.AppPackageDefinitions.format(pkg_name))
by.By.XPATH, c.AppPackages.format(pkg_name))