Fix test.html, sync karma test configuration to test.html

Author: lazarv

karma.conf.js

@@ -13,6 +13,7 @@ module.exports = function(config) {
 			foldAll: false // reports start folded (only with preserveDescribeNesting)
 		},
 		browsers: ['Chrome'/*, 'Firefox', 'IE'*/],
+		browserNoActivityTimeout: 999999,
 		frameworks: ['qunit'],
     	plugins: [
 			'karma-coverage',
@@ -25,14 +26,26 @@ module.exports = function(config) {
 		],
     	files: [
 			'oldEndpoint/Scripts/jquery-1.8.0.js',
-			'dist/JayData.js',
+			'external/odatajs-4.0.0/odatajs-4.0.0.js',
+			'dist/public/jaydata.js',
+			'dist/public/jaydataproviders/YQLProvider.js',
+			'dist/public/jaydataproviders/oDataProvider.js',
+			'dist/public/jaydataproviders/SqLiteProvider.js',
+			'dist/public/jaydataproviders/InMemoryProvider.js',
+			'dist/public/jaydataproviders/IndexedDbProvider.js',
 			'test/compatiblity.js',
 			'test/qunit/NewsReaderContext.js',
 			'test/qunit/scripts/converterTests.js',
-			'test/qunit/scripts/typeSystemTests.js'
+			'test/qunit/scripts/inMemoryProviderTests.js',
+			'test/qunit/scripts/typeSystemTests.js',
+			'test/qunit/scripts/EntityContextTests.js',
+			'test/qunit/scripts/indexedDbProviderTest.js',
+			'test/qunit/scripts/sqLiteProviderTests.js',
+			'test/qunit/scripts/sqLiteCompilerTests.js',
+			'test/qunit/scripts/sqLiteCRUDTests.js'
     	],
 		preprocessors: {
-			'dist/JayData.js': ['coverage']
+			'dist/public/jaydata.js': ['coverage']
 	    },
 		coverageReporter: {
 	    	type : 'html',

test.html

@@ -8,16 +8,17 @@
     <link rel="stylesheet" href="oldEndpoint/Scripts/qUnit/qunit.css" type="text/css" media="screen" />
     <script type="text/javascript" src="oldEndpoint/Scripts/qUnit/qunit.js"></script>
     <script type="text/javascript" src="oldEndpoint/Scripts/jquery-1.8.0.js"></script>
-    <script type="text/javascript" src="oldEndpoint/Scripts/jquery-1.8.0.js"></script>
 
     <script type="text/javascript" src="external/odatajs-4.0.0/odatajs-4.0.0.js"></script>
 
-    <script type="text/javascript" src="external/acorn.js"></script>
+    <!-- <script type="text/javascript" src="external/acorn.js"></script> -->
     <script type="text/javascript" src="dist/public/jaydata.js" /></script>
     <script type="text/javascript" src="dist/public/jaydataproviders/YQLProvider.js" /></script>
     <!-- <script type="text/javascript" src="dist/public/jaydataproviders/FacebookProvider.js" /></script> -->
-    <!-- <script type="text/javascript" src="dist/public/jaydataproviders/oDataProvider.js" /></script> -->
-    <!-- <script type="text/javascript" src="dist/public/jaydataproviders/SqLiteProvider.js" /></script> -->
+    <script type="text/javascript" src="dist/public/jaydataproviders/oDataProvider.js" /></script>
+    <script type="text/javascript" src="dist/public/jaydataproviders/SqLiteProvider.js" /></script>
+    <script type="text/javascript" src="dist/public/jaydataproviders/InMemoryProvider.js" /></script>
+    <script type="text/javascript" src="dist/public/jaydataproviders/IndexedDbProvider.js" /></script>
     <script>
       var $data = require('jaydata/core')
       Container = $data.Container
@@ -35,21 +36,21 @@
     </script>
     <script type="text/javascript" src="test/qunit/NewsReaderContext.js" /></script>
 
-    <!--<script src="test/qunit/scripts/converterTests.js" type="text/javascript"></script>-->
-    <!--<script src="test/qunit/scripts/inMemoryProviderTests.js" type="text/javascript"></script> -->
+    <script src="test/qunit/scripts/converterTests.js" type="text/javascript"></script>
+    <script src="test/qunit/scripts/inMemoryProviderTests.js" type="text/javascript"></script>
     <!-- <script src="UnitTests/storageModelTests.js" type="text/javascript"></script> -->
-    <!--<script src="test/qunit/scripts/typeSystemTests.js" type="text/javascript"></script>-->
-    <!--<script src="test/qunit/scripts/EntityContextTests.js" type="text/javascript"></script>-->
+    <script src="test/qunit/scripts/typeSystemTests.js" type="text/javascript"></script>
+    <script src="test/qunit/scripts/EntityContextTests.js" type="text/javascript"></script>
     <!--<script src="test/qunit/scripts/dataDistributeTest.js" type="text/javascript"></script>-->
     <!--<script src="test/qunit/scripts/ValidationTests.js" type="text/javascript"></script>-->
-    <!--<script src="test/qunit/scripts/indexedDbProviderTest.js" type="text/javascript"></script> -->
+    <script src="test/qunit/scripts/indexedDbProviderTest.js" type="text/javascript"></script>
 
     <!-- <script src="UnitTests/knockoutTests.js" type="text/javascript"></script> -->
     <!-- <script src="UnitTests/setOperationTests.js" type="text/javascript"></script> -->
 
-    <!-- <script src="UnitTests/sqLiteProviderTests.js" type="text/javascript"></script> -->
-    <!--<script src="test/qunit/scripts/sqLiteCompilerTests.js" type="text/javascript"></script>-->
-    <!--<script src="test/qunit/scripts/sqLiteCRUDTests.js" type="text/javascript"></script>-->
+    <script src="test/qunit/scripts/sqLiteProviderTests.js" type="text/javascript"></script>
+    <script src="test/qunit/scripts/sqLiteCompilerTests.js" type="text/javascript"></script>
+    <script src="test/qunit/scripts/sqLiteCRUDTests.js" type="text/javascript"></script>
     <!-- <script src="UnitTests/LocalItemStoreTests.js" type="text/javascript"></script> -->
 
     <!-- <script src="UnitTests/oDataProviderTests.js" type="text/javascript"></script> -->

test/compatiblity.js

@@ -1 +1,2 @@
+window.Container = $data.Container;
 $data.setModelContainer(window);