Merge branch 'refactor/clone' into refactor/clone-include-owner-in-path

jcansdale · web-flow · commit d0d36e2278d1 · 2018-09-10T16:21:33.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -232,6 +232,9 @@ $RECYCLE.BIN/
 *.msm
 *.msp
 
+#OpenCover output
+coverage.xml
+
 AkavacheSqliteLinkerOverride.cs
 NuGetBuild
 WiX.Toolset.DummyFile.txt
diff --git a/appveyor.yml b/appveyor.yml
@@ -29,3 +29,5 @@ on_success:
     if ($full_build) {
       script\Sign-Package -AppVeyor
     }
+on_finish:
+- ps: scripts\Run-CodeCoverage.ps1 -AppVeyor -Configuration:Release
diff --git a/scripts/Run-CodeCoverage.ps1 b/scripts/Run-CodeCoverage.ps1
@@ -0,0 +1,68 @@
+﻿<#
+.SYNOPSIS
+    Runs NUnit
+#>
+
+[CmdletBinding()]
+Param(
+    [string]
+    $Configuration
+    ,
+    [switch]
+    $AppVeyor = $false
+)
+
+$scriptsDirectory = $PSScriptRoot
+$rootDirectory = Split-Path ($scriptsDirectory)
+. $scriptsDirectory\modules.ps1 | out-null
+
+$nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\tools
+$nunitConsoleRunner = Join-Path $nunitDirectory nunit3-console.exe
+
+$testAssemblies = @(
+    "test\GitHub.Api.UnitTests\bin\$Configuration\GitHub.Api.UnitTests.dll",
+    "test\GitHub.App.UnitTests\bin\$Configuration\GitHub.App.UnitTests.dll",
+    "test\GitHub.Exports.Reactive.UnitTests\bin\$Configuration\GitHub.Exports.Reactive.UnitTests.dll",
+    "test\GitHub.Exports.UnitTests\bin\$Configuration\GitHub.Exports.UnitTests.dll",
+    "test\GitHub.Extensions.UnitTests\bin\$Configuration\GitHub.Extensions.UnitTests.dll",
+    "test\GitHub.InlineReviews.UnitTests\bin\$Configuration\GitHub.InlineReviews.UnitTests.dll",
+    "test\GitHub.Primitives.UnitTests\bin\$Configuration\GitHub.Primitives.UnitTests.dll",
+    "test\GitHub.TeamFoundation.UnitTests\bin\$Configuration\GitHub.TeamFoundation.UnitTests.dll",
+    "test\GitHub.UI.UnitTests\bin\$Configuration\GitHub.UI.UnitTests.dll",
+    "test\GitHub.VisualStudio.UnitTests\bin\$Configuration\GitHub.VisualStudio.UnitTests.dll",
+    "test\MetricsTests\MetricsTests\bin\$Configuration\MetricsTests.dll",
+    "test\TrackingCollectionTests\bin\$Configuration\TrackingCollectionTests.dll"
+)
+
+$opencoverTargetArgs = ($testAssemblies -join " ") + " --where \`"cat!=Timings and cat!=CodeCoverageFlake\`" --inprocess --noresult"
+
+$opencoverDirectory = Join-Path $rootDirectory packages\OpenCover.4.6.519\tools
+$opencover = Join-Path $opencoverDirectory OpenCover.Console.exe
+$opencoverArgs = @(
+    "-target:`"$nunitConsoleRunner`"",
+    "-targetargs:`"$opencoverTargetArgs`"",
+    "-filter:`"+[GitHub*]* -[GitHub*UnitTests]*`"",
+    "-register:user -output:$rootDirectory\coverage.xml"
+) -join " "
+
+$codecovDirectory = Join-Path $rootDirectory packages\Codecov.1.0.5\tools
+$codecov = Join-Path $codecovDirectory codecov.exe
+$codecovArgs = "-f $rootDirectory\coverage.xml"
+
+& {
+    Trap {
+        Write-Output "$Project tests failed"
+        exit 0
+    }
+
+    Run-Process 600 $opencover $opencoverArgs
+
+    if($AppVeyor) {
+        Run-Process 60 $codecov $codecovArgs
+    }
+
+    if (!$?) {
+        Write-Output "$Project tests failed"
+        exit 0
+    }
+}
diff --git a/scripts/modules.ps1 b/scripts/modules.ps1
@@ -73,7 +73,7 @@ New-Module -ScriptBlock {
             $output += Get-Content $outputPath
             $exitCode = $process.ExitCode
         } else {
-            $output += "Tests timed out. Backtrace:"
+            $output += "Process timed out. Backtrace:"
             $output += Get-DotNetStack $process.Id
             $exitCode = 9999
         }
diff --git a/src/GitHub.App/SampleData/Dialog/Clone/RepositoryCloneViewModelDesigner.cs b/src/GitHub.App/SampleData/Dialog/Clone/RepositoryCloneViewModelDesigner.cs
@@ -23,6 +23,7 @@ public RepositoryCloneViewModelDesigner()
         public IRepositorySelectViewModel GitHubTab { get; }
         public IRepositorySelectViewModel EnterpriseTab { get; }
         public IRepositoryUrlViewModel UrlTab { get; }
+        public ReactiveCommand<object> Browse { get; }
         public ReactiveCommand<CloneDialogResult> Clone { get; }
 
         public Task InitializeAsync(IConnection connection)
diff --git a/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs b/src/GitHub.App/ViewModels/Dialog/Clone/RepositoryCloneViewModel.cs
@@ -10,6 +10,7 @@
 using GitHub.Models;
 using GitHub.Services;
 using ReactiveUI;
+using Rothko;
 using Serilog;
 
 namespace GitHub.ViewModels.Dialog.Clone
@@ -19,6 +20,7 @@ namespace GitHub.ViewModels.Dialog.Clone
     public class RepositoryCloneViewModel : ViewModelBase, IRepositoryCloneViewModel
     {
         static readonly ILogger log = LogManager.ForContext<RepositoryCloneViewModel>();
+        readonly IOperatingSystem os;
         readonly IConnectionManager connectionManager;
         readonly IRepositoryCloneService service;
         readonly IReadOnlyList<IRepositoryCloneTabViewModel> tabs;
@@ -29,12 +31,14 @@ public class RepositoryCloneViewModel : ViewModelBase, IRepositoryCloneViewModel
 
         [ImportingConstructor]
         public RepositoryCloneViewModel(
+            IOperatingSystem os,
             IConnectionManager connectionManager,
             IRepositoryCloneService service,
             IRepositorySelectViewModel gitHubTab,
             IRepositorySelectViewModel enterpriseTab,
             IRepositoryUrlViewModel urlTab)
         {
+            this.os = os;
             this.connectionManager = connectionManager;
             this.service = service;
 
@@ -61,6 +65,7 @@ public RepositoryCloneViewModel(
                 (repo, error) => (repo, error))
                 .Select(x => x.repo != null && x.error == null);
 
+            Browse = ReactiveCommand.Create().OnExecuteCompleted(_ => BrowseForDirectory());
             Clone = ReactiveCommand.CreateAsyncObservable(
                 canClone,
                 _ => repository.Select(x => new CloneDialogResult(Path, x)));
@@ -88,6 +93,8 @@ public int SelectedTabIndex
 
         public IObservable<object> Done => Clone;
 
+        public ReactiveCommand<object> Browse { get; }
+
         public ReactiveCommand<CloneDialogResult> Clone { get; }
 
         public async Task InitializeAsync(IConnection connection)
@@ -114,6 +121,24 @@ public async Task InitializeAsync(IConnection connection)
             this.WhenAnyValue(x => x.SelectedTabIndex).Subscribe(x => tabs[x].Activate().Forget());
         }
 
+        void BrowseForDirectory()
+        {
+            var result = os.Dialog.BrowseForDirectory(Path, Resources.BrowseForDirectory);
+
+            if (result != BrowseDirectoryResult.Failed)
+            {
+                var path = result.DirectoryPath;
+                var selected = tabs[SelectedTabIndex].Repository;
+
+                if (selected != null)
+                {
+                    path = System.IO.Path.Combine(path, selected.Name);
+                }
+
+                Path = path;
+            }
+        }
+
         void UpdatePath(IRepositoryModel repository)
         {
             if (repository != null)
diff --git a/src/GitHub.Exports.Reactive/ViewModels/Dialog/Clone/IRepositoryCloneViewModel.cs b/src/GitHub.Exports.Reactive/ViewModels/Dialog/Clone/IRepositoryCloneViewModel.cs
@@ -42,6 +42,11 @@ public interface IRepositoryCloneViewModel : IDialogContentViewModel, IConnectio
         /// </remarks>
         int SelectedTabIndex { get; }
 
+        /// <summary>
+        /// Gets the command executed when the user clicks "Browse".
+        /// </summary>
+        ReactiveCommand<object> Browse { get; }
+
         /// <summary>
         /// Gets the command executed when the user clicks "Clone".
         /// </summary>
diff --git a/src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml b/src/GitHub.VisualStudio/Views/Dialog/Clone/RepositoryCloneView.xaml
@@ -36,6 +36,7 @@
                    Margin="16">
             <Label DockPanel.Dock="Left">Local Path</Label>
             <Button DockPanel.Dock="Right"
+                    Command="{Binding Browse}"
                     Style="{DynamicResource GitHubBlueLinkButton}"
                     VerticalContentAlignment="Center">
                 Browse
diff --git a/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs b/test/GitHub.App.UnitTests/ViewModels/Dialog/Clone/RepositoryCloneViewModelTests.cs
@@ -8,6 +8,7 @@
 using GitHub.ViewModels.Dialog.Clone;
 using NSubstitute;
 using NUnit.Framework;
+using Rothko;
 
 namespace GitHub.App.UnitTests.ViewModels.Dialog.Clone
 {
@@ -269,19 +270,22 @@ static IRepositoryCloneService CreateRepositoryCloneService()
         }
 
         static RepositoryCloneViewModel CreateTarget(
+            IOperatingSystem os = null,
             IConnectionManager connectionManager = null,
             IRepositoryCloneService service = null,
             IRepositorySelectViewModel gitHubTab = null,
             IRepositorySelectViewModel enterpriseTab = null,
             IRepositoryUrlViewModel urlTab = null)
         {
+            os = os ?? Substitute.For<IOperatingSystem>();
             connectionManager = connectionManager ?? CreateConnectionManager("https://github.com");
             service = service ?? CreateRepositoryCloneService();
             gitHubTab = gitHubTab ?? CreateSelectViewModel();
             enterpriseTab = enterpriseTab ?? CreateSelectViewModel();
             urlTab = urlTab ?? Substitute.For<IRepositoryUrlViewModel>();
 
             return new RepositoryCloneViewModel(
+                os,
                 connectionManager,
                 service,
                 gitHubTab,
diff --git a/test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs b/test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs
@@ -442,7 +442,7 @@ Line 2
                 }
             }
 
-            [Test]
+            [Test, NUnit.Framework.Category("CodeCoverageFlake")]
             public async Task UpdatesInlineCommentThreadsFromEditorContent()
             {
                 var baseContents = @"Line 1
@@ -497,7 +497,7 @@ Line 2
                 }
             }
 
-            [Test]
+            [Test, NUnit.Framework.Category("CodeCoverageFlake")]
             public async Task UpdatesReviewCommentWithNewBody()
             {
                 var baseContents = @"Line 1
diff --git a/test/MetricsTests/MetricsTests/packages.config b/test/MetricsTests/MetricsTests/packages.config
@@ -1,6 +1,8 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Codecov" version="1.0.5" targetFramework="net461" />
   <package id="NUnit" version="3.9.0" targetFramework="net452" />
   <package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net452" />
   <package id="NUnit3TestAdapter" version="3.9.0" targetFramework="net452" />
+  <package id="OpenCover" version="4.6.519" targetFramework="net461" />
 </packages>
diff --git a/test/TrackingCollectionTests/TrackingCollectionTests.cs b/test/TrackingCollectionTests/TrackingCollectionTests.cs
@@ -1832,7 +1832,7 @@ public void Removing()
         col.Dispose();
     }
 
-    [Test]
+    [Test, Category("CodeCoverageFlake")]
     public void RemovingFirstItemWithFilterWorks()
     {
         var source = new Subject<Thing>();

Original file line number	Diff line number	Diff line change
`@@ -29,3 +29,5 @@ on_success:`
`29`	`29`	`if ($full_build) {`
`30`	`30`	`script\Sign-Package -AppVeyor`
`31`	`31`	`}`
	`32`	`+on_finish:`
	`33`	`+- ps: scripts\Run-CodeCoverage.ps1 -AppVeyor -Configuration:Release`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ New-Module -ScriptBlock {`
`73`	`73`	`$output += Get-Content $outputPath`
`74`	`74`	`$exitCode = $process.ExitCode`
`75`	`75`	`} else {`
`76`		`- $output += "Tests timed out. Backtrace:"`
	`76`	`+ $output += "Process timed out. Backtrace:"`
`77`	`77`	`$output += Get-DotNetStack $process.Id`
`78`	`78`	`$exitCode = 9999`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ Line 2`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`
`445`		`- [Test]`
	`445`	`+ [Test, NUnit.Framework.Category("CodeCoverageFlake")]`
`446`	`446`	`public async Task UpdatesInlineCommentThreadsFromEditorContent()`
`447`	`447`	`{`
`448`	`448`	`var baseContents = @"Line 1`
`@@ -497,7 +497,7 @@ Line 2`
`497`	`497`	`}`
`498`	`498`	`}`
`499`	`499`
`500`		`- [Test]`
	`500`	`+ [Test, NUnit.Framework.Category("CodeCoverageFlake")]`
`501`	`501`	`public async Task UpdatesReviewCommentWithNewBody()`
`502`	`502`	`{`
`503`	`503`	`var baseContents = @"Line 1`