View
diff --git a/assets/tests/__init__.py b/assets/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/assets/tests/pages.py b/assets/tests/pages.py
new file mode 100644
index 00000000..ac9e8f5b
--- /dev/null
+++ b/assets/tests/pages.py
@@ -0,0 +1,64 @@
+# Collection of page object models for use within tests.
+from pypom import Page, Region
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions
+from django.urls import reverse
+from PyRIGS.tests import regions
+from PyRIGS.tests.pages import BasePage
+import pdb
+
+
+class AssetListPage(BasePage):
+ URL_TEMPLATE = '/assets/asset/list'
+
+ _asset_item_locator = (By.CLASS_NAME, 'assetRow')
+ _search_text_locator = (By.ID, 'id_query')
+ _status_select_locator = (By.CSS_SELECTOR, 'div#status-group>div.bootstrap-select')
+ _category_select_locator = (By.CSS_SELECTOR, 'div#category-group>div.bootstrap-select')
+ _go_button_locator = (By.ID, 'filter-submit')
+
+ class AssetListRow(Region):
+ _asset_id_locator = (By.CLASS_NAME, "assetID")
+ _asset_description_locator = (By.CLASS_NAME, "assetDesc")
+ _asset_category_locator = (By.CLASS_NAME, "assetCategory")
+ _asset_status_locator = (By.CLASS_NAME, "assetStatus")
+
+ @property
+ def id(self):
+ return self.find_element(*self._asset_id_locator).text
+
+ @property
+ def description(self):
+ return self.find_element(*self._asset_description_locator).text
+
+ @property
+ def category(self):
+ return self.find_element(*self._asset_category_locator).text
+
+ @property
+ def status(self):
+ return self.find_element(*self._asset_status_locator).text
+
+ @property
+ def assets(self):
+ return [self.AssetListRow(self, i) for i in self.find_elements(*self._asset_item_locator)]
+
+ @property
+ def query(self):
+ return self.find_element(*self._search_text_locator).text
+
+ def set_query(self, queryString):
+ element = self.find_element(*self._search_text_locator)
+ element.clear()
+ element.send_keys(queryString)
+
+ def search(self):
+ self.find_element(*self._go_button_locator).click()
+
+ @property
+ def status_selector(self):
+ return regions.BootstrapSelectElement(self, self.find_element(*self._status_select_locator))
+
+ @property
+ def category_selector(self):
+ return regions.BootstrapSelectElement(self, self.find_element(*self._category_select_locator))
diff --git a/assets/tests/test_assets.py b/assets/tests/test_assets.py
new file mode 100644
index 00000000..1c59fc60
--- /dev/null
+++ b/assets/tests/test_assets.py
@@ -0,0 +1,43 @@
+from . import pages
+from urllib.parse import urlparse
+from RIGS import models as rigsmodels
+from PyRIGS.tests.base import BaseTest, AutoLoginTest
+from assets import models
+import datetime
+
+
+class AssetListTests(AutoLoginTest):
+ def setUp(self):
+ super().setUp()
+ sound = models.AssetCategory.objects.create(name="Sound")
+ lighting = models.AssetCategory.objects.create(name="Lighting")
+
+ working = models.AssetStatus.objects.create(name="Working", should_show=True)
+ broken = models.AssetStatus.objects.create(name="Broken", should_show=False)
+
+ models.Asset.objects.create(asset_id="1", description="Broken XLR", status=broken, category=sound, date_acquired=datetime.date(2020, 2, 1))
+ models.Asset.objects.create(asset_id="10", description="Working Mic", status=working, category=sound, date_acquired=datetime.date(2020, 2, 1))
+ models.Asset.objects.create(asset_id="2", description="A light", status=working, category=lighting, date_acquired=datetime.date(2020, 2, 1))
+ models.Asset.objects.create(asset_id="C1", description="The pearl", status=broken, category=lighting, date_acquired=datetime.date(2020, 2, 1))
+ self.page = pages.AssetListPage(self.driver, self.live_server_url).open()
+
+ def test_default_statuses_applied(self):
+ # Only the working stuff should be shown initially
+ assetDescriptions = list(map(lambda x: x.description, self.page.assets))
+ self.assertEqual(2, len(assetDescriptions))
+ self.assertIn("A light", assetDescriptions)
+ self.assertIn("Working Mic", assetDescriptions)
+
+ def test_asset_order(self):
+ # Only the working stuff should be shown initially
+ self.page.status_selector.open()
+ self.page.status_selector.set_option("Broken", True)
+ self.page.status_selector.close()
+
+ self.page.search()
+
+ assetIDs = list(map(lambda x: x.id, self.page.assets))
+ self.assertEqual("1", assetIDs[0])
+ self.assertEqual("2", assetIDs[1])
+ self.assertEqual("10", assetIDs[2])
+ self.assertEqual("C1", assetIDs[3])
diff --git a/assets/views.py b/assets/views.py
index 96e8940d..4b1e6b98 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -213,7 +213,8 @@ class SupplierSearch(SupplierList):
for supplier in context["object_list"]:
result.append({"id": supplier.pk, "name": supplier.name})
-
+ import pdb
+ pdb.set_trace()
return JsonResponse(result, safe=False)
diff --git a/requirements.txt b/requirements.txt
index 96e43b97..2712ea20 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -38,3 +38,4 @@ z3c.rml==3.5.0
zope.event==4.3.0
zope.interface==4.5.0
zope.schema==4.5.0
+pypom==2.2.0
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 53238def..a902a7ab 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -52,7 +52,7 @@
{% endblock %}