Update title regex to work with Firefox

Search for Chrome then Firefox windows.
Need to find a way to search in order of height.

Author: jcansdale

src/GitHub.App/Services/GitHubContextService.cs

@@ -28,12 +28,12 @@ public class GitHubContextService
 
         static readonly string path = $"^{repo}/(?<path>[^ ]+)";
 
-        static readonly Regex windowTitleRepositoryRegex = new Regex($"^{owner}/{repo}: ", RegexOptions.Compiled);
-        static readonly Regex windowTitleBranchRegex = new Regex($"^{owner}/{repo} at {branch} ", RegexOptions.Compiled);
-        static readonly Regex windowTitlePullRequestRegex = new Regex($" · Pull Request #{pull} · {owner}/{repo} - ", RegexOptions.Compiled);
-        static readonly Regex windowTitleIssueRegex = new Regex($" · Issue #{issue} · {owner}/{repo} - ", RegexOptions.Compiled);
-        static readonly Regex windowTitlePathRegex = new Regex($"{path} at {branch} · {owner}/{repo} - ", RegexOptions.Compiled);
-        static readonly Regex windowTitleBranchesRegex = new Regex($"Branches · {owner}/{repo} - ", RegexOptions.Compiled);
+        static readonly Regex windowTitleRepositoryRegex = new Regex($"^(GitHub - )?{owner}/{repo}: ", RegexOptions.Compiled);
+        static readonly Regex windowTitleBranchRegex = new Regex($"^(GitHub - )?{owner}/{repo} at {branch} ", RegexOptions.Compiled);
+        static readonly Regex windowTitlePullRequestRegex = new Regex($" · Pull Request #{pull} · {owner}/{repo}( · GitHub)? - ", RegexOptions.Compiled);
+        static readonly Regex windowTitleIssueRegex = new Regex($" · Issue #{issue} · {owner}/{repo}( · GitHub)? - ", RegexOptions.Compiled);
+        static readonly Regex windowTitlePathRegex = new Regex($"{path} at {branch} · {owner}/{repo}( · GitHub)? - ", RegexOptions.Compiled);
+        static readonly Regex windowTitleBranchesRegex = new Regex($"Branches · {owner}/{repo}( · GitHub)? - ", RegexOptions.Compiled);
 
         public GitHubContext FindContextFromUrl(string url)
         {
@@ -61,10 +61,14 @@ public GitHubContext FindContextFromUrl(string url)
 
         public GitHubContext FindContextFromBrowser()
         {
-            return FindWindowTitlesForClass("Chrome_WidgetWin_1").Select(FindContextFromWindowTitle).Where(x => x != null).FirstOrDefault();
+            return
+                FindWindowTitlesForClass("Chrome_WidgetWin_1")              // Chrome
+                .Concat(FindWindowTitlesForClass("MozillaWindowClass"))     // Firefox
+                .Select(FindContextFromWindowTitle).Where(x => x != null)
+                .FirstOrDefault();
         }
 
-        public IEnumerable<string> FindWindowTitlesForClass(string className = "Chrome_WidgetWin_1")
+        public IEnumerable<string> FindWindowTitlesForClass(string className = "MozillaWindowClass")
         {
             IntPtr handleWin = IntPtr.Zero;
             while (IntPtr.Zero != (handleWin = User32.FindWindowEx(IntPtr.Zero, handleWin, className, IntPtr.Zero)))

test/GitHub.App.UnitTests/Services/GitHubContextServiceTests.cs

@@ -230,7 +230,33 @@ public void OwnerRepositoryBranch(string windowTitle, string expectOwner, string
             Assert.That(context.Branch, Is.EqualTo(expectBranch));
         }
 
-        [TestCase("[spike] Open from GitHub URL by jcansdale · Pull Request #1763 · github/VisualStudio - Google Chrome", 1763)]
+        [TestCase("github/VisualStudio at build/appveyor-fixes - Google Chrome", "github", "VisualStudio", "build/appveyor-fixes", Description = "Chrome")]
+        [TestCase("GitHub - github/VisualStudio at refactor/pr-list - Mozilla Firefox", "github", "VisualStudio", "refactor/pr-list", Description = "Firefox")]
+        public void TreeBranch(string windowTitle, string expectOwner, string expectRepositoryName, string expectBranch)
+        {
+            var target = new GitHubContextService();
+
+            var context = target.FindContextFromWindowTitle(windowTitle);
+
+            Assert.That(context.Owner, Is.EqualTo(expectOwner));
+            Assert.That(context.RepositoryName, Is.EqualTo(expectRepositoryName));
+            Assert.That(context.Branch, Is.EqualTo(expectBranch));
+        }
+
+        [TestCase("Branches · github/VisualStudio - Google Chrome", "github", "VisualStudio", Description = "Chrome")]
+        [TestCase("Branches · github/VisualStudio · GitHub - Mozilla Firefox", "github", "VisualStudio", Description = "Firefox")]
+        public void Branches(string windowTitle, string expectOwner, string expectRepositoryName)
+        {
+            var target = new GitHubContextService();
+
+            var context = target.FindContextFromWindowTitle(windowTitle);
+
+            Assert.That(context.Owner, Is.EqualTo(expectOwner));
+            Assert.That(context.RepositoryName, Is.EqualTo(expectRepositoryName));
+        }
+
+        [TestCase("Description · Pull Request #1763 · github/VisualStudio - Google Chrome", 1763)]
+        [TestCase("Description · Pull Request #1763 · github/VisualStudio · GitHub - Mozilla Firefox", 1763, Description = "Firefox")]
         public void PullRequest(string windowTitle, int expectPullRequest)
         {
             var target = new GitHubContextService();
@@ -241,6 +267,8 @@ public void PullRequest(string windowTitle, int expectPullRequest)
         }
 
         [TestCase("Consider adding C# code style preferences to editorconfig · Issue #1750 · github/VisualStudio - Google Chrome", 1750)]
+        [TestCase("Scrape browser titles · Issue #4 · jcansdale/VisualStudio · GitHub - Mozilla Firefox", 4, Description = "Firefox")]
+
         public void Issue(string windowTitle, int expectIssue)
         {
             var target = new GitHubContextService();
@@ -252,6 +280,7 @@ public void Issue(string windowTitle, int expectIssue)
 
         [TestCase("VisualStudio/mark_github.xaml at master · github/VisualStudio - Google Chrome", "mark_github.xaml")]
         [TestCase("VisualStudio/src/GitHub.VisualStudio/Resources/icons at master · github/VisualStudio - Google Chrome", "src/GitHub.VisualStudio/Resources/icons")]
+        [TestCase("VisualStudio/README.md at master · jcansdale/VisualStudio · GitHub - Mozilla Firefox", "README.md", Description = "Firefox")]
         public void Path(string windowTitle, string expectPath)
         {
             var target = new GitHubContextService();
@@ -260,5 +289,17 @@ public void Path(string windowTitle, string expectPath)
 
             Assert.That(context?.Path, Is.EqualTo(expectPath));
         }
+
+        [TestCase("jcansdale/VisualStudio: GitHub Extension for Visual Studio - Google Chrome", "jcansdale", "VisualStudio", Description = "Chrome")]
+        [TestCase("GitHub - jcansdale/VisualStudio: GitHub Extension for Visual Studio - Mozilla Firefox", "jcansdale", "VisualStudio", Description = "Firefox")]
+        public void RepositoryHome(string windowTitle, string expectOwner, string expectRepositoryName)
+        {
+            var target = new GitHubContextService();
+
+            var context = target.FindContextFromWindowTitle(windowTitle);
+
+            Assert.That(context.Owner, Is.EqualTo(expectOwner));
+            Assert.That(context.RepositoryName, Is.EqualTo(expectRepositoryName));
+        }
     }
 }