Skip to content

Commit

Permalink
Merge pull request #6 from duracellko/application-insights
Browse files Browse the repository at this point in the history
Application insights
  • Loading branch information
duracellko authored Dec 29, 2018
2 parents 5ff8e52 + 654368a commit 53a2c0d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
14 changes: 7 additions & 7 deletions azure-pipelines/azure-pipelines-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
displayName: PlanningPoker App

pool:
vmImage: vs2017-win2016
vmImage: ubuntu-16.04

workspace:
clean: all
Expand Down Expand Up @@ -107,30 +107,30 @@ jobs:
displayName: Zip web
inputs:
archiveType: zip
archiveFile: $(Build.StagingDirectory)\web\web.zip
rootFolderOrFile: $(Build.SourcesDirectory)\Build\web\$(BuildConfiguration)\netcoreapp2.1\publish
archiveFile: $(Build.StagingDirectory)/web/web.zip
rootFolderOrFile: $(Build.SourcesDirectory)/Build/web/$(BuildConfiguration)/netcoreapp2.1/publish
includeRootFolder: false
replaceExistingArchive: true
condition: and(succeeded(), eq(variables['PublishArtifacts'], 'true'))

- task: PublishBuildArtifacts@1
displayName: 'Publish artifact: web'
inputs:
PathtoPublish: $(Build.StagingDirectory)\web
PathtoPublish: $(Build.StagingDirectory)/web
ArtifactName: web
condition: and(succeeded(), eq(variables['PublishArtifacts'], 'true'))

- task: CopyFiles@2
displayName: Copy screenshots
inputs:
SourceFolder: $(Build.SourcesDirectory)\Build\bin\$(BuildConfiguration)\netcoreapp2.1\Screenshots
TargetFolder: $(Build.Build.StagingDirectory)\screenshots
SourceFolder: $(Build.SourcesDirectory)/Build/bin/$(BuildConfiguration)/netcoreapp2.1/Screenshots
TargetFolder: $(Build.Build.StagingDirectory)/screenshots
CleanTargetFolder: true
condition: and(succeeded(), eq(variables['RunEnd2EndTests'], 'true'))

- task: PublishBuildArtifacts@1
displayName: 'Publish artifact: screenshots'
inputs:
PathtoPublish: $(Build.Build.StagingDirectory)\screenshots
PathtoPublish: $(Build.Build.StagingDirectory)/screenshots
ArtifactName: screenshots
condition: and(succeeded(), eq(variables['RunEnd2EndTests'], 'true'))
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<Import Project="..\Duracellko.PlanningPoker.Shared\Duracellko.PlanningPoker.Shared.projitems" Label="Shared" />

<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="0.7.0" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
Expand Down
1 change: 1 addition & 0 deletions src/Duracellko.PlanningPoker.Web/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public static void Main(string[] args)

public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
WebHost.CreateDefaultBuilder(args)
.UseApplicationInsights()
.UseStartup<Startup>();
}
}
4 changes: 2 additions & 2 deletions test/Duracellko.PlanningPoker.E2ETest/PlanningPokerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,8 @@ public async Task Observer_Cannot_Estimate(bool serverSide, BrowserType browserT
}

[DataTestMethod]
[DataRow(false, BrowserType.Chrome, BrowserType.Firefox, DisplayName = "Client-side Chrome and Firefox")]
[DataRow(true, BrowserType.Chrome, BrowserType.Firefox, DisplayName = "Server-side Chrome and Firefox")]
[DataRow(false, BrowserType.Chrome, BrowserType.Chrome, DisplayName = "Client-side Chrome")]
[DataRow(true, BrowserType.Chrome, BrowserType.Chrome, DisplayName = "Server-side Chrome")]
public async Task Cannot_Estimate_When_Joining_After_Start(bool serverSide, BrowserType browserType1, BrowserType browserType2)
{
Contexts.Add(new BrowserTestContext(
Expand Down
4 changes: 0 additions & 4 deletions test/Duracellko.PlanningPoker.E2ETest/ScrumMasterTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ public class ScrumMasterTest : E2ETestBase
{
[DataTestMethod]
[DataRow(false, BrowserType.Chrome, DisplayName = "Client-side Chrome")]
[DataRow(false, BrowserType.Firefox, DisplayName = "Client-side Firefox")]
[DataRow(true, BrowserType.Chrome, DisplayName = "Server-side Chrome")]
[DataRow(true, BrowserType.Firefox, DisplayName = "Server-side Firefox")]
public async Task ScrumMaster_Should_Be_Able_To_Estimate(bool serverSide, BrowserType browserType)
{
Contexts.Add(new BrowserTestContext(
Expand Down Expand Up @@ -85,9 +83,7 @@ public async Task Shows_Error_When_Creating_Empty_Team(bool serverSide, BrowserT

[DataTestMethod]
[DataRow(false, BrowserType.Chrome, DisplayName = "Client-side Chrome")]
[DataRow(false, BrowserType.Firefox, DisplayName = "Client-side Firefox")]
[DataRow(true, BrowserType.Chrome, DisplayName = "Server-side Chrome")]
[DataRow(true, BrowserType.Firefox, DisplayName = "Server-side Firefox")]
public async Task Shows_Error_When_Joining_Not_Existing_Team(bool serverSide, BrowserType browserType)
{
Contexts.Add(new BrowserTestContext(
Expand Down

0 comments on commit 53a2c0d

Please sign in to comment.