Skip to content

Commit ab24724

Browse files
dogboatdogboat
committed
update tests
1 parent d3214f9 commit ab24724

11 files changed

+80
-80
lines changed

‎dojo/asset/labels.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,11 @@ class AssetLabelsKeys:
307307
AssetLabelsKeys.ASSET_GROUPS_NO_ACCESS_MESSAGE: _("This Group cannot access any Products."),
308308
AssetLabelsKeys.ASSET_GROUPS_MEMBER_LABEL: _("Product Group"),
309309
AssetLabelsKeys.ASSET_GROUPS_ADD_LABEL: _("Add Product Group"),
310-
AssetLabelsKeys.ASSET_GROUPS_ADD_SUCCESS_MESSAGE: _("Product Groups added successfully."),
310+
AssetLabelsKeys.ASSET_GROUPS_ADD_SUCCESS_MESSAGE: _("Product groups added successfully."),
311311
AssetLabelsKeys.ASSET_GROUPS_UPDATE_LABEL: _("Edit Product Group"),
312-
AssetLabelsKeys.ASSET_GROUPS_UPDATE_SUCCESS_MESSAGE: _("Product Group updated successfully."),
312+
AssetLabelsKeys.ASSET_GROUPS_UPDATE_SUCCESS_MESSAGE: _("Product group updated successfully."),
313313
AssetLabelsKeys.ASSET_GROUPS_DELETE_LABEL: _("Delete Product Group"),
314-
AssetLabelsKeys.ASSET_GROUPS_DELETE_SUCCESS_MESSAGE: _("Product Group deleted successfully."),
314+
AssetLabelsKeys.ASSET_GROUPS_DELETE_SUCCESS_MESSAGE: _("Product group deleted successfully."),
315315
AssetLabelsKeys.ASSET_GROUPS_ADD_ASSETS_LABEL: _("Add Products"),
316316
AssetLabelsKeys.ASSET_GROUPS_NUM_ASSETS_LABEL: _("Number of Products"),
317317
}

‎tests/product_group_test.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_group_add_product_group(self):
3131
# "Click" the submit button to complete the transaction
3232
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
3333
# Assert the message to determine success status
34-
self.assertTrue(self.is_success_message_present(text="Asset groups added successfully."))
34+
self.assertTrue(self.is_success_message_present(text="Product groups added successfully."))
3535
# Query the site to determine if the member has been added
3636
self.assertEqual(driver.find_elements(By.NAME, "member_product")[0].text, "QA Test")
3737
self.assertEqual(driver.find_elements(By.NAME, "member_product_role")[0].text, "Reader")
@@ -46,7 +46,7 @@ def test_group_edit_product_group(self):
4646
# "Click" the submit button to complete the transaction
4747
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
4848
# Assert the message to determine success status
49-
self.assertTrue(self.is_success_message_present(text="Asset group updated successfully."))
49+
self.assertTrue(self.is_success_message_present(text="Product group updated successfully."))
5050
# Query the site to determine if the member has been edited
5151
self.assertEqual(driver.find_elements(By.NAME, "member_product")[0].text, "QA Test")
5252
self.assertEqual(driver.find_elements(By.NAME, "member_product_role")[0].text, "Owner")
@@ -59,7 +59,7 @@ def test_group_delete_product_group(self):
5959
# "Click" the submit button to complete the transaction
6060
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-danger").click()
6161
# Assert the message to determine success status
62-
self.assertTrue(self.is_success_message_present(text="Asset group deleted successfully."))
62+
self.assertTrue(self.is_success_message_present(text="Product group deleted successfully."))
6363
# Query the site to determine if the member has been deleted
6464
self.assertFalse(driver.find_elements(By.NAME, "member_product"))
6565

@@ -88,7 +88,7 @@ def test_product_add_product_group(self):
8888
# "Click" the submit button to complete the transaction
8989
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
9090
# Assert the message to determine success status
91-
self.assertTrue(self.is_success_message_present(text="Asset groups added successfully."))
91+
self.assertTrue(self.is_success_message_present(text="Product groups added successfully."))
9292
# Query the site to determine if the member has been added
9393
self.assertEqual(driver.find_elements(By.NAME, "group_name")[0].text, "Group Name")
9494
self.assertEqual(driver.find_elements(By.NAME, "group_role")[0].text, "Reader")
@@ -110,7 +110,7 @@ def test_product_edit_product_group(self):
110110
# "Click" the submit button to complete the transaction
111111
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
112112
# Assert the message to determine success status
113-
self.assertTrue(self.is_success_message_present(text="Asset group updated successfully."))
113+
self.assertTrue(self.is_success_message_present(text="Product group updated successfully."))
114114
# Query the site to determine if the member has been edited
115115
self.assertEqual(driver.find_elements(By.NAME, "group_name")[0].text, "Group Name")
116116
self.assertEqual(driver.find_elements(By.NAME, "group_role")[0].text, "Maintainer")
@@ -130,7 +130,7 @@ def test_product_delete_product_group(self):
130130
# "Click" the submit button to complete the transaction
131131
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-danger").click()
132132
# Assert the message to determine success status
133-
self.assertTrue(self.is_success_message_present(text="Asset group deleted successfully."))
133+
self.assertTrue(self.is_success_message_present(text="Product group deleted successfully."))
134134
# Query the site to determine if the member has been deleted
135135
self.assertFalse(driver.find_elements(By.NAME, "group_name"))
136136

‎tests/product_member_test.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_user_add_product_member(self):
4242
# "Click" the submit button to complete the transaction
4343
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
4444
# Assert the message to determine success status
45-
self.assertTrue(self.is_success_message_present(text="Asset members added successfully."))
45+
self.assertTrue(self.is_success_message_present(text="Product members added successfully."))
4646
# Query the site to determine if the member has been added
4747
self.assertEqual(driver.find_elements(By.NAME, "member_product")[0].text, "QA Test")
4848
self.assertEqual(driver.find_elements(By.NAME, "member_product_role")[0].text, "Reader")
@@ -69,7 +69,7 @@ def test_user_edit_product_member(self):
6969
# "Click" the submit button to complete the transaction
7070
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
7171
# Assert the message to determine success status
72-
self.assertTrue(self.is_success_message_present(text="Asset member updated successfully."))
72+
self.assertTrue(self.is_success_message_present(text="Product member updated successfully."))
7373
# Query the site to determine if the member has been edited
7474
self.assertEqual(driver.find_elements(By.NAME, "member_product")[0].text, "QA Test")
7575
self.assertEqual(driver.find_elements(By.NAME, "member_product_role")[0].text, "Maintainer")
@@ -94,7 +94,7 @@ def test_user_delete_product_member(self):
9494
# "Click" the submit button to complete the transaction
9595
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-danger").click()
9696
# Assert the message to determine success status
97-
self.assertTrue(self.is_success_message_present(text="Asset member deleted successfully."))
97+
self.assertTrue(self.is_success_message_present(text="Product member deleted successfully."))
9898
# Query the site to determine if the member has been deleted
9999
self.assertFalse(driver.find_elements(By.NAME, "member_product"))
100100
else:
@@ -128,7 +128,7 @@ def test_product_add_product_member(self):
128128
# "Click" the submit button to complete the transaction
129129
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
130130
# Assert the message to determine success status
131-
self.assertTrue(self.is_success_message_present(text="Asset members added successfully."))
131+
self.assertTrue(self.is_success_message_present(text="Product members added successfully."))
132132
# Query the site to determine if the member has been added
133133
self.assertEqual(driver.find_elements(By.NAME, "member_user")[0].text, "Proper Samuel (propersahm)")
134134
self.assertEqual(driver.find_elements(By.NAME, "member_role")[0].text, "Reader")
@@ -155,7 +155,7 @@ def test_product_edit_product_member(self):
155155
# "Click" the submit button to complete the transaction
156156
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
157157
# Assert the message to determine success status
158-
self.assertTrue(self.is_success_message_present(text="Asset member updated successfully."))
158+
self.assertTrue(self.is_success_message_present(text="Product member updated successfully."))
159159
# Query the site to determine if the member has been edited
160160
self.assertEqual(driver.find_elements(By.NAME, "member_user")[0].text, "Proper Samuel (propersahm)")
161161
self.assertEqual(driver.find_elements(By.NAME, "member_role")[0].text, "Maintainer")
@@ -180,7 +180,7 @@ def test_product_delete_product_member(self):
180180
# "Click" the submit button to complete the transaction
181181
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-danger").click()
182182
# Assert the message to determine success status
183-
self.assertTrue(self.is_success_message_present(text="Asset member deleted successfully."))
183+
self.assertTrue(self.is_success_message_present(text="Product member deleted successfully."))
184184
# Query the site to determine if the member has been deleted
185185
self.assertFalse(driver.find_elements(By.NAME, "member_user"))
186186
else:

‎tests/product_test.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_create_product(self):
4343
# "Click" the dropdown button to see options
4444
driver.find_element(By.ID, "dropdownMenu1").click()
4545
# "Click" the add prodcut button
46-
driver.find_element(By.LINK_TEXT, "Add Asset").click()
46+
driver.find_element(By.LINK_TEXT, "Add Product").click()
4747
# Fill in th product name
4848
driver.find_element(By.ID, "id_name").clear()
4949
driver.find_element(By.ID, "id_name").send_keys("QA Test")
@@ -59,8 +59,8 @@ def test_create_product(self):
5959

6060
# Assert ot the query to dtermine status of failure
6161
# Also confirm success even if Product is returned as already exists for test sake
62-
self.assertTrue(self.is_success_message_present(text="Asset added successfully")
63-
or self.is_success_message_present(text="Asset with this Name already exists."))
62+
self.assertTrue(self.is_success_message_present(text="Product added successfully")
63+
or self.is_success_message_present(text="Product with this Name already exists."))
6464
self.assertFalse(self.is_error_message_present())
6565

6666
@on_exception_html_source_logger
@@ -102,8 +102,8 @@ def test_edit_product_description(self):
102102
# Query the site to determine if the product has been added
103103

104104
# Assert ot the query to dtermine status of failure
105-
self.assertTrue(self.is_success_message_present(text="Asset updated successfully")
106-
or self.is_success_message_present(text="Asset with this Name already exists."))
105+
self.assertTrue(self.is_success_message_present(text="Product updated successfully")
106+
or self.is_success_message_present(text="Product with this Name already exists."))
107107
self.assertFalse(self.is_error_message_present())
108108

109109
# For product consistency sake, We won't be editting the product title
@@ -130,8 +130,8 @@ def test_enable_simple_risk_acceptance(self):
130130
# Query the site to determine if the product has been added
131131

132132
# Assert ot the query to dtermine status of failure
133-
self.assertTrue(self.is_success_message_present(text="Asset updated successfully")
134-
or self.is_success_message_present(text="Asset with this Name already exists."))
133+
self.assertTrue(self.is_success_message_present(text="Product updated successfully")
134+
or self.is_success_message_present(text="Product with this Name already exists."))
135135
self.assertFalse(self.is_error_message_present())
136136

137137
@on_exception_html_source_logger
@@ -405,7 +405,7 @@ def test_add_product_tracking_files(self):
405405
# Query the site to determine if the finding has been added
406406

407407
# Assert ot the query to dtermine status of failure
408-
self.assertTrue(self.is_success_message_present(text="Added Tracked File to an Asset"))
408+
self.assertTrue(self.is_success_message_present(text="Added Tracked File to a Product"))
409409

410410
@on_exception_html_source_logger
411411
def test_edit_product_tracking_files(self):
@@ -462,7 +462,7 @@ def test_delete_product(self, name="QA Test"):
462462
# Query the site to determine if the product has been added
463463

464464
# Assert ot the query to determine status of failure
465-
self.assertTrue(self.is_success_message_present(text="Asset and relationships removed."))
465+
self.assertTrue(self.is_success_message_present(text="Product and relationships removed."))
466466

467467
@on_exception_html_source_logger
468468
def test_product_notifications_change(self):
@@ -502,14 +502,14 @@ def test_product_type_metrics(self):
502502
# login to site, password set to fetch from environ
503503
driver = self.driver
504504
# Navigate to the product page
505-
driver.get(self.base_url + "metrics/organization")
505+
driver.get(self.base_url + "metrics/product/type")
506506

507507
def test_product_type_counts_metrics(self):
508508
# Test To Edit Product Tracking Files
509509
# login to site, password set to fetch from environ
510510
driver = self.driver
511511
# Navigate to the product page
512-
driver.get(self.base_url + "metrics/organization/counts")
512+
driver.get(self.base_url + "metrics/product/type/counts")
513513

514514
my_select = Select(driver.find_element(By.ID, "id_product_type"))
515515
my_select.select_by_index(1)

‎tests/product_type_group_test.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_group_add_product_type_group(self):
3030
# "Click" the submit button to complete the transaction
3131
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
3232
# Assert the message to determine success status
33-
self.assertTrue(self.is_success_message_present(text="Organization groups added successfully."))
33+
self.assertTrue(self.is_success_message_present(text="Product Type groups added successfully."))
3434
# Query the site to determine if the member has been added
3535
self.assertEqual(driver.find_elements(By.NAME, "member_product_type")[0].text, "Research and Development")
3636
self.assertEqual(driver.find_elements(By.NAME, "member_product_type_role")[0].text, "Reader")
@@ -45,7 +45,7 @@ def test_group_edit_product_type_group(self):
4545
# "Click" the submit button to complete the transaction
4646
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
4747
# Assert the message to determine success status
48-
self.assertTrue(self.is_success_message_present(text="Organization group updated successfully."))
48+
self.assertTrue(self.is_success_message_present(text="Product Type group updated successfully."))
4949
# Query the site to determine if the member has been edited
5050
self.assertEqual(driver.find_elements(By.NAME, "member_product_type")[0].text, "Research and Development")
5151
self.assertEqual(driver.find_elements(By.NAME, "member_product_type_role")[0].text, "Owner")
@@ -58,7 +58,7 @@ def test_group_delete_product_type_group(self):
5858
# "Click" the submit button to complete the transaction
5959
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-danger").click()
6060
# Assert the message to determine success status
61-
self.assertTrue(self.is_success_message_present(text="Organization group deleted successfully."))
61+
self.assertTrue(self.is_success_message_present(text="Product Type group deleted successfully."))
6262
# Query the site to determine if the member has been deleted
6363
self.assertFalse(driver.find_elements(By.NAME, "member_product_type"))
6464

@@ -87,7 +87,7 @@ def test_product_type_add_product_type_group(self):
8787
# "Click" the submit button to complete the transaction
8888
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
8989
# Assert the message to determine success status
90-
self.assertTrue(self.is_success_message_present(text="Organization groups added successfully."))
90+
self.assertTrue(self.is_success_message_present(text="Product Type groups added successfully."))
9191
# Query the site to determine if the member has been added
9292
self.assertEqual(driver.find_elements(By.NAME, "product_type_group_group")[0].text, "Group Name")
9393
self.assertEqual(driver.find_elements(By.NAME, "product_type_group_role")[0].text, "Reader")
@@ -109,7 +109,7 @@ def test_product_type_edit_product_type_group(self):
109109
# "Click" the submit button to complete the transaction
110110
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-primary").click()
111111
# Assert the message to determine success status
112-
self.assertTrue(self.is_success_message_present(text="Organization group updated successfully."))
112+
self.assertTrue(self.is_success_message_present(text="Product Type group updated successfully."))
113113
# Query the site to determine if the member has been edited
114114
self.assertEqual(driver.find_elements(By.NAME, "product_type_group_group")[0].text, "Group Name")
115115
self.assertEqual(driver.find_elements(By.NAME, "product_type_group_role")[0].text, "Maintainer")
@@ -129,7 +129,7 @@ def test_product_type_delete_product_type_group(self):
129129
# "Click" the submit button to complete the transaction
130130
driver.find_element(By.CSS_SELECTOR, "input.btn.btn-danger").click()
131131
# Assert the message to determine success status
132-
self.assertTrue(self.is_success_message_present(text="Organization group deleted successfully."))
132+
self.assertTrue(self.is_success_message_present(text="Product Type group deleted successfully."))
133133
# Query the site to determine if the member has been deleted
134134
self.assertFalse(driver.find_elements(By.NAME, "product_type_group_group"))
135135

0 commit comments

Comments
 (0)