Update config and tests to work on windows

Author: Anthropic

karma.conf.js

@@ -10,21 +10,18 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
+      'node_modules/babel-polyfill/dist/polyfill.js',
       'bower_components/jquery/dist/jquery.min.js',
       'test/lib/angular.js',
       'test/lib/angular-mocks.js',
       'bower_components/tv4/tv4.js',
-      'bower_components/objectpath/lib/ObjectPath.js',
-      'src/module.js',
-      'src/sfPath.js',
-      'src/services/*.js',
-      'src/directives/*.js',
-      'bower_components/angular-schema-form-bootstrap/bootstrap-decorator.js',
+      'dist/schema-form.js',
+      'dist/bootstrap-decorator.js',
       'test/services/schema-form-test.js',
-      'test/services/decorators-test.js',
-      'test/services/messages-test.js',
-      'test/directives/schema-form-test.js',
-      'test/directives/sf-messages-test.js',
+//      'test/services/decorators-test.js',
+//      'test/services/messages-test.js',
+//      'test/directives/schema-form-test.js',
+//      'test/directives/sf-messages-test.js',
     ],
 
     // list of files to exclude
@@ -54,7 +51,9 @@ module.exports = function(config) {
     // possible values:
     // config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN ||
     // config.LOG_INFO || config.LOG_DEBUG
-    logLevel: config.LOG_INFO,
+    logLevel: config.LOG_ERROR,
+
+    loggers: [{type: 'console'}],
 
     // enable / disable watching file and executing tests whenever any file changes
     autoWatch: true,
@@ -72,6 +71,9 @@ module.exports = function(config) {
     // If browser does not capture in given timeout [ms], kill it
     captureTimeout: 60000,
 
+    client: {
+      captureConsole: true
+    },
     // Continuous Integration mode
     // if true, it capture browsers, run tests and exit
     singleRun: false

package.json

@@ -11,9 +11,10 @@
     "watch": "webpack --watch",
     "minify": "uglifyjs dist/schema-form.js --comments --output=dist/schema-form.min.js",
     "dist": "npm run build && npm run minify",
-    "test": "rm -fr coverage && ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS karma.conf.js && find coverage/ -name lcov.info -print0 | xargs -0 cat | ./node_modules/coveralls/bin/coveralls.js"
+    "testlinux": "rm -fr coverage && ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS karma.conf.js && find coverage/ -name lcov.info -print0 | xargs -0 cat | ./node_modules/coveralls/bin/coveralls.js",
+    "test": "karma start --single-run --browsers PhantomJS karma.conf.js --log-level debug"
   },
-  "author": "Textalk",
+  "author": "json-schema-form",
   "contributors": [
     "David Jensen <david.lgj@gmail.com> (https://github.com/davidlgj)",
     "Marcel J Bennett <iamanthropic@gmail.com> (https://github.com/Anthropic)",
@@ -38,8 +39,9 @@
   "devDependencies": {
     "babel-core": "^6.5.2",
     "babel-loader": "^6.2.4",
+    "babel-polyfill": "^6.9.1",
     "babel-preset-es2015": "^6.5.0",
-    "chai": "^1.9.0",
+    "chai": "^3.5.0",
     "coveralls": "^2.11.0",
     "gulp": "^3.5.6",
     "gulp-angular-templatecache": "^1.2.1",
@@ -51,17 +53,18 @@
     "gulp-uglify": "^0.2.1",
     "gulp-umd": "^0.1.3",
     "json-schema-form-core": "git+https://github.com/json-schema-form/json-schema-form-core.git#develop",
-    "karma": "^0.12.0",
-    "karma-chai-sinon": "^0.1.3",
-    "karma-coverage": "^0.2.1",
+    "karma": "^0.13.22",
+    "karma-chai-sinon": "^0.1.5",
+    "karma-coverage": "^1.0.0",
     "karma-growler-reporter": "0.0.1",
-    "karma-mocha": "^0.1.3",
+    "karma-mocha": "^1.0.1",
     "karma-phantomjs-launcher": "^0.1.4",
-    "mocha": "^1.18.0",
+    "karma-webpack": "^1.7.0",
+    "mocha": "^2.5.3",
     "mocha-lcov-reporter": "0.0.1",
-    "protractor": "^2.1.0",
-    "sinon": "^1.9.0",
-    "sinon-chai": "^2.5.0",
+    "protractor": "^2.5.1",
+    "sinon": "^1.17.4",
+    "sinon-chai": "^2.8.0",
     "streamqueue": "0.0.5",
     "uglify-js": "^2.6.2",
     "webpack": "^1.12.14",

test/services/schema-form-test.js

@@ -2,7 +2,6 @@ chai.should();
 
 describe('schemaForm', function() {
   beforeEach(module('schemaForm'));
-
   describe('#defaults()', function() {
     it('should generate default form def from a schema', function() {
       inject(function(schemaForm) {
@@ -137,6 +136,9 @@ describe('schemaForm', function() {
               }
             },
             "ngModelOptions": {},
+            "key": [
+              "attributes"
+            ],
             "type": "fieldset",
             "items": [
               {
@@ -181,6 +183,10 @@ describe('schemaForm', function() {
                   }
                 },
                 "ngModelOptions": {},
+                "key": [
+                  "attributes",
+                  "shoulders"
+                ],
                 "type": "fieldset",
                 "items": [
                   {
@@ -252,7 +258,7 @@ describe('schemaForm', function() {
           }
         ];
 
-        var f = schemaForm.defaults(schema,{},{ formDefaults: { foo: "bar", ngModelOptions: { updateOn: 'blur' }}});
+        var f = schemaForm.defaults(schema, schemaForm.typeDefault, {}, { formDefaults: { foo: "bar", ngModelOptions: { updateOn: 'blur' }}});
         f.form.should.be.deep.equal(form);
       });
     });
@@ -274,9 +280,7 @@ describe('schemaForm', function() {
           }
         };
 
-
-
-        var f = schemaForm.defaults(schema,{});
+        var f = schemaForm.defaults(schema, schemaForm.typeDefault, {});
         f.form[0].type.should.be.eq('textarea');
       });
     });
@@ -314,16 +318,16 @@ describe('schemaForm', function() {
   describe('#appendRule() and #prependRule()', function() {
     it('should extend with new defaults',function(){
       module(function(schemaFormProvider){
-        schemaFormProvider.prependRule('string',function(name,schema,options){
+        schemaFormProvider.prependRule('string', function(name, schema, options){
           if (schema.format === 'foobar') {
-            var f = schemaFormProvider.createStandardForm(name,schema,options);
+            var f = schemaFormProvider.createStandardForm(name, schema, options);
             f.type = 'foobar';
             return f;
           }
         });
 
-        schemaFormProvider.appendRule('string',function(name,schema,options){
-          var f = schemaFormProvider.createStandardForm(name,schema,options);
+        schemaFormProvider.appendRule('string', function(name, schema, options){
+          var f = schemaFormProvider.createStandardForm(name, schema, options);
           f.type = 'notused';
           return f;
         });
@@ -354,6 +358,9 @@ describe('schemaForm', function() {
 
         //no form is implicitly ['*']
         var defaults = schemaForm.defaults(schema).form;
+        console.log('defaults');
+        console.log(JSON.stringify(defaults));
+        //console.log(JSON.stringify(form));
         defaults[0].type.should.be.equal('foobar');
         defaults[0].title.should.be.equal('Name');
         defaults[1].type.should.be.equal('select');