This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit df336c121deeaeb1853af174500b95da7e167f26 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 17 10:08:08 2014 +0200 fix install npm + use local node modules --- pollen-ui-angular/.gitignore | 1 - pollen-ui-angular/pom.xml | 3 +-- pollen-ui-angular/src/test/karma.conf.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index 1c7c2ba..09447a5 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -1,6 +1,5 @@ *.iml node_modules/* -test_out/* src/main/webapp/lib src/main/webapp/css/style.css src/main/webapp/js/conf.js diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index f224a33..fc9732f 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -49,7 +49,7 @@ <goal>exec</goal> </goals> <configuration> - <executable>bower</executable> + <executable>${basedir}/node_modules/bower/bin/bower</executable> <arguments> <argument>install</argument> </arguments> @@ -96,7 +96,6 @@ <configuration> <karmaExecutable>${basedir}/node_modules/karma/bin/karma</karmaExecutable> <configFile>src/test/karma.conf.js</configFile> - <junitReportFile>target/test-results.xml</junitReportFile> <reportsDirectory>${project.build.directory}/karma-reports</reportsDirectory> <browsers>PhantomJS</browsers> <autoWatch>false</autoWatch> diff --git a/pollen-ui-angular/src/test/karma.conf.js b/pollen-ui-angular/src/test/karma.conf.js index 69eca3a..3959745 100644 --- a/pollen-ui-angular/src/test/karma.conf.js +++ b/pollen-ui-angular/src/test/karma.conf.js @@ -86,7 +86,7 @@ module.exports = function(config) { ], junitReporter : { - outputFile: 'test_out/unit.xml', + outputFile: 'target/karma-reports/unit.xml', suite: 'unit' }, -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.