commit bc0ab3d9810c3822951a5855c838ffa9cee5f207
author Matteo Scandolo <matteo.scandolo@link-me.it> Thu Oct 29 14:30:10 2015 +0100
committer Matteo Scandolo <matteo.scandolo@link-me.it> Thu Oct 29 14:30:10 2015 +0100
tree b862eb4198a843cfd07e98fd0645a35e21c40169
parent 608f91d8c18cf50f1dfa40f8df411161e15ffceb

Fixed tests after build

xos/core/xoslib/.bowerrc

diff --git a/xos/core/xoslib/.bowerrc b/xos/core/xoslib/.bowerrc
deleted file mode 100644
index 87be39c..0000000
--- a/xos/core/xoslib/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "directory": "static/js/vendor/"
-}
\ No newline at end of file

xos/core/xoslib/bower.json

diff --git a/xos/core/xoslib/bower.json b/xos/core/xoslib/bower.json
deleted file mode 100644
index 0b29e91..0000000
--- a/xos/core/xoslib/bower.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "xoslib",
-  "version": "0.0.0",
-  "homepage": "https://github.com/teone/xos",
-  "authors": [
-    "Matteo Scandolo <matteo.scandolo@link-me.it>"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "static/js/vendor/",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "angular-cookies": "~1.4.7",
-    "angular-resource": "~1.4.7",
-    "angular-route": "~1.4.7",
-    "angular": "~1.4.7",
-    "ng-lodash": "~0.3.0"
-  }
-}

xos/core/xoslib/karma.conf.js

diff --git a/xos/core/xoslib/karma.conf.js b/xos/core/xoslib/karma.conf.js
index 0d0b15b..c0269f1 100644
--- a/xos/core/xoslib/karma.conf.js
+++ b/xos/core/xoslib/karma.conf.js
@@ -8,7 +8,10 @@
 var path = require('path');
 
 // load bower components trough wiredep
-var bowerComponents = wiredep( {devDependencies: false} )[ 'js' ].map(function( file ){
+var bowerComponents = wiredep( {
+  devDependencies: false,
+  cwd: './xos-builder/'
+} )[ 'js' ].map(function( file ){
   return path.relative(process.cwd(), file);
 });
 
@@ -44,7 +47,7 @@
       'spec/**/*.html',
 
       //ng stuff
-      'static/templates/**/*.html',
+      // 'static/templates/**/*.html',
       'static/js/xosContentProvider.js'
     ]),
 
@@ -61,7 +64,7 @@
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
       'spec/**/*.test.js': ['babel'],
-      'static/templates/**/*.html': 'ng-html2js',
+      // 'static/templates/**/*.html': 'ng-html2js',
       'static/js/xoslib/*.js': ['coverage'],
       'static/js/*.js': ['coverage']
     },

xos/core/xoslib/spec/views/contentprovider.test.js

diff --git a/xos/core/xoslib/spec/views/contentprovider.test.js b/xos/core/xoslib/spec/views/contentprovider.test.js
index 6d9a9c2..e522534 100644
--- a/xos/core/xoslib/spec/views/contentprovider.test.js
+++ b/xos/core/xoslib/spec/views/contentprovider.test.js
@@ -7,9 +7,6 @@
   // injecting main module
   beforeEach(module('xos.contentProviderApp'));
 
-  // preload Html Templates with ng-html2js
-  beforeEach(module('templates'));
-
   beforeEach(function(){
     module(function($provide){
       // mocking routeParams to pass 1 as id