Permalink
Browse files

Merge pull request #214 from jordansjones/master

Addresses issue #209.
  • Loading branch information...
2 parents 2e9205d + 9833374 commit dfcc95fa3ab3eed6898aea9d47a79a15f8d6e88f Paul Betts committed Mar 20, 2013
Showing with 4 additions and 1 deletion.
  1. +2 −0 ReactiveUI.Routing/RoutedViewHost.cs
  2. +2 −1 ReactiveUI/RxApp.cs
View
2 ReactiveUI.Routing/RoutedViewHost.cs
@@ -52,6 +52,8 @@ public RoutedViewHost()
HorizontalContentAlignment = HorizontalAlignment.Stretch;
VerticalContentAlignment = VerticalAlignment.Stretch;
+ if (RxApp.InUnitTestRunner()) return;
+
this.WhenAny(x => x.Router.NavigationStack, x => x.Value)
.SelectMany(x => x.CollectionCountChanged.StartWith(x.Count).Select(_ => x.LastOrDefault()))
.Subscribe(vm => {
View
3 ReactiveUI/RxApp.cs
@@ -476,7 +476,7 @@ public static bool InUnitTestRunner(string[] testAssemblies, string[] designEnvi
// without access to any WPF references :-/
var entry = Assembly.GetEntryAssembly();
if (entry != null) {
- var exeName = entry.Location.ToUpperInvariant();
+ var exeName = (new FileInfo(entry.Location)).Name.ToUpperInvariant();
if (designEnvironments.Any(x => x.Contains(exeName))) {
return true;
@@ -510,6 +510,7 @@ public static bool InUnitTestRunner()
"BLEND.EXE",
"MONODEVELOP",
"SHARPDEVELOP.EXE",
+ "XDESPROC.EXE",
};
return InUnitTestRunner(testAssemblies, designEnvironments);

0 comments on commit dfcc95f

Please sign in to comment.