diff --git a/assets/tests/conftest.py b/assets/tests/conftest.py index cc068c92..8ad6cc8d 100644 --- a/assets/tests/conftest.py +++ b/assets/tests/conftest.py @@ -28,13 +28,13 @@ def cable_type(db): @pytest.fixture def test_cable(db, category, status, cable_type): - cable = models.Asset.objects.create(asset_id="9666", description="125A -> Jack", comments="The cable from Hell...", status=status, category=category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, cable_type=cable_type, length=10, csa="1.5", salvage_value=50) + cable = models.Asset.objects.create(asset_id="9666", description="125A -> Jack", comments="The cable from Hell...", status=status, category=category, date_acquired=datetime.date(2006, 6, 6), is_cable=True, cable_type=cable_type, length=10, csa="1.5", replacement_cost=50) yield cable cable.delete() @pytest.fixture def test_asset(db, category, status): - asset, created = models.Asset.objects.get_or_create(asset_id="91991", description="Spaceflower", status=status, category=category, date_acquired=datetime.date(1991, 12, 26), salvage_value=100) + asset, created = models.Asset.objects.get_or_create(asset_id="91991", description="Spaceflower", status=status, category=category, date_acquired=datetime.date(1991, 12, 26), replacement_cost=100) yield asset asset.delete() diff --git a/assets/tests/pages.py b/assets/tests/pages.py index de47ebb6..a9815f31 100644 --- a/assets/tests/pages.py +++ b/assets/tests/pages.py @@ -79,7 +79,7 @@ class AssetForm(FormPage): 'serial_number': (regions.TextBox, (By.ID, 'id_serial_number')), 'comments': (regions.SimpleMDETextArea, (By.ID, 'id_comments')), 'purchase_price': (regions.TextBox, (By.ID, 'id_purchase_price')), - 'salvage_value': (regions.TextBox, (By.ID, 'id_salvage_value')), + 'replacement_cost': (regions.TextBox, (By.ID, 'id_replacement_cost')), 'date_acquired': (regions.DatePicker, (By.ID, 'id_date_acquired')), 'date_sold': (regions.DatePicker, (By.ID, 'id_date_sold')), 'category': (regions.SingleSelectPicker, (By.ID, 'id_category')), @@ -221,7 +221,7 @@ class AssetAuditList(AssetList): 'description': (regions.TextBox, (By.ID, 'id_description')), 'is_cable': (regions.CheckBox, (By.ID, 'id_is_cable')), 'serial_number': (regions.TextBox, (By.ID, 'id_serial_number')), - 'salvage_value': (regions.TextBox, (By.ID, 'id_salvage_value')), + 'replacement_cost': (regions.TextBox, (By.ID, 'id_replacement_cost')), 'date_acquired': (regions.DatePicker, (By.ID, 'id_date_acquired')), 'category': (regions.SingleSelectPicker, (By.ID, 'id_category')), 'status': (regions.SingleSelectPicker, (By.ID, 'id_status')), diff --git a/assets/tests/test_interaction.py b/assets/tests/test_interaction.py index 5d144917..c16454e9 100644 --- a/assets/tests/test_interaction.py +++ b/assets/tests/test_interaction.py @@ -102,7 +102,7 @@ def test_cable_create(logged_in_browser, admin_user, live_server, test_asset, ca page.status = status.name page.serial_number = "MELON-MELON-MELON" page.comments = "You might need that" - page.salvage_value = "666" + page.replacement_cost = "666" page.is_cable = True assert logged_in_browser.driver.find_element(By.ID, 'cable-table').is_displayed() @@ -179,7 +179,7 @@ class TestAssetForm(AutoLoginTest): self.page.comments = comments = "This is actually a sledgehammer, not a cable..." self.page.purchase_price = "12.99" - self.page.salvage_value = "99.12" + self.page.replacement_cost = "99.12" self.page.date_acquired = acquired = datetime.date(2020, 5, 2) self.page.purchased_from_selector.toggle() self.assertTrue(self.page.purchased_from_selector.is_open) @@ -320,14 +320,14 @@ class TestAssetAudit(AutoLoginTest): self.connector = models.Connector.objects.create(description="Trailer Socket", current_rating=1, voltage_rating=40, num_pins=13) models.Asset.objects.create(asset_id="1", description="Trailer Cable", status=self.status, - category=self.category, date_acquired=datetime.date(2020, 2, 1), salvage_value=10) + category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10) models.Asset.objects.create(asset_id="11", description="Trailerboard", status=self.status, - category=self.category, date_acquired=datetime.date(2020, 2, 1), salvage_value=10) + category=self.category, date_acquired=datetime.date(2020, 2, 1), replacement_cost=10) models.Asset.objects.create(asset_id="111", description="Erms", status=self.status, category=self.category, - date_acquired=datetime.date(2020, 2, 1), salvage_value=10) + date_acquired=datetime.date(2020, 2, 1), replacement_cost=10) self.asset = models.Asset.objects.create(asset_id="1111", description="A hammer", status=self.status, category=self.category, - date_acquired=datetime.date(2020, 2, 1), salvage_value=10) + date_acquired=datetime.date(2020, 2, 1), replacement_cost=10) self.page = pages.AssetAuditList(self.driver, self.live_server_url).open() self.wait = WebDriverWait(self.driver, 20) diff --git a/assets/tests/test_unit.py b/assets/tests/test_unit.py index e65bdcd2..2d4d94a9 100644 --- a/assets/tests/test_unit.py +++ b/assets/tests/test_unit.py @@ -84,7 +84,7 @@ def test_oembed(client, test_asset): def test_asset_create(admin_client): - response = admin_client.post(reverse('asset_create'), {'date_sold': '2000-01-01', 'date_acquired': '2020-01-01', 'purchase_price': '-30', 'salvage_value': '-30'}) + response = admin_client.post(reverse('asset_create'), {'date_sold': '2000-01-01', 'date_acquired': '2020-01-01', 'purchase_price': '-30', 'replacement_cost': '-30'}) assertFormError(response, 'form', 'asset_id', 'This field is required.') assert_asset_form_errors(response) @@ -99,7 +99,7 @@ def test_cable_create(admin_client): def test_asset_edit(admin_client, test_asset): url = reverse('asset_update', kwargs={'pk': test_asset.asset_id}) - response = admin_client.post(url, {'date_sold': '2000-12-01', 'date_acquired': '2020-12-01', 'purchase_price': '-50', 'salvage_value': '-50', 'description': "", 'status': "", 'category': ""}) + response = admin_client.post(url, {'date_sold': '2000-12-01', 'date_acquired': '2020-12-01', 'purchase_price': '-50', 'replacement_cost': '-50', 'description': "", 'status': "", 'category': ""}) assert_asset_form_errors(response) @@ -127,4 +127,4 @@ def assert_asset_form_errors(response): assertFormError(response, 'form', 'category', 'This field is required.') assertFormError(response, 'form', 'date_sold', 'Cannot sell an item before it is acquired') assertFormError(response, 'form', 'purchase_price', 'A price cannot be negative') - assertFormError(response, 'form', 'salvage_value', 'A price cannot be negative') + assertFormError(response, 'form', 'replacement_cost', 'A price cannot be negative')