From fa4c968b0817e3a4c0c39726aa6583f226d0d013 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 10 May 2024 16:56:30 -0700 Subject: [PATCH 1/4] Update deprecated import to supported path Missed in #515 --- neon_utils/skills/neon_fallback_skill.py | 4 ++-- neon_utils/skills/neon_skill.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/neon_utils/skills/neon_fallback_skill.py b/neon_utils/skills/neon_fallback_skill.py index 1f4e4724..516857e8 100644 --- a/neon_utils/skills/neon_fallback_skill.py +++ b/neon_utils/skills/neon_fallback_skill.py @@ -44,7 +44,6 @@ from ovos_utils.gui import is_gui_connected from ovos_utils.log import LOG, log_deprecation, deprecated from ovos_utils.skills import get_non_properties -from ovos_utils.skills.settings import save_settings from ovos_utils.xdg_utils import xdg_cache_home from ovos_workshop.skills import OVOSSkill from ovos_workshop.skills.fallback import FallbackSkillV1 @@ -53,7 +52,8 @@ from neon_utils.file_utils import resolve_neon_resource_file from neon_utils.location_utils import to_system_time from neon_utils.message_utils import dig_for_message, resolve_message, get_message_user -from neon_utils.skills.neon_skill import CACHE_TIME_OFFSET, DEFAULT_SPEED_MODE, SPEED_MODE_EXTENSION_TIME, NeonSkill +from neon_utils.skills.neon_skill import CACHE_TIME_OFFSET, DEFAULT_SPEED_MODE, SPEED_MODE_EXTENSION_TIME, NeonSkill, \ + save_settings from neon_utils.user_utils import get_user_prefs diff --git a/neon_utils/skills/neon_skill.py b/neon_utils/skills/neon_skill.py index 332f6b02..c68084d8 100644 --- a/neon_utils/skills/neon_skill.py +++ b/neon_utils/skills/neon_skill.py @@ -94,6 +94,7 @@ def save_settings(skill_dir, skill_settings): else: LOG.info(f'Skill settings successfully saved to {settings_path}') + class NeonSkill(OVOSSkill): def __init__(self, name=None, bus=None, **kwargs): OVOSSkill.__init__(self, name, bus, **kwargs) From 867b7b18b501f4fce8bfd504a311d394e3995a3f Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 10 May 2024 17:49:42 -0700 Subject: [PATCH 2/4] Update unit tests to account for new website structure --- tests/web_util_tests.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/web_util_tests.py b/tests/web_util_tests.py index e1fa5091..288bc54b 100644 --- a/tests/web_util_tests.py +++ b/tests/web_util_tests.py @@ -42,10 +42,8 @@ def test_scrape_page_for_links(self): self.assertIn("about us", links.keys()) # TODO: Update test to validate absolute and relative URL paths # Relative href - self.assertIn(links["about us"], - ("https://neon.ai/aboutus", - "http://neon.ai/aboutus", - "https://neon.ai/index.php/aboutus")) + self.assertIn(links["company"], + ("https://neon.ai/company",)) except ConnectTimeout: LOG.error("Github testing breaks here") From 73efcd35a29a73c0931958f93957bc146a16cbf2 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 10 May 2024 17:51:27 -0700 Subject: [PATCH 3/4] Update unit tests to account for new website structure --- tests/web_util_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/web_util_tests.py b/tests/web_util_tests.py index 288bc54b..7cee3612 100644 --- a/tests/web_util_tests.py +++ b/tests/web_util_tests.py @@ -39,7 +39,7 @@ def test_scrape_page_for_links(self): try: links = scrape_page_for_links("neon.ai") self.assertIsInstance(links, dict) - self.assertIn("about us", links.keys()) + self.assertIn("company", links.keys()) # TODO: Update test to validate absolute and relative URL paths # Relative href self.assertIn(links["company"], From 5d1f59c3c35cb54a651b59e7ced9fa696d19c50d Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 10 May 2024 17:56:31 -0700 Subject: [PATCH 4/4] Update tests to account for different link formatting --- tests/web_util_tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/web_util_tests.py b/tests/web_util_tests.py index 7cee3612..034fb740 100644 --- a/tests/web_util_tests.py +++ b/tests/web_util_tests.py @@ -43,7 +43,8 @@ def test_scrape_page_for_links(self): # TODO: Update test to validate absolute and relative URL paths # Relative href self.assertIn(links["company"], - ("https://neon.ai/company",)) + ("https://neon.ai/company", + "https://neon.ai/company/")) except ConnectTimeout: LOG.error("Github testing breaks here")