Fixed ceilometer bug
diff --git a/views/ngXosLib/README.md b/views/ngXosLib/README.md
index 0166efd..cfce430 100644
--- a/views/ngXosLib/README.md
+++ b/views/ngXosLib/README.md
@@ -51,6 +51,8 @@
>_NOTE: for the API related service, check documentation in [Apigen](#apigen) section._
+When some changes are applied to this common library it should be rebuilt with: `npm run build`
+
### Yo Xos
We have created a [yeoman](http://yeoman.io/) generator to help you scaffolding views.
diff --git a/views/ngXosLib/karma.conf.js b/views/ngXosLib/karma.conf.js
index b75f95b..803ebb1 100644
--- a/views/ngXosLib/karma.conf.js
+++ b/views/ngXosLib/karma.conf.js
@@ -11,6 +11,8 @@
return path.relative(process.cwd(), file);
});
+console.log('bower', bowerComponents)
+
module.exports = function(config) {
/*eslint-enable*/
config.set({
@@ -26,9 +28,10 @@
// list of files / patterns to load in the browser
files: bowerComponents.concat([
- 'xosHelpers/src/*.module.js',
- 'xosHelpers/src/**/*.js',
- 'xosHelpers/spec/**/*.test.js',
+ //'./api/**/*.js',
+ './xosHelpers/src/*.module.js',
+ //'./xosHelpers/src/**/*.js',
+ './xosHelpers/spec/**/*.test.js'
]),
@@ -40,15 +43,24 @@
// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
- '**/*.test.js': ['babel'],
- 'src/**/*.html': ['ng-html2js']
+ '**/*.test.js': ['babel']
},
- ngHtml2JsPreprocessor: {
- stripPrefix: 'src/', //strip the src path from template url (http://stackoverflow.com/questions/22869668/karma-unexpected-request-when-testing-angular-directive-even-with-ng-html2js)
- moduleName: 'templates' // define the template module name
+ babelPreprocessor: {
+ options: {
+ presets: ['es2015'],
+ sourceMap: 'inline'
+ },
+ filename: function (file) {
+ return file.originalPath;
+ },
},
+ //ngHtml2JsPreprocessor: {
+ // stripPrefix: 'src/', //strip the src path from template url (http://stackoverflow.com/questions/22869668/karma-unexpected-request-when-testing-angular-directive-even-with-ng-html2js)
+ // moduleName: 'templates' // define the template module name
+ //},
+
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
@@ -65,7 +77,7 @@
// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
- logLevel: config.LOG_DEBUG,
+ logLevel: config.LOG_INFO,
// enable / disable watching file and executing tests whenever any file changes
diff --git a/views/ngXosLib/package.json b/views/ngXosLib/package.json
index 9e13e28..8ae1e6e 100644
--- a/views/ngXosLib/package.json
+++ b/views/ngXosLib/package.json
@@ -8,14 +8,14 @@
"apigen": "node xos-resource-generator.js",
"swagger": "node xos-swagger-def.js",
"apidoc": "jsdoc api/ng-xos.js api/ng-xoslib.js api/ng-hpcapi.js -d api/docs",
- "build": "gulp vendor"
+ "build": "gulp vendor && gulp helpers"
},
"author": "Matteo Scandolo",
"license": "ISC",
"dependencies": {
"bluebird": "^3.0.5",
"chalk": "^1.1.1",
- "concat": "^1.0.0",
+ "concat": "^2.0.0",
"eslint": "^1.8.0",
"eslint-plugin-angular": "linkmesrl/eslint-plugin-angular",
"fetch-swagger-schema": "^0.1.2",
@@ -23,6 +23,7 @@
"swagger-js-codegen": "^1.1.5"
},
"devDependencies": {
+ "babel-preset-es2015": "^6.6.0",
"gulp": "^3.9.0",
"gulp-angular-filesort": "^1.1.1",
"gulp-concat": "^2.6.0",
diff --git a/views/ngXosLib/xosHelpers/spec/csrftoken.test.js b/views/ngXosLib/xosHelpers/spec/csrftoken.test.js
index e49c52b..60e8c63 100644
--- a/views/ngXosLib/xosHelpers/spec/csrftoken.test.js
+++ b/views/ngXosLib/xosHelpers/spec/csrftoken.test.js
@@ -1,22 +1,24 @@
'use strict';
-
describe('The xos.helper module', function(){
-
- var app, httpProvider;
+ var SetCSRFToken, httpProviderObj;
beforeEach(module('xos.helpers'));
- beforeEach(function(){
- module(function(_$httpProvider_){
- console.log('beforeEach');
- httpProvider = _$httpProvider_;
- });
- });
-
- it('should set SetCSRFToken interceptor', inject(function($http){
- console.log('httpProvider',httpProvider);
- expect(true).toBeTrue();
- // expect(httpProvider.interceptors).toContain('SetCSRFToken');
+ beforeEach(module(function(_$httpProvider_){
+ httpProviderObj = _$httpProvider_;
}));
+ beforeEach(angular.mock.inject(function(_SetCSRFToken_){
+ SetCSRFToken = _SetCSRFToken_;
+ }));
+
+ it('should exist', () => {
+ expect(SetCSRFToken).toBeDefined();
+ });
+
+ xit('should set SetCSRFToken interceptor', () => {
+ expect(httpProviderObj).toBeDefined();
+ expect(httpProviderObj.interceptors).toContain('SetCSRFToken');
+ });
+
});
\ No newline at end of file
diff --git a/views/ngXosLib/xosHelpers/src/services/csrfToken.interceptor.js b/views/ngXosLib/xosHelpers/src/services/csrfToken.interceptor.js
index 283e90d..f3a234e 100644
--- a/views/ngXosLib/xosHelpers/src/services/csrfToken.interceptor.js
+++ b/views/ngXosLib/xosHelpers/src/services/csrfToken.interceptor.js
@@ -1,6 +1,8 @@
(function() {
'use strict';
+ console.log('SetCSRFToken');
+
angular
.module('xos.helpers')
.factory('SetCSRFToken', setCSRFToken);
diff --git a/views/ngXosLib/xosHelpers/src/xosHelpers.module.js b/views/ngXosLib/xosHelpers/src/xosHelpers.module.js
index d5b53da..7c97de0 100644
--- a/views/ngXosLib/xosHelpers/src/xosHelpers.module.js
+++ b/views/ngXosLib/xosHelpers/src/xosHelpers.module.js
@@ -1,6 +1,6 @@
(function() {
'use strict';
-
+ console.log('XOS Helpers Module')
angular.module('bugSnag', []).factory('$exceptionHandler', function () {
return function (exception, cause) {
if( window.Bugsnag ){
@@ -18,11 +18,12 @@
'xos.xos',
'xos.hpcapi',
'xos.xoslib',
- 'bugSnag'
+ 'bugSnag',
])
.config(config);
- function config($httpProvider, $interpolateProvider, $resourceProvider) {
+ function config($httpProvider, $interpolateProvider, $resourceProvider) {
+ console.log('xos.helpers config')
$httpProvider.interceptors.push('SetCSRFToken');
$interpolateProvider.startSymbol('{$');