feat(di): changed InstantiationError to print the original stack

modules/angular2/test/core/compiler/integration_dart_spec.dart

@@ -55,8 +55,7 @@ main() {
   });
 
   describe('Error handling', () {
-    //TODO: vsavkin reenable this test after merging DI and EI
-    xit('should preserve Error stack traces thrown from components', inject([
+    it('should preserve Error stack traces thrown from components', inject([
       TestComponentBuilder,
       AsyncTestCompleter
     ], (tb, async) {
@@ -65,13 +64,13 @@ main() {
           directives: [ThrowingComponent]))
 
       .createAsync(Dummy).catchError((e, stack) {
-        expect(stack.toString().split('\n')[0]).toEqual(e.message);
+        expect(e.message).toContain("MockException");
+        expect(e.message).toContain("functionThatThrows");
         async.done();
       });
     }));
 
-    //TODO: vsavkin reenable this test after merging DI and EI
-    xit('should preserve non-Error stack traces thrown from components', inject([
+    it('should preserve non-Error stack traces thrown from components', inject([
       TestComponentBuilder,
       AsyncTestCompleter
     ], (tb, async) {
@@ -80,7 +79,8 @@ main() {
           directives: [ThrowingComponent2]))
 
       .createAsync(Dummy).catchError((e, stack) {
-        expect(stack.toString().split('\n')[0]).toEqual(e.message);
+        expect(e.message).toContain("NonError");
+        expect(e.message).toContain("functionThatThrows");
         async.done();
       });
     }));

modules/angular2/test/di/injector_spec.ts

@@ -250,7 +250,7 @@ export function main() {
       } catch (e) {
         expect(e.message)
             .toContain(`Error during instantiation of Engine! (${stringify(Car)} -> Engine)`);
-        expect(e.cause instanceof BaseException).toBeTruthy();
+        expect(e.originalException instanceof BaseException).toBeTruthy();
         expect(e.causeKey.token).toEqual(Engine);
       }
     });