Removed init.ts file, load specs from specrunner.ts directly

Removed init.ts and rewrote specrunner.ts load specs directly. There was no need to do it through init.ts.
egil · Mar 6, 2013 · 52cdc7c · 52cdc7c
1 parent 08bd0be
commit 52cdc7c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 49 deletions.
diff --git a/TypeScript-RequireJs-Jasmine.csproj b/TypeScript-RequireJs-Jasmine.csproj
@@ -75,9 +75,6 @@
     <Content Include="src\project\demo.js">
       <DependentUpon>demo.ts</DependentUpon>
     </Content>
-    <Content Include="src\spec\init.js">
-      <DependentUpon>init.ts</DependentUpon>
-    </Content>
     <TypeScriptCompile Include="src\project\demo.ts" />
     <Content Include="src\specrunner.js">
       <DependentUpon>specrunner.ts</DependentUpon>
@@ -87,7 +84,6 @@
       <DependentUpon>demo.spec.ts</DependentUpon>
     </Content>
     <TypeScriptCompile Include="src\spec\demo.spec.ts" />
-    <Content Include="src\spec\init.ts" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="src\libs\jasmine-1.3.1\MIT.LICENSE" />
@@ -107,11 +103,6 @@
       <DependentUpon>demo.spec.ts</DependentUpon>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="src\spec\init.js.map">
-      <DependentUpon>init.ts</DependentUpon>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="src\main.js.map">
       <DependentUpon>main.ts</DependentUpon>

diff --git a/src/spec/init.js b/src/spec/init.js
diff --git a/src/spec/init.js.map b/src/spec/init.js.map
diff --git a/src/spec/init.ts b/src/spec/init.ts
diff --git a/src/specrunner.js b/src/specrunner.js
diff --git a/src/specrunner.js.map b/src/specrunner.js.map
diff --git a/src/specrunner.ts b/src/specrunner.ts
@@ -4,7 +4,9 @@ require.config({
     baseUrl: 'src'
 });
 
-require(['spec/init'], (specs) => {
+require(['spec/demo.spec'], () => {
     var jasmineEnv = jasmine.getEnv();    
-    specs.uvis.spec.init(jasmineEnv);
+    jasmineEnv.execute();
+}, (err) => {
+    console.error('Unable to load some or all of the requires specs. Error message = ' + err);
 });