Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

updated/reordered CMS fields, removed price field, removed hint text #7769

Merged
merged 10 commits into from
Nov 8, 2021
Merged

updated/reordered CMS fields, removed price field, removed hint text #7769

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4908485
reordered CMS fields and added new verbose names to match data entry …
Nov 3, 2021
b753cb4
updated migrations
Nov 3, 2021
a8fed2d
passing tests
Nov 3, 2021
28b85ea
Sideway to Sideways
danielfmiranda Nov 3, 2021
172aec8
Merge remote-tracking branch 'origin/main' into 7614-update-cms-naming
Nov 3, 2021
58cbc92
merge with main
Nov 3, 2021
e0ba4be
Merge branch 'main' into 7614-update-cms-naming
danielfmiranda Nov 4, 2021
ad07122
feedback and updated migrations
Nov 4, 2021
994d8b2
Merge branch 'main' into 7614-update-cms-naming
danielfmiranda Nov 8, 2021
018111f
Merge branch 'main' into 7614-update-cms-naming
danielfmiranda Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions network-api/networkapi/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@ def setUp(self):
company='Percy Corp',
blurb='This is a general product specifically created for visual regression testing',
product_url='http://example.com/general-percy',
price=999,
worst_case='Visual regression fails',
# general product fields
camera_app='Yes',
Expand Down Expand Up @@ -303,7 +302,6 @@ def setUp(self):
company='Percy Corp',
blurb='This is a general product specifically created for visual regression testing',
product_url='http://example.com/general-percy',
price=999,
worst_case='Visual regression fails',
# software product fields
)
Expand All @@ -326,7 +324,6 @@ def test_product_page_import_mappings(self):
self.assertEqual(mappings["Company"], "company")
self.assertEqual(mappings["Blurb"], "blurb")
self.assertEqual(mappings["Product link"], "product_url")
self.assertEqual(mappings["Price"], "price")
self.assertEqual(mappings["Worst case"], "worst_case")
self.assertEqual(mappings["# requires email"], "#_requires_email")
self.assertEqual(mappings["# requires phone number"], "#_requires_phone")
Expand Down Expand Up @@ -401,7 +398,6 @@ def test_product_page_export_fields(self):
self.assertIn("Company", export_fields)
self.assertIn("Blurb", export_fields)
self.assertIn("Product link", export_fields)
self.assertIn("Price", export_fields)
self.assertIn("Worst case", export_fields)
self.assertIn("# requires email", export_fields)
self.assertIn("# requires phone number", export_fields)
Expand Down
6 changes: 0 additions & 6 deletions network-api/networkapi/wagtailpages/factory/buyersguide.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from factory import (
Faker,
post_generation,
LazyAttribute,
LazyFunction,
)
from factory.django import DjangoModelFactory
Expand Down Expand Up @@ -96,7 +95,6 @@ class Meta:
company = Faker('company')
blurb = Faker('sentence')
product_url = Faker('url')
price = LazyAttribute(lambda _: randint(49, 1500))
worst_case = Faker('sentence')
first_published_at = Faker('past_datetime', start_date='-2d', tzinfo=timezone.utc)
last_published_at = Faker('past_datetime', start_date='-1d', tzinfo=timezone.utc)
Expand Down Expand Up @@ -168,8 +166,6 @@ class SoftwareProductPageFactory(ProductPageFactory):
class Meta:
model = SoftwareProductPage

price = 0

handles_recordings_how = Faker('sentence')
recording_alert = LazyFunction(get_extended_yes_no_value)
recording_alert_helptext = Faker('sentence')
Expand Down Expand Up @@ -206,7 +202,6 @@ def create_general_product_visual_regression_product(seed, pni_homepage):
company='Percy Corp',
blurb='This is a general product specifically created for visual regression testing',
product_url='http://example.com/general-percy',
price=999,
worst_case='Visual regression fails',
# general product fields
camera_app='Yes',
Expand Down Expand Up @@ -248,7 +243,6 @@ def create_software_product_visual_regression_product(seed, pni_homepage):
company='Percy Corp',
blurb='This is a general product specifically created for visual regression testing',
product_url='http://example.com/general-percy',
price=999,
worst_case='Visual regression fails',
# software product fields
)
Expand Down
Loading