Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

* Start to seperate versioning into its own app

* Start reworking invoice things

* Reduced overall font size a touch

* Improvements to generic lists

* Tweak some colours to be a bit less OTT

I need to work out if I can seperate background and primary colours like BS3 did

* Improvements to event table mobile

* First pass at mobile-ising the generic list

* Item table fixes

* Fixed fullcalendar print css not included

* Asset list table improvements

* Tweak asset list to be more in line with other lists

* Versioning template improvements

//TODO Rather than have seperate asset templates, convert 'id' into a template variable

* Tweak versioning templates to allow ID overrides

Asset specific templates begone. Still need to bring back the ID formatting for the Rigboard.

* Asset form fixes

* Use the right autocompleter.js...

* Breakout (most) user stuff to separate module

The model remains in RIGS for now, as it's pretty painful to move...

* Python Format/import opt

* Test Refactor Part 1 - Shuffle things around

* Fix migrations

TODO - need to ensure moved models are *moved* rather than deleted and recreated!

* Start on new tests

* Initial work on event create test reimpl

* Init other tests, more rigs test faffery

* Desaturate theme colors even more

Much closer to BS3

* Fix event item adding

Bit too heavy handed with the deduplication there Arona

* Initial refactor of event item testing

* Upgrade bootstrap-select

* Updated bootstrap-select for BS4

* Initial port of duplicate testing

Needs the latter half rewriting once we have an EventDetail POM

* Refactor date validation test

So close to killing test_functional.EventTest!

* Deduplication of testing code

* pep8

* Fix some tests

And some things that were actually borked

* FIX: Prevent setting access time after start time 

Cherry pick of d274ea4606. Will close #405.

* Refactor calendar tests

* FIX: Don't show asset buttons/history for basic users

* Really ought to get a pre-commit hook for pep8...

* Fully replace test_functional

* Dedupe generic search logic

* Fix the remaining tests

* Ensure submit button is scrolled to in tests

* Fix asset creation test + actually verify its results

* Make CI use latest (stable) chromedriver rather than some ancient one

Since Travis uses the latest stable chrome, should always match. Bash oneliner \o/

* Of course | is part of YAML syntax, of course...

Maybe this works.

* Update python version

Trying to get CI to match my local environment as much as possible...

* Minor test futzing

* Well that wasn't clever of me

* That was even less clever of me

* Revert to old submit wait behaviour

* What about if I did this

* Try disabling chrome cache

* Added screenshot recording of test failures

* Fixed RIGS tests not being run

* Fixed Pep8 - I promise I'll make a pre-commit hook sometime!

* Very initial work at togglable darktheme.

Dammit @alexdaniel654 just when I had my scope creep kinda under control. It'll be v. nice to have though...!

* More dark theme wangling

* Fix some asset template things

* FIX: CI Locale Issues

* Fix sample command

* Initial work at integrating the risk assessment

#136. No clever database structure as yet...

* FIX: Don't set every boolean input to radios

* Different approach to RA linking

* Move text definitions to somewhere more authoratitive

* FIX: Undo breakage causing autopep8

o.O

* Expand detail template

* Use correct view for RA history

* Initial work at coercing activity feed into showing RAs

Also shows Asset/Supplier on the homepage feed.

* Refactor activity feed template logic

Yay for removing arbitrary if/else chains!

* Initial work on caching activity feed

Server side that is. Ref #162.

* Start RA list template

* Refactor RA creation stuff, again

* Add H&S Details to Event Detail View

* Display venue notes in event detail

Notes are no use if nobody reads them. Not sure on this one.

* Add ability to filter event archive by status

Closes #168.

* Fix lingering naive time

* Use locmem cache in sqlite environments

Otherwise the tests just lock up totally. Should close #162

* Update dependencies

Mirrors/supersedes 0e67da82e2

* Add global ctrl/meta-enter shortcut for form submission

Wants rewriting for better efficiency, but hey, it works!

* Update dependencies

* Fix for a situation that should be impossible

* Fix navbar alignment

* FEAT: Improve 'omni'search

- Partialised template
- Added to assets header
- Added ability to search assets/suppliers
- Improved selection logic
- Have it display current query

* Move closemodal into PyRIGS

* Fix tests for search improvements

* Dark mode colour improvements

* Fix table colors for dry hires

* further darktheme fixes

* Remove the dark header from light theme

* Fix reload loops when CSS/JS is changed

* Move dark theme SCSS to separate file, fix inactive pagination styling

* Genercise detail pages

* Testing something re notes

I wonder if I can make that global, rather than per-template...

* Dark theme palette shenanigans

I just can't decide

* Match darktheme palette to forum darktheme palette

Why reinvent the wheel.

* Make supplier detail use the generic template

* Disable mobile event table PoC for now

* Remove the defaults from the RA fields + make them required

* More RA fixes

* Fixes to revisions for RAs

* Add bootstrap 4 test page

* Bunch of dark mode fixes from test page

* Do not use Django 'required' for radio selects

As this requires them to be True, whereas we just need to require that an option be entered.

* Properly fixed popover darktheme

* Fixed search for events

* Style fixes to asset list

* Start RA 'mark review' feature

* Add reviewing to revision history, fix RA editing not working

Also actually commit all the files, that helps

* Fix Power MIC being lost on RA edit

Why it is subtly different to the Event Update behaviour? Who knows

* Invalidate RA review if it is edited after review

* Start work on event checklist

* Add a button for creating and instantly voiding invoices

Handy dandy for when you have loads of cancelled events, like say, a pandemic

* Mooooore status chips, mooore

* Initial shenanigans on storing my overly fancy EC form

* Proof of concept for JSON parsing/storage

\o/

* Add new line functionality for vehicles/drivers

Might it have been easier to create 'dummy' models like with EventItems? Probably...

* Alter rig_count to not include un-checked-in dry hires

* Insert a divider between still-out dry hires and actually upcoming events on rigboard

* Initial work on new checklist handling. No more JSON!

* Versioning module now does magic

Automatic creation of views/urls for anything registered with reversion, with a small amount of hackage to preserve legacy stuff. (and the DAMNED asset IDs!) I would never get distracted...

* Cleanup

* Event checklist crew works

Mostly - its not happy with timezones

* Medium event power stuff done, barring worst case stuff

* Misc fixes

* Validation of power reqs

* Worst case points on checklist

* Templating improvements to RA/EC stuff

* Do event table color logic at python level

* Audit template fixes

* Restrict versioning to one level of depth for speed

Also fixed the template for nested changes

* Event properties internal/authorised always return a explicit boolean rather than sometimes None

* Use template filter for notes

* Fix list templates

TODO: Sensible place to define the 'expected answer' stuff.

* Fix cable table template

* Rethink rigboard color logic again

Also revert some broken stuff

* Test fixes

* Modify auth test so it doesn't try and test for external authorisations

Cause that's not a thing

* Why does this work

Bloody overzealous autoformatter...

* Formatting...

* Initial work on RA tests

* Pages/start of tests for EventChecklists

* Much better coverage of H&S things

* Cleanup & Squash migrations

* Fix wrong variable name in settings.py

* Fix broken invoice list template

* Add revision history to invoices/payments.

Also patches previously introduced reversion permissions hole.

Supersedes and closes #337.

* Various misc fixes

* Fix for my fix

* Curse youuuuu pep8

* Invoice template improvements

* Minor fixes

* More tweaks

* More fixes

* Major improvements/fixes to authorisation templates

* Add ability to mark event checklists as Large Event

This just disables the checks to allow the rest of it to be filled out for large events, though I expect paper forms may still be used...

* Remove database ID from generic list

* Put power threshold values in a collapse

* Use template filter for consistent removal of 'None links'

Plus cleaner template markup! More HTML-in-Python tho, which always feels a bit CSS-in-JS

* Tweak asset list markup

* Begin to change add buttons success -> primary

Also change search primary -> info to avoid clash

* Begin to improve event checklist on mobile

* Asset detail template improvements

* Fix #326 (again)

* Fix errors being squashed

* Fix rigboard validation tests

* Initial work on BS4 button templatetag

Newfeatureitis strikes again

* Allow multiple event checklists per event

TODO: Status chip now needs rethinking

* Minor event detail fixes

* Fix tests

* Rework button tag

* Mobile fixes for search

* Fix event checklist on mobile

* Redo light theme palette

* Switch rigboard new button to primary

* Kill off excess whitespace on rigboard

* Rigboard Timing display tweaks

* Fix tests

* Properly handle eventauthorisations in new versioning

It's not great, not terrible...

* Prevent creating duplicate revisions on event

Potential fix for #322 - I couldn't reproduce even before this change...

* Template improvements

* Minor test fixes

* Revert "Prevent creating duplicate revisions on event"

Apparently it was too strong at preventing dupes...

This reverts commit cce0ad0f9f.

# Conflicts:
#	RIGS/models.py

* Better approach to generic list templates + other deduplication

* Also apply better approach to generic detail pages

* One of these days I'll remember to test BEFORE pushing...

* And now the same for generic forms

* Display tick/cross rather than true/false in boolean version diffs

* Upgrade dependencies

* Fixes fixes fixes

* Fix dependency hell

Probably

* Correct handling of spaces in paperwork filenames

Also normalises display of Invoice IDs. Partial fix for #391.

* Buggerit millennium hand and shrimp

Knew I was gonna forget to fix the tests

* FIX: Set duplicated event status to provisional

Closes #398.

Flip flop. Flip flop.

* Update polyfill for datetime-local

Bloody Firefox. We love to hate you. Proper CSS of the fill to come, SoonTM.

Closes #391

* Curses!

* Minor typo fixes

* Initial pass at soop-consult confirmation screen for RAs

* Fix migration

* Make venue/date editable on EC

For multi venue, multi day events

Defaults to date and venue set on the event. Also made power MIC default to that set in RA

* Clearer logic for RA inverted fields

* (probably) fix tests

* Give keyholders supplier edit perm

* Generic list only displays edit button if user has perm

* Same perm check for generic details

* H&S Details takes up free space on non-internal events

* Remove flash of content when loading new rig page

* First pass at clearer display of asset list filters

* Fix tests / default to headless tests

(fingers crossed)

* Fix autocompleter.js to properly disable edit links again

* Move status color logic back to template

Cause that somehow makes it work better??

* Display note icon on event detail page

* Fix caching

* Put rounded corners back where they belong

* Remove lingering use of 'page-header'

BS removed that style

* More search and replace for BS changes

Thought I'd got them all. Clearly not!

* Remove enforced linebreak on status chips

* Fix horizontal-ness on some forms

* Remove animation on prefers-reduced-motion/low referesh rate devices

Also normalises handling of asset list cable table & improves its use of space on large devices

* Make version changes badges more readable

* First pass at making the calendar less crap

* Fix event table success logic

Yay for copy paste fails >.>

* Use borders rather than block colors for coloured tables under darktheme

* First pass at porting calendar from FC V3 to V5

Two major versions and all they did was rename a bunch of names...TWICE.

* Rework version name method to avoid blank names on eventchecklist vehicles/crew

* Fix cable test

* Made radio button focus much more obvious on dark theme

* Implement Jerb's wording changes

* Fix one test, break another...

* Fix recent change stream list mutation issue

* FIX: Do not naively cache event table

Not that easy, it turns out. Duh.

* FEAT: Implement #413 show associated assets on cable type detail pg

Closes #413

* Allow H&S for non-events

* Update emergency contact number

* Improvements to profile detail page

* Implement some of Jonny's suggested changes

TODO:
- Define event size at RA time, pass through to EC
- Have later power questions be context dependent

* Test fixes

* Add space for power/rigging plans to be linked to RAs

* Start move of event size logic to RA from Ec

* Javascript required shenanigans for RA power

* More moving of event size logic

* Fixing tests for new logic etc

* Why does this work

Indeed, it may not

* FIX: Stupid typo in versioning.py

* Further minor fixes to versioning

* Add icons to H&S menu items

* Should fix calendar breaking in production

* Small alignment fix in asset list

* Squash migrations

Co-authored-by: Matthew Smith <psyms13@nottingham.ac.uk>

assets/tests/pages.py

@@ -13,10 +13,10 @@ class AssetList(BasePage):
     URL_TEMPLATE = '/assets/asset/list'
 
     _asset_item_locator = (By.CLASS_NAME, 'assetRow')
-    _search_text_locator = (By.ID, 'id_query')
+    _search_text_locator = (By.ID, 'id_q')
     _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')
+    _go_button_locator = (By.ID, 'id_search')
 
     class AssetListRow(Region):
         _asset_id_locator = (By.CLASS_NAME, "assetID")
@@ -68,7 +68,6 @@ class AssetList(BasePage):
 class AssetForm(FormPage):
     _purchased_from_select_locator = (By.CSS_SELECTOR, 'div#purchased-from-group>div.bootstrap-select')
     _parent_select_locator = (By.CSS_SELECTOR, 'div#parent-group>div.bootstrap-select')
-    _submit_locator = (By.CLASS_NAME, 'btn-success')
     form_items = {
         'asset_id': (regions.TextBox, (By.ID, 'id_asset_id')),
         'description': (regions.TextBox, (By.ID, 'id_description')),
@@ -114,6 +113,7 @@ class AssetCreate(AssetForm):
 
 class AssetDuplicate(AssetForm):
     URL_TEMPLATE = '/assets/asset/id/{asset_id}/duplicate'
+    _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Duplicate')]")
 
     @property
     def success(self):
@@ -123,12 +123,12 @@ class AssetDuplicate(AssetForm):
 class SupplierList(BasePage):
     URL_TEMPLATE = reverse('supplier_list')
 
-    _supplier_item_locator = (By.CLASS_NAME, 'supplierRow')
-    _search_text_locator = (By.ID, 'id_query')
+    _supplier_item_locator = (By.ID, 'row_item')
+    _search_text_locator = (By.ID, 'id_search_text')
     _go_button_locator = (By.ID, 'id_search')
 
     class SupplierListRow(Region):
-        _name_locator = (By.CLASS_NAME, "supplierName")
+        _name_locator = (By.ID, "cell_name")
 
         @property
         def name(self):
@@ -152,7 +152,6 @@ class SupplierList(BasePage):
 
 
 class SupplierForm(FormPage):
-    _submit_locator = (By.CLASS_NAME, 'btn-success')
     form_items = {
         'name': (regions.TextBox, (By.ID, 'id_name')),
     }
@@ -178,7 +177,7 @@ class SupplierEdit(SupplierForm):
 class AssetAuditList(AssetList):
     URL_TEMPLATE = reverse('asset_audit_list')
 
-    _search_text_locator = (By.ID, 'id_query')
+    _search_text_locator = (By.ID, 'id_q')
     _go_button_locator = (By.ID, 'searchButton')
     _modal_locator = (By.ID, 'modal')
     _errors_selector = (By.CLASS_NAME, "alert-danger")

assets/tests/test_assets.py

@@ -6,18 +6,21 @@ from django.test.utils import override_settings
 from django.urls import reverse
 from urllib.parse import urlparse
 from RIGS import models as rigsmodels
-from PyRIGS.tests.base import BaseTest, AutoLoginTest
+from PyRIGS.tests.base import BaseTest, AutoLoginTest, screenshot_failure_cls
 from assets import models, urls
 from reversion import revisions as reversion
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
-from RIGS.test_functional import animation_is_finished
+from PyRIGS.tests.base import animation_is_finished
 import datetime
 from django.utils import timezone
+from selenium.webdriver.common.action_chains import ActionChains
+from django.test import tag
 
 
+@screenshot_failure_cls
 class TestAssetList(AutoLoginTest):
     def setUp(self):
         super().setUp()
@@ -95,6 +98,7 @@ class TestAssetList(AutoLoginTest):
         self.assertEqual("10", assetIDs[1])
 
 
+@screenshot_failure_cls
 class TestAssetForm(AutoLoginTest):
     def setUp(self):
         super().setUp()
@@ -104,6 +108,7 @@ class TestAssetForm(AutoLoginTest):
         self.parent = models.Asset.objects.create(asset_id="9000", description="Shelf", status=self.status, category=self.category, date_acquired=datetime.date(2000, 1, 1))
         self.connector = models.Connector.objects.create(description="IEC", current_rating=10, voltage_rating=240, num_pins=3)
         self.cable_type = models.CableType.objects.create(plug=self.connector, socket=self.connector, circuits=1, cores=3)
+        self.wait = WebDriverWait(self.driver, 5)
         self.page = pages.AssetCreate(self.driver, self.live_server_url).open()
 
     def test_asset_create(self):
@@ -119,37 +124,43 @@ class TestAssetForm(AutoLoginTest):
 
         self.page.open()
 
-        self.page.description = "Bodge Lead"
-        self.page.category = "Health & Safety"
-        self.page.status = "O.K."
-        self.page.serial_number = "0124567890-SAUSAGE"
-        self.page.comments = "This is actually a sledgehammer, not a cable..."
+        self.page.description = desc = "Bodge Lead"
+        self.page.category = cat = "Health & Safety"
+        self.page.status = status = "O.K."
+        self.page.serial_number = sn = "0124567890-SAUSAGE"
+        self.page.comments = comments = "This is actually a sledgehammer, not a cable..."
 
         self.page.purchased_from_selector.toggle()
         self.assertTrue(self.page.purchased_from_selector.is_open)
         self.page.purchased_from_selector.search(self.supplier.name[:-8])
         self.page.purchased_from_selector.set_option(self.supplier.name, True)
-        self.assertFalse(self.page.purchased_from_selector.is_open)
         self.page.purchase_price = "12.99"
         self.page.salvage_value = "99.12"
-        self.date_acquired = "05022020"
+        self.page.date_acquired = acquired = datetime.date(2020, 5, 20)
 
         self.page.parent_selector.toggle()
         self.assertTrue(self.page.parent_selector.is_open)
-        # Searching it by ID autoselects it
         self.page.parent_selector.search(self.parent.asset_id)
         # Needed here but not earlier for whatever reason
         self.driver.implicitly_wait(1)
-        # self.page.parent_selector.set_option(self.parent.asset_id + " | " + self.parent.description, True)
-        # Need to explicitly close as we haven't selected anything to trigger the auto close
-        self.page.parent_selector.search(Keys.ESCAPE)
-        self.assertFalse(self.page.parent_selector.is_open)
+        self.page.parent_selector.set_option(self.parent.asset_id + " | " + self.parent.description, True)
         self.assertTrue(self.page.parent_selector.options[0].selected)
+        self.page.parent_selector.toggle()
 
         self.assertFalse(self.driver.find_element_by_id('cable-table').is_displayed())
 
         self.page.submit()
+        self.wait.until(animation_is_finished())
         self.assertTrue(self.page.success)
+        # Check that data is right
+        asset = models.Asset.objects.get(asset_id="9001")
+        self.assertEqual(asset.description, desc)
+        self.assertEqual(asset.category.name, cat)
+        self.assertEqual(asset.status.name, status)
+        self.assertEqual(asset.serial_number, sn)
+        self.assertEqual(asset.comments, comments)
+        # This one is important as it defaults to today's date
+        self.assertEqual(asset.date_acquired, acquired)
 
     def test_cable_create(self):
         self.page.description = "IEC -> IEC"
@@ -160,6 +171,7 @@ class TestAssetForm(AutoLoginTest):
         self.page.is_cable = True
 
         self.assertTrue(self.driver.find_element_by_id('cable-table').is_displayed())
+        self.wait.until(animation_is_finished())
         self.page.cable_type = "IEC → IEC"
         self.page.socket = "IEC"
         self.page.length = 10
@@ -195,6 +207,7 @@ class TestAssetForm(AutoLoginTest):
         self.assertEqual(models.Asset.objects.last().description, self.parent.description)
 
 
+@screenshot_failure_cls
 class TestSupplierList(AutoLoginTest):
     def setUp(self):
         super().setUp()
@@ -221,6 +234,7 @@ class TestSupplierList(AutoLoginTest):
     def test_search(self):
         self.page.set_query("TEC")
         self.page.search()
+
         self.assertTrue(len(self.page.suppliers) == 1)
         self.assertEqual("TEC PA & Lighting", self.page.suppliers[0].name)
 
@@ -233,6 +247,7 @@ class TestSupplierList(AutoLoginTest):
         self.assertTrue(len(self.page.suppliers) == 0)
 
 
+@screenshot_failure_cls
 class TestSupplierCreateAndEdit(AutoLoginTest):
     def setUp(self):
         super().setUp()
@@ -260,6 +275,7 @@ class TestSupplierCreateAndEdit(AutoLoginTest):
         self.assertTrue(self.page.success)
 
 
+@screenshot_failure_cls
 class TestAssetAudit(AutoLoginTest):
     def setUp(self):
         super().setUp()
@@ -292,7 +308,7 @@ class TestAssetAudit(AutoLoginTest):
         new_desc = "A BIG hammer"
         mdl.description = new_desc
         mdl.submit()
-        self.wait.until(animation_is_finished())
+        self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal')))
         self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())
 
         # Check data is correct
@@ -309,17 +325,17 @@ class TestAssetAudit(AutoLoginTest):
     def test_audit_list(self):
         self.assertEqual(len(models.Asset.objects.filter(last_audited_at=None)), len(self.page.assets))
 
-        assetRow = self.page.assets[0]
-        assetRow.find_element(By.CSS_SELECTOR, "td:nth-child(5) > div:nth-child(1) > a:nth-child(1)").click()
+        asset_row = self.page.assets[0]
+        self.driver.find_element(By.XPATH, "//*[@id='asset_table_body']/tr[1]/td[4]/a").click()
         self.wait.until(EC.visibility_of_element_located((By.ID, 'modal')))
-        self.assertEqual(self.page.modal.asset_id, assetRow.id)
+        self.assertEqual(self.page.modal.asset_id, asset_row.id)
 
         # First close button is for the not found error
-        self.page.find_element(By.XPATH, '(//button[@class="close"])[2]').click()
-        self.wait.until(animation_is_finished())
+        self.page.find_element(By.XPATH, '//*[@id="modal"]/div/div/div[1]/button').click()
+        self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal')))
         self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())
         # Make sure audit log was NOT filled out
-        audited = models.Asset.objects.get(asset_id=assetRow.id)
+        audited = models.Asset.objects.get(asset_id=asset_row.id)
         self.assertEqual(None, audited.last_audited_by)
 
         # Check that a failed search works
@@ -370,7 +386,6 @@ class Test404(TestCase):
             self.assertEqual(response.status_code, 404)
 
 
-# @tag('slow') TODO: req. Django 3.0
 class TestAccessLevels(TestCase):
     @override_settings(DEBUG=True)
     def setUp(self):
@@ -533,49 +548,6 @@ class TestSampleDataGenerator(TestCase):
         self.assertRaisesRegex(CommandError, ".*production", call_command, 'deleteSampleData')
 
 
-class TestVersioningViews(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.profile = rigsmodels.Profile.objects.create(username="VersionTest", email="version@test.com", is_superuser=True, is_active=True, is_staff=True)
-
-        working = models.AssetStatus.objects.create(name="Working", should_show=True)
-        broken = models.AssetStatus.objects.create(name="Broken", should_show=False)
-        general = models.AssetCategory.objects.create(name="General")
-        lighting = models.AssetCategory.objects.create(name="Lighting")
-
-        cls.assets = {}
-
-        with reversion.create_revision():
-            reversion.set_user(cls.profile)
-            cls.assets[1] = models.Asset.objects.create(asset_id="1991", description="Spaceflower", status=broken, category=lighting, date_acquired=datetime.date(1991, 12, 26))
-
-        with reversion.create_revision():
-            reversion.set_user(cls.profile)
-            cls.assets[2] = models.Asset.objects.create(asset_id="0001", description="Virgil", status=working, category=lighting, date_acquired=datetime.date(2015, 1, 1))
-
-        with reversion.create_revision():
-            reversion.set_user(cls.profile)
-            cls.assets[1].status = working
-            cls.assets[1].save()
-
-    def setUp(self):
-        self.profile.set_password('testuser')
-        self.profile.save()
-        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
-
-    def test_history_loads_successfully(self):
-        request_url = reverse('asset_history', kwargs={'pk': self.assets[1].asset_id})
-
-        response = self.client.get(request_url, follow=True)
-        self.assertEqual(response.status_code, 200)
-
-    def test_activity_table_loads_successfully(self):
-        request_url = reverse('asset_activity_table')
-
-        response = self.client.get(request_url, follow=True)
-        self.assertEqual(response.status_code, 200)
-
-
 class TestEmbeddedViews(TestCase):
     @classmethod
     def setUpTestData(cls):