Merge branch 'next' into Issue1885

Hosch250 · web-flow · commit d953cdbe5794 · 2016-06-22T16:13:52.000-05:00
diff --git a/RubberduckTests/Mocks/MockProjectBuilder.cs b/RubberduckTests/Mocks/MockProjectBuilder.cs
@@ -162,6 +162,13 @@ private Mock<VBComponents> CreateComponentsMock()
             {
                 _componentsMock.Add(CreateComponentMock("test", c, string.Empty, new Selection()));
             });
+            result.Setup(m => m.Add(It.IsAny<vbext_ComponentType>())).Returns(() =>
+            {
+                var lastComponent = _componentsMock.LastOrDefault();
+                return lastComponent == null
+                    ? null
+                    : lastComponent.Object;
+            });
 
             result.Setup(m => m.Remove(It.IsAny<VBComponent>())).Callback((VBComponent c) =>
             {

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,13 @@ private Mock<VBComponents> CreateComponentsMock()`
`162`	`162`	`{`
`163`	`163`	`_componentsMock.Add(CreateComponentMock("test", c, string.Empty, new Selection()));`
`164`	`164`	`});`
	`165`	`+ result.Setup(m => m.Add(It.IsAny<vbext_ComponentType>())).Returns(() =>`
	`166`	`+ {`
	`167`	`+ var lastComponent = _componentsMock.LastOrDefault();`
	`168`	`+ return lastComponent == null`
	`169`	`+ ? null`
	`170`	`+ : lastComponent.Object;`
	`171`	`+ });`
`165`	`172`
`166`	`173`	`result.Setup(m => m.Remove(It.IsAny<VBComponent>())).Callback((VBComponent c) =>`
`167`	`174`	`{`