From 0d4bb8a71583cd84d3ac6c290bbd8f0c192abd73 Mon Sep 17 00:00:00 2001
From: Anthony Gubler <agubler@sitepen.com>
Date: Thu, 14 Sep 2017 12:22:58 +0100
Subject: [PATCH 1/2] run tsx integrations

---
 tests/unit/all.ts              |  1 +
 tests/unit/testIntegration.tsx | 10 ++++++++--
 tsconfig.json                  |  1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/unit/all.ts b/tests/unit/all.ts
index dec244a1..6b9b728b 100644
--- a/tests/unit/all.ts
+++ b/tests/unit/all.ts
@@ -13,5 +13,6 @@ import './diff';
 import './RegistryHandler';
 import './Injector';
 import './tsx';
+import './testIntegration';
 import './NodeHandler';
 import './meta/all';
diff --git a/tests/unit/testIntegration.tsx b/tests/unit/testIntegration.tsx
index 60f9bc07..c2cbd5c1 100644
--- a/tests/unit/testIntegration.tsx
+++ b/tests/unit/testIntegration.tsx
@@ -1,10 +1,12 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import { WidgetBase } from '../../src/WidgetBase';
-import { registry } from '../../src/d';
+import { Registry } from '../../src/Registry';
 import { WidgetProperties } from '../../src/interfaces';
 import { VNode } from '@dojo/interfaces/vdom';
-import { fromRegistry } from './../../src/tsx';
+import { tsx, fromRegistry } from './../../src/tsx';
+
+const registry = new Registry();
 
 registerSuite({
 	name: 'tsx',
@@ -36,12 +38,16 @@ registerSuite({
 		}
 
 		const bar = new Bar();
+		bar.__setCoreProperties__({ registry });
+		bar.__setProperties__({ registry });
 		const barRender = bar.__render__() as VNode;
 		const barChild = barRender.children![0];
 		assert.equal(barRender.vnodeSelector, 'header');
 		assert.equal(barChild.text, 'world');
 
 		const qux = new Qux();
+		qux.__setCoreProperties__({ registry });
+		qux.__setProperties__({ registry });
 		const firstQuxRender = qux.__render__();
 		assert.equal(firstQuxRender, null);
 
diff --git a/tsconfig.json b/tsconfig.json
index ac83722e..56175516 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -30,6 +30,7 @@
 		"./src/**/*.ts",
 		"./src/**/*.tsx",
 		"./tests/**/*.ts",
+		"./tests/**/*.tsx",
 		"./typings/index.d.ts"
 	]
 }

From 5be826104088d5944e6a1ecf790d56c5b739c637 Mon Sep 17 00:00:00 2001
From: Anthony Gubler <agubler@sitepen.com>
Date: Thu, 14 Sep 2017 12:23:27 +0100
Subject: [PATCH 2/2] rename

---
 tests/unit/all.ts                                      | 2 +-
 tests/unit/{testIntegration.tsx => tsxIntegration.tsx} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/unit/{testIntegration.tsx => tsxIntegration.tsx} (100%)

diff --git a/tests/unit/all.ts b/tests/unit/all.ts
index 6b9b728b..1198aa20 100644
--- a/tests/unit/all.ts
+++ b/tests/unit/all.ts
@@ -13,6 +13,6 @@ import './diff';
 import './RegistryHandler';
 import './Injector';
 import './tsx';
-import './testIntegration';
+import './tsxIntegration';
 import './NodeHandler';
 import './meta/all';
diff --git a/tests/unit/testIntegration.tsx b/tests/unit/tsxIntegration.tsx
similarity index 100%
rename from tests/unit/testIntegration.tsx
rename to tests/unit/tsxIntegration.tsx