Fix tests

Author: wouterj

karma.conf.js

@@ -1,7 +1,7 @@
 var path = require('path');
 var webpackConfig = require('./webpack.config.js');
 webpackConfig.devtool = 'inline-source-map';
-webpackConfig.resolve.alias.bundle = path.join(__dirname, 'Resources/assets/js');
+webpackConfig.resolve.alias.bundle = path.join(__dirname, 'src/Resources/assets/js');
 webpackConfig.entry = {};
 
 module.exports = function(config) {
@@ -68,7 +68,7 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['Chrome', 'Firefox', 'IE'],
+    browsers: ['Chrome'],//, 'Firefox', 'IE'],
 
 
     // Continuous Integration mode

tests/js/adapter/fancytreeSpec.js

@@ -29,19 +29,22 @@ describe('The Fancytree adapter', function() {
                         node_name: 'cms',
                         label: 'cms',
                         path: '\/cms',
+                        descriptors: [],
                         children: {
                             content: {
                                 node_name: 'content',
                                 label: 'Content',
                                 path: '/cms/content',
+                                descriptors: [],
                                 children: {
                                     some_article: [],
                                     other_article: []
                                 }
                             }
                         }
                     }
-                }
+                },
+                descriptors: []
             })
         });
     });
@@ -81,7 +84,8 @@ describe('The Fancytree adapter', function() {
                 data: 'homepage',
                 attr: { id: '/cms/content/home' },
                 state: null,
-                children: []
+                children: [],
+                descriptors: []
             }])
         });
 
@@ -159,10 +163,9 @@ describe('The Fancytree adapter', function() {
     it('can have another path as root node', function () {
         jasmine.Ajax.stubRequest(/^\/api/, 'path=/cms/content').andReturn({
             responseText: JSON.stringify([{
-                data: 'homepage',
                 attr: { id: '/cms/content/home' },
-                state: null,
-                children: []
+                children: [],
+                descriptors: []
             }])
         });
 
@@ -220,11 +223,13 @@ describe('The Fancytree adapter', function() {
                 node_name: 'cms',
                 label: 'cms',
                 path: '\/cms',
+                descriptors: [],
                 children: {
                     content: {
                         node_name: 'content',
                         label: 'Content',
                         path: '/cms/content',
+                        descriptors: [],
                         children: {
                             some_article: [],
                             other_article: []
@@ -234,6 +239,7 @@ describe('The Fancytree adapter', function() {
                         node_name: 'routes',
                         label: 'Routes',
                         path: '/cms/routes',
+                        descriptors: [],
                         children: {}
                     }
                 }

webpack.config.js

@@ -4,12 +4,12 @@ var ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 module.exports = {
   debug : true,
-  context : path.join(__dirname, 'Resources/assets/'),
+  context : path.join(__dirname, 'src/Resources/assets/'),
   entry : {
     fancytree : './js/jquery.cmf_tree.js'
   },
   output : {
-    path : path.join(__dirname, 'Resources/public/js'),
+    path : path.join(__dirname, 'src/Resources/public/js'),
     filename : 'cmf_tree_browser.[name].js'
   },
   externals : {