diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index db25c97..d1c260c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - name: Restore dependencies run: dotnet restore src/ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 865f4e7..19e1e38 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: E2E Tests on: push: - branches: [ "main", "test/**" ] + branches: [ "main", "test/**"] workflow_dispatch: jobs: @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.x' + dotnet-version: '10.0.x' - name: Install Chromium and ChromeDriver run: | diff --git a/docs/Development.md b/docs/Development.md index bf978bd..0255149 100644 --- a/docs/Development.md +++ b/docs/Development.md @@ -74,4 +74,8 @@ Currently there are two environments 7. Do `git commit -m "MESSAGE"` or press the big blue "Commit" button (VSCode) 8. Do `git push` (in the "GRAPH" section there are a few buttons, one of which has an upward facing arrow and the mouseover text "Push"; use this one.) 9. After committing and pushing your changes, create a pull request in GitHub. (optional: Assign @LD-Reborn for code review.) -10. Once there are no requested changes / the review is approved, merge the branch. If you encounter merge conflicts, contact @LD-Reborn. \ No newline at end of file +10. Once there are no requested changes / the review is approved, merge the branch. If you encounter merge conflicts, contact @LD-Reborn. + +# How to perform E2E tests +1. `cd tests/Berufsschule_HAM.E2ETests` +2. `dotnet build && dotnet test` \ No newline at end of file diff --git a/src/Berufsschule_HAM.csproj b/src/Berufsschule_HAM.csproj index 10e8609..78b07bb 100644 --- a/src/Berufsschule_HAM.csproj +++ b/src/Berufsschule_HAM.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 enable enable @@ -9,9 +9,9 @@ - - - - + + + + \ No newline at end of file diff --git a/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj b/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj index e4ad4ef..e90950f 100644 --- a/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj +++ b/tests/Berufsschule_HAM.E2ETests/Berufsschule_HAM.E2ETests.csproj @@ -1,18 +1,18 @@ - net8.0 + net10.0 enable enable false - + - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs b/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs index c488b92..8ef7648 100644 --- a/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs +++ b/tests/Berufsschule_HAM.E2ETests/Helper/AssetsHelper.cs @@ -63,6 +63,7 @@ public static class AssetsHelper driver.FindElement(By.Id("updateModel")).SendKeys(AppHelper.GetRandomName()); driver.ExecuteJavaScript("document.getElementById(\"addAttributeBtn\").click()"); + AppHelper.AwaitVisible(driver, By.CssSelector("#updateAttributesContainer input[data-attr-name]")); driver.FindElement(By.CssSelector("#updateAttributesContainer input[data-attr-name]")).SendKeys(AppHelper.GetRandomName()); driver.FindElement(By.CssSelector("#updateAttributesContainer input[data-attr-value]")).SendKeys(AppHelper.GetRandomName());