11 changed files with 26 additions and 87 deletions
--- a/kdb-bot/test/ui_tests/config/appsettings.json
+++ b/kdb-bot/test/ui_tests/config/appsettings.json
@ -22,7 +22,6 @@
    "MePageUrl": "https://discord.com/channels/@me",
    "CmdURL": "https://discord.com/channels/910199451145076828/911578636899987526",
    "GuildId": 910199451145076828,
-    "BotId": 998159802393964594,
-    "TestUserId": 401941112010571777
+    "BotId": 998159802393964594
  }
 }
--- a/kdb-bot/test/ui_tests/src/ui_tests_shared/command_selectors_enum.py
+++ b/kdb-bot/test/ui_tests/src/ui_tests_shared/command_selectors_enum.py
@ -4,10 +4,8 @@ from enum import Enum
 class CommandSelectorsEnum(Enum):
    cmd_chat = '/html/body/div[1]/div[2]/div/div[1]/div/div[2]/div/div[1]/div/div/div[3]/div[2]/main/form/div/div[1]/div/div[3]/div/div[2]/div'
    cmd_chat_input = '/html/body/div[1]/div[2]/div/div[1]/div/div[2]/div/div[1]/div/div/div[3]/div/main/form/div/div[2]/div/div[2]/div/div'
-    msg_input = '/html/body/div[1]/div[2]/div/div[1]/div/div[2]/div/div[1]/div/div/div[3]/div[2]/main/form/div/div[1]/div/div[3]/div/div/div'

-    ping = '/html/body/div[1]/div[2]/div/div[1]/div/div[2]/div/div[1]/div/div/div[3]/div[2]/main/form/div/div[2]/div/div/div[5]/div'
-    info = '/html/body/div[1]/div[2]/div/div[1]/div/div[2]/div/div[1]/div/div/div[3]/div[2]/main/form/div/div[2]/div/div/div[5]/div'
-    help = '/html/body/div[1]/div[2]/div/div[1]/div/div[2]/div/div[1]/div/div/div[3]/div[2]/main/form/div/div[2]/div/div/div[5]/div'
-    afk = '/html/body/div[1]/div[2]/div/div[1]/div/div[2]/div/div[1]/div/div/div[3]/div[2]/main/form/div/div[2]/div/div/div[2]/div'
-    purge = '/html/body/div[1]/div[2]/div/div[1]/div/div[2]/div/div[1]/div/div/div[3]/div[2]/main/form/div/div[2]/div/div/div[5]/div'
+    ping = '//*[ contains (text(), ‘Krümmelmonster-test’ ) ]'
+    info = '//*[ contains (text(), ‘Krümmelmonster-test’ ) ]'
+    help = '//*[ contains (text(), ‘Krümmelmonster-test’ ) ]'
+    afk = '//*[ contains (text(), ‘Krümmelmonster-test’ ) ]'
--- a/kdb-bot/test/ui_tests/ui-tests.json
+++ b/kdb-bot/test/ui_tests/ui-tests.json
@ -16,12 +16,7 @@
    "LicenseName": "",
    "LicenseDescription": "",
    "Dependencies": [
-      "cpl-core>=2022.10.0.post9",
-      "PyNaCl==1.5.0",
-      "cffi==1.15.1",
-      "pycparser==2.21",
-      "selenium==4.6.1",
-      "webdriver-manager==3.8.5"
+      "cpl-core>=2022.10.0.post9"
    ],
    "DevDependencies": [
      "cpl-cli>=2022.10.0"
--- a/kdb-bot/test/ui_tests_shared/command_test_case_with_app.py
+++ b/kdb-bot/test/ui_tests_shared/command_test_case_with_app.py
@ -27,23 +27,10 @@ class CommandTestCaseWithApp(TestCaseWithApp):
        cls._bot = cls._services.get_service(DiscordBotServiceABC)
        cls._t = cls._services.get_service(TranslatePipe)

-    @classmethod
-    def send_message(cls, msg: str):
-        if UI.driver.current_url != cls._test_settings.cmd_url:
-            UI.driver.get(cls._test_settings.cmd_url)
-            time.sleep(2)
-
-        cmd_element_ident = (By.XPATH, CommandSelectorsEnum.cmd_chat.value)
-        cmd_element = UI.driver.find_element(*cmd_element_ident)
-        cmd_element.send_keys(msg)
-        time.sleep(2)
-        UI.driver.find_element(By.XPATH, CommandSelectorsEnum.msg_input.value).send_keys(Keys.ENTER)
-
    @classmethod
    def send_command(cls, cmd: str, selector: CommandSelectorsEnum):
-        if UI.driver.current_url != cls._test_settings.cmd_url:
-            UI.driver.get(cls._test_settings.cmd_url)
-            time.sleep(2)
+        UI.driver.get(cls._test_settings.cmd_url)
+        time.sleep(2)

        cmd_element_ident = (By.XPATH, CommandSelectorsEnum.cmd_chat.value)
        cmd_element = UI.driver.find_element(*cmd_element_ident)
--- a/kdb-bot/test/ui_tests_shared/configuration/test_settings.py
+++ b/kdb-bot/test/ui_tests_shared/configuration/test_settings.py
@ -14,7 +14,6 @@ class TestSettings(ConfigurationModelABC):
        self._cmd_url = ''
        self._guild_id = 0
        self._bot_id = 0
-        self._test_user_id = 0

    @property
    def login_url(self) -> str:
@ -36,10 +35,6 @@ class TestSettings(ConfigurationModelABC):
    def bot_id(self) -> int:
        return self._bot_id

-    @property
-    def test_user_id(self) -> int:
-        return self._test_user_id
-
    def from_dict(self, settings: dict):
        try:
            self._login_url = settings['LoginUrl']
@ -47,7 +42,6 @@ class TestSettings(ConfigurationModelABC):
            self._cmd_url = settings['CmdURL']
            self._guild_id = settings['GuildId']
            self._bot_id = settings['BotId']
-            self._test_user_id = settings['TestUserId']
        except Exception as e:
            Console.error(f'[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings')
            Console.error(f'[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}')
--- a/kdb-bot/test/ui_tests_shared/decorators.py
+++ b/kdb-bot/test/ui_tests_shared/decorators.py
@ -2,14 +2,13 @@ import asyncio


 class Async:
-    _loop = None

    @classmethod
-    def async_func(cls, coro):
+    def test(cls, coro):
        def wrapper(*args, **kwargs):
-            if cls._loop is None:
-                cls._loop = asyncio.get_event_loop()
-
-            return cls._loop.run_until_complete(coro(*args, **kwargs))
+            try:
+                return asyncio.run(coro(*args, **kwargs))
+            except Exception as e:
+                return

        return wrapper
--- a/kdb-bot/test/ui_tests_tests/commands/common/afk_command_test_case.py
+++ b/kdb-bot/test/ui_tests_tests/commands/common/afk_command_test_case.py
@ -12,7 +12,7 @@ from ui_tests_shared.ui import UI

 class AFKCommandTestCase(CommandTestCaseWithApp):

-    @Async.async_func
+    @Async.test
    async def test_error_message(self):
        correct_response = self._t.transform('modules.base.afk_command_channel_missing_message')
        self.assertIsNotNone(correct_response)
@ -21,24 +21,22 @@ class AFKCommandTestCase(CommandTestCaseWithApp):
        def check(m: discord.Message):
            return m.content == correct_response and m.author.id == self._test_settings.bot_id

-        response = await self._bot.wait_for('message', check=check, timeout=10)
+        response = await self._bot.wait_for('message', check=check)
        self.assertEqual(response.content, correct_response)

-    @Async.async_func
+    @Async.test
    async def test_move(self):
        # correct_response = self._t.transform('modules.base.pong')
        # self.assertIsNotNone(correct_response)
        UI.driver.find_element(By.XPATH, '//*[@id="channels"]/ul/li[20]/div/div/div/a').click()
-        def check1(member: discord.Member, before: discord.VoiceState, after: discord.VoiceState):
-            return member.id == self._test_settings.test_user_id and after is not None and after.channel.id == 911578760476762153
-        res = await self._bot.wait_for('voice_state_update', check=check1, timeout=10)
+        time.sleep(1)

        self.send_command('afk', CommandSelectorsEnum.afk)

-        def check2(member: discord.Member, before: discord.VoiceState, after: discord.VoiceState):
-            return member.id == self._test_settings.test_user_id and after is not None and after.channel.id == 910199452915093594
-        member, before, after = await self._bot.wait_for('voice_state_update', check=check2, timeout=10)
-        UI.driver.find_element(By.XPATH, '/html/body/div[1]/div[2]/div/div[1]/div/div[2]/div/div[1]/div/div/div[1]/section/div[1]/div/div[1]/div[2]/button').click()
-        self.assertIsNotNone(after.channel)
-        self.assertEqual(after.channel.id, 910199452915093594)
+        def check(member: discord.Member, before: discord.VoiceState, after: discord.VoiceState):
+            return member.id == self._bot.user.id
+
+        response: VoiceState = await self._bot.wait_for('voice_state_update', check=check)
+        self.assertIsNotNone(response.channel)
+        self.assertEqual(response.channel.id, 910199452915093594)
        # self.assertEqual(response.content, correct_response)
--- a/kdb-bot/test/ui_tests_tests/commands/common/help_command_test_case.py
+++ b/kdb-bot/test/ui_tests_tests/commands/common/help_command_test_case.py
@ -7,7 +7,7 @@ from ui_tests_shared.decorators import Async

 class HelpCommandTestCase(CommandTestCaseWithApp):

-    @Async.async_func
+    @Async.test
    async def test_help(self):
        correct_response = 'https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot/wiki/Befehle'
        self.send_command('help', CommandSelectorsEnum.help)
--- a/kdb-bot/test/ui_tests_tests/commands/common/info_command_test_case.py
+++ b/kdb-bot/test/ui_tests_tests/commands/common/info_command_test_case.py
@ -34,7 +34,7 @@ class InfoCommandTestCase(CommandTestCaseWithApp):
        embed.add_field(name=self._t.transform('modules.base.info.fields.modules'), value='\n'.join(modules), inline=False)
        return embed

-    @Async.async_func
+    @Async.test
    async def test_info(self):
        correct_response = self.get_embed()
        self.send_command('info', CommandSelectorsEnum.info)
--- a/kdb-bot/test/ui_tests_tests/commands/common/ping_command_test_case.py
+++ b/kdb-bot/test/ui_tests_tests/commands/common/ping_command_test_case.py
@ -7,7 +7,7 @@ from ui_tests_shared.decorators import Async

 class PingCommandTestCase(CommandTestCaseWithApp):

-    @Async.async_func
+    @Async.test
    async def test_ping(self):
        correct_response = self._t.transform('modules.base.pong')
        self.assertIsNotNone(correct_response)
--- a/kdb-bot/test/ui_tests_tests/commands/common/purge_command_test_case.py
+++ b/kdb-bot/test/ui_tests_tests/commands/common/purge_command_test_case.py
@ -1,31 +0,0 @@
-import asyncio
-import time
-
-import discord
-
-from ui_tests.src.ui_tests_shared.command_selectors_enum import CommandSelectorsEnum
-from ui_tests_shared.command_test_case_with_app import CommandTestCaseWithApp
-from ui_tests_shared.decorators import Async
-
-
-class PurgeCommandTestCase(CommandTestCaseWithApp):
-
-    def setUp(self):
-        self.send_message('test nachricht 1')
-        self.send_message('test nachricht 2')
-        self.send_message('test nachricht 3')
-        self.send_message('test nachricht 4')
-
-    def test_purge(self):
-        correct_response = self._t.transform('modules.moderator.purge_message')
-        self.assertIsNotNone(correct_response)
-        self.send_command('purge', CommandSelectorsEnum.purge)
-
-        def check(m: discord.Message):
-            return m.content == correct_response and m.author.id == self._test_settings.bot_id
-
-        response = asyncio.run(self._bot.wait_for('message', check=check))
-        self.assertEqual(response.content, correct_response)
-        time.sleep(20)
-        channel = self._bot.get_channel(911578680998895687)
-        self.assertEqual(channel.message_count, 0)