From d0de12a5e00484dd508e0446a5171fb891813ab7 Mon Sep 17 00:00:00 2001
From: "Sam Smith (Microsoft)" <samsmithnz@gmail.com>
Date: Sat, 3 Apr 2021 15:37:35 -0400
Subject: [PATCH] Enabling functional tests, take 2 (#306)

* Enabling functional tests, take 2

* Adding missing nuget package

* Trying the beta selenium driver

* Newtonsoft

* Trying functional test tweak

* Tweaked build file
---
 .github/workflows/aspnetcore.yml                 | 16 +++++++++++++---
 .../FeatureFlags.FunctionalTests.csproj          |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/aspnetcore.yml b/.github/workflows/aspnetcore.yml
index e1c833b8..236b80c0 100644
--- a/.github/workflows/aspnetcore.yml
+++ b/.github/workflows/aspnetcore.yml
@@ -43,11 +43,13 @@ jobs:
       with:
         dotnet-version: ${{ env.dotNetSDKVersion }}
               
-    #Publish dotnet objects
+    #Publish web and web service projects
     - name: DotNet Publish Web Service
       run: dotnet publish FeatureFlags/FeatureFlags.Service/FeatureFlags.Service.csproj --configuration ${{ env.dotNetConfiguration }} -p:Version=${{ steps.gitversion.outputs.nuGetVersionV2 }} --output ${{ github.workspace }}/webservice --runtime ${{env.runtimeTarget}} --self-contained false # --self-contained true --runtime ${{env.runtimeTarget}}
     - name: DotNet Publish Web Site
       run: dotnet publish FeatureFlags/FeatureFlags.Web/FeatureFlags.Web.csproj --configuration ${{ env.dotNetConfiguration }} -p:Version=${{ steps.gitversion.outputs.nuGetVersionV2 }} --output ${{ github.workspace }}/web --runtime ${{env.runtimeTarget}} --self-contained false # --self-contained true --runtime ${{env.runtimeTarget}}
+
+    #Publish functional tests
     - name: DotNet build functional tests
       run: dotnet build FeatureFlags/FeatureFlags.FunctionalTests/FeatureFlags.FunctionalTests.csproj --configuration ${{ env.dotNetConfiguration }} --runtime ${{env.runtimeTarget}} #--self-contained false #--self-contained true --runtime ${{env.runtimeTarget}}
     - name: DotNet Publish functional tests
@@ -55,6 +57,12 @@ jobs:
     - name: Copy chromedriver for functional test
       run: copy "FeatureFlags/FeatureFlags.FunctionalTests/bin/${{ env.dotNetConfiguration }}/${{ env.dotNetVersion }}/${{env.runtimeTarget}}/chromedriver.exe" "${{ github.workspace }}/functionalTests"
       shell: powershell
+    - name: DotNet restore functional tests to get correct NewtonSoft version
+      run: dotnet restore FeatureFlags/FeatureFlags.FunctionalTests/FeatureFlags.FunctionalTests.csproj 
+    - name: Copy new NewtonSoft version for functional test
+      run: copy "FeatureFlags/FeatureFlags.FunctionalTests/bin/${{ env.dotNetConfiguration }}/${{ env.dotNetVersion }}/${{env.runtimeTarget}}/Newtonsoft.Json.dll" "${{ github.workspace }}/functionalTests"
+      shell: powershell
+
     
     #Publish build artifacts to GitHub
     - name: Upload web service build artifacts back to GitHub
@@ -92,6 +100,7 @@ jobs:
     - name: Build automated tests project
       run: dotnet build FeatureFlags/FeatureFlags.Tests/FeatureFlags.Tests.csproj --configuration ${{ env.dotNetConfiguration }}
     - name: Create empty file to get around error in .NET 6
+      if: 0 == 1
       run: |
         #Create the secrets.json file
         New-Item FeatureFlags\FeatureFlags.Tests\secrets.json
@@ -145,7 +154,8 @@ jobs:
         app-name: featureflags-data-eu-service
         package: serviceapp
         slot-name: staging   
-    - run: az webapp config appsettings set --name "featureflags-data-eu-service" --resource-group "SamLearnsAzureFeatureFlags" --slot staging --settings "AppSettings:ClientSecret=${{ secrets.ClientSecret }}"  
+    - name: Set service secrets
+      run: az webapp config appsettings set --name "featureflags-data-eu-service" --resource-group "SamLearnsAzureFeatureFlags" --slot staging --settings "AppSettings:ClientSecret=${{ secrets.ClientSecret }}"  
     - name: Deploy website to Azure WebApp
       uses: Azure/webapps-deploy@v1
       with:
@@ -155,7 +165,7 @@ jobs:
 
     # Run functional tests on staging slots     
     - name: Functional Tests
-      if: 0 == 1
+      if: 1 == 1
       run: |
         $vsTestConsoleExe = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\IDE\\Extensions\\TestPlatform\\vstest.console.exe"
         $targetTestDll = "functionaltests\FeatureFlags.FunctionalTests.dll"
diff --git a/FeatureFlags/FeatureFlags.FunctionalTests/FeatureFlags.FunctionalTests.csproj b/FeatureFlags/FeatureFlags.FunctionalTests/FeatureFlags.FunctionalTests.csproj
index 661de7fa..321c6a6c 100644
--- a/FeatureFlags/FeatureFlags.FunctionalTests/FeatureFlags.FunctionalTests.csproj
+++ b/FeatureFlags/FeatureFlags.FunctionalTests/FeatureFlags.FunctionalTests.csproj
@@ -15,7 +15,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Selenium.WebDriver" Version="4.0.0-beta2" />
     <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="89.0.4389.2300" />
   </ItemGroup>